summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-01-02 18:28:30 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-01-02 18:28:30 +0000
commita5ff1f01b12dd6a858050e0271206d749044bca6 (patch)
tree3e5ccaf5a09dc697e2083c05f86c5025eb0c8bee
parentf73a2bb41b4f747d22c63339c9c3068e082b56e2 (diff)
x11-drivers/nvidia-drivers-470xx : version bump
-rw-r--r--metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.161.03 (renamed from metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.141.03-r2)4
-rw-r--r--metadata/md5-cache/x11-drivers/nvidia-drivers-470.161.03 (renamed from metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03)6
-rw-r--r--metadata/md5-cache/x11-misc/nvidia-settings-470.161.03 (renamed from metadata/md5-cache/x11-misc/nvidia-settings-470.141.03-r2)6
-rw-r--r--metadata/pkg_desc_index6
-rw-r--r--sys-kernel/nvidia-drivers-dkms/Manifest2
-rw-r--r--sys-kernel/nvidia-drivers-dkms/files/470-kernel6.patch60
-rw-r--r--sys-kernel/nvidia-drivers-dkms/files/dkms470.patch2
-rw-r--r--sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03.ebuild (renamed from sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.141.03-r2.ebuild)1
-rw-r--r--x11-drivers/nvidia-drivers/Manifest2
-rw-r--r--x11-drivers/nvidia-drivers/files/dkms470.patch2
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild)0
-rw-r--r--x11-misc/nvidia-settings/Manifest2
-rw-r--r--x11-misc/nvidia-settings/nvidia-settings-470.161.03.ebuild (renamed from x11-misc/nvidia-settings/nvidia-settings-470.141.03-r2.ebuild)0
13 files changed, 16 insertions, 77 deletions
diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.141.03-r2 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.161.03
index 1193948f..4bed025c 100644
--- a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.141.03-r2
+++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.161.03
@@ -8,6 +8,6 @@ KEYWORDS=amd64
LICENSE=GPL-2 NVIDIA-r2
RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-dkms:390 !!sys-kernel/nvidia-drivers-dkms:515
SLOT=470
-SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/470.141.03/NVIDIA-Linux-x86_64-470.141.03.run )
+SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/470.161.03/NVIDIA-Linux-x86_64-470.161.03.run )
_eclasses_=desktop 7eb20ad915a0a318176d51bc2508ff5c edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 5ca4e49abed8e3a2f7b56920eadee157 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 37a4612ce5522df5a100359a8dbc8491 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=6da5eec811d43e5b37e358b2d560a256
+_md5_=d047fc7093d854a91575a3b6e63192c6
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.161.03
index d71e263f..fd949668 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.141.03
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.161.03
@@ -6,11 +6,11 @@ INHERIT=flag-o-matic multilib-minimal portability toolchain-funcs unpacker
IUSE=acpi +dkms multilib +tools wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=-* ~amd64
LICENSE=GPL-2 NVIDIA-r2
-PDEPEND=tools? ( ~x11-misc/nvidia-settings-470.141.03:470 )
-RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/opencl-3 !!x11-drivers/nvidia-drivers:390 !!x11-drivers/nvidia-drivers:515 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-470.141.03:470 ) wayland? ( ~gui-libs/egl-wayland-1.1.7 ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+PDEPEND=tools? ( ~x11-misc/nvidia-settings-470.161.03:470 )
+RDEPEND=acct-group/video acct-user/nvpd net-libs/libtirpc X? ( >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libglvnd[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/opencl-3 !!x11-drivers/nvidia-drivers:390 !!x11-drivers/nvidia-drivers:515 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-470.161.03:470 ) wayland? ( ~gui-libs/egl-wayland-1.1.7 ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
REQUIRED_USE=tools? ( X )
RESTRICT=bindist mirror strip
SLOT=470
-SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/470.141.03/NVIDIA-Linux-x86_64-470.141.03.run )
+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 7eb20ad915a0a318176d51bc2508ff5c edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 69394e25812406faa1f90edaf4969395 ltprune 97143780d341cc8d8f1d4c6187a36d29 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multilib-build 87f1b83e21a473787b821ef3d0437bf3 multilib-minimal 4b0f1857965db8869a729948d5277e0b multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 portability 58227860123d3e8da23290064ce3373e preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 37a4612ce5522df5a100359a8dbc8491 unpacker f03f9c0c03643e8057ad762b297ce01e vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c
_md5_=fb6c5a682cb7570db6a9d8e8e80b4c7c
diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-470.141.03-r2 b/metadata/md5-cache/x11-misc/nvidia-settings-470.161.03
index 7f18c6bd..22475b50 100644
--- a/metadata/md5-cache/x11-misc/nvidia-settings-470.141.03-r2
+++ b/metadata/md5-cache/x11-misc/nvidia-settings-470.161.03
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings:390 !!x11-misc/nvidia-settings:515 ~x11-drivers/nvidia-drivers-470.141.03:470 virtual/pkgconfig x11-base/xorg-proto
+DEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings:390 !!x11-misc/nvidia-settings:515 ~x11-drivers/nvidia-drivers-470.161.03:470 virtual/pkgconfig x11-base/xorg-proto
DESCRIPTION=NVIDIA Linux X11 Settings Utility
EAPI=6
HOMEPAGE=http://www.nvidia.com/
INHERIT=eutils multilib toolchain-funcs
KEYWORDS=-* amd64
LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings:390 !!x11-misc/nvidia-settings:515 ~x11-drivers/nvidia-drivers-470.141.03:470
+RDEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm x11-libs/gdk-pixbuf-xlib media-libs/mesa x11-libs/pango[X] x11-libs/libXv x11-libs/libXrandr dev-libs/glib:2 dev-libs/jansson x11-libs/cairo >=x11-libs/libvdpau-1.0 !!x11-misc/nvidia-settings:390 !!x11-misc/nvidia-settings:515 ~x11-drivers/nvidia-drivers-470.161.03:470
SLOT=470
-SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/470.141.03.tar.gz -> nvidia-settings-470.141.03.tar.gz
+SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/470.161.03.tar.gz -> nvidia-settings-470.161.03.tar.gz
_eclasses_=desktop 7eb20ad915a0a318176d51bc2508ff5c edos2unix 33e347e171066657f91f8b0c72ec8773 epatch 447396341f5f896d722e435a06f87a4f eqawarn c9847c43b3253a276ae2eabddedab3d7 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 8f942ebdcf04334697649d4a0bf65a32 ltprune 97143780d341cc8d8f1d4c6187a36d29 multilib 5ca4e49abed8e3a2f7b56920eadee157 preserve-libs a8e50acee31b5759b4df1f7707cae54b strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 37a4612ce5522df5a100359a8dbc8491 vcs-clean d271b7bc7e6a009758d7d4ef749174e3 wrapper 4a1902f969e5718126434fc35f3a0d9c
_md5_=773c5103e65a6b635dfc52bcf3a7cdef
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 11574250..3c6ea723 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -66,7 +66,7 @@ sys-kernel/linux-image-redcore-lts-legacy 5.10.161: Redcore Linux Kernel Image (
sys-kernel/linux-sources-redcore 6.0.15: Redcore Linux Kernel Sources
sys-kernel/linux-sources-redcore-lts 5.15.85: Redcore Linux Kernel Sources (LTS)
sys-kernel/linux-sources-redcore-lts-legacy 5.10.161: Redcore Linux Kernel Sources (LTS Legacy v5.10)
-sys-kernel/nvidia-drivers-dkms 390.157 470.141.03-r2 515.65.01: NVIDIA driver sources for linux
+sys-kernel/nvidia-drivers-dkms 390.157 470.161.03 515.65.01: 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.4: Kernel Modules source for Virtualbox
sys-kernel/zfs-dkms 2.1.7: ZFS sources for linux
@@ -80,11 +80,11 @@ 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.6-r10: X.Org X servers
-x11-drivers/nvidia-drivers 390.157 470.141.03 515.65.01: NVIDIA Accelerated Graphics Driver
+x11-drivers/nvidia-drivers 390.157 470.161.03 515.65.01: 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
-x11-misc/nvidia-settings 390.157 470.141.03-r2 515.65.01: NVIDIA Linux X11 Settings Utility
+x11-misc/nvidia-settings 390.157 470.161.03 515.65.01: NVIDIA Linux X11 Settings Utility
x11-misc/pcmanfm-qt-share 1337: PCManFM-QT custom action to share folder using Samba
x11-misc/sddm 0.18.1-r11: Simple Desktop Display Manager
x11-themes/material-icon-theme 1.314.1337: Icon theme following the Google's material design specifications
diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest
index 263f6c67..a3e9ea8c 100644
--- a/sys-kernel/nvidia-drivers-dkms/Manifest
+++ b/sys-kernel/nvidia-drivers-dkms/Manifest
@@ -1,3 +1,3 @@
DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b SHA512 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
-DIST NVIDIA-Linux-x86_64-470.141.03.run 272986406 BLAKE2B 12ef580dd98146715442e6b8e9f27bab4a12121f3edb2e291961f8dea96ec1b81d2c974d380018223999c67a7bec9873675487f436e60aab34e83b1a5b7065f1 SHA512 07aca8ea6aac5592060b4177ef43e9a3a5b2e3bc1a2d5959bf2ae349763fc62ed80b987af5607bf2d9a48e25c4e38e64970bca0177d63bd57a703d47debf5e18
+DIST NVIDIA-Linux-x86_64-470.161.03.run 272397700 BLAKE2B eaa94b7398b3aaadf30c33c95c95b167094ca56114e2e3032978b0959264ac8b8663181485eb1af0282a59b43f912c0ecd48e5eadcb06b6fda601b357ac49bc7 SHA512 26b1640f9427847b68233ffacf5c4a07e75ed9923429dfc9e5de3d7e5c1f109dfaf0fe0a0639cbd47f056784ed3e00e2e741d5c84532df79590a0c9ffa5ba625
DIST NVIDIA-Linux-x86_64-515.65.01.run 364182561 BLAKE2B 552084a5347c0388f5cb0a6eecf41fb3d401356cbbbe957569e3eb0a4ca03b3db0dea0f7f6a37a6b66cf6d5377677ee57a6df73668002a13efd8140b153fcf03 SHA512 5221a4ac071eb39a37a841f19cfe4983286dc35e918956b40604404ef36c122612475df7b9a391a9a70bd60f44e598c8a0e5ec54ccc3e90d51f01e1b2fbe5e33
diff --git a/sys-kernel/nvidia-drivers-dkms/files/470-kernel6.patch b/sys-kernel/nvidia-drivers-dkms/files/470-kernel6.patch
deleted file mode 100644
index 0058f6b4..00000000
--- a/sys-kernel/nvidia-drivers-dkms/files/470-kernel6.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 17bed78791d6f311c83ff1794d085b18c9f89730 Mon Sep 17 00:00:00 2001
-From: Joan Bruguera <joanbrugueram@gmail.com>
-Date: Wed, 3 Aug 2022 00:56:57 +0200
-Subject: [PATCH] Tentative fix for NVIDIA 470.141.03 driver for Linux 6.0-rc1
-
----
- nvidia-drm/nvidia-drm-helper.c | 5 +++++
- nvidia/nv-acpi.c | 5 ++++-
- nvidia/nv.c | 3 ++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/kernel/nvidia-drm/nvidia-drm-helper.c b/kernel/nvidia-drm/nvidia-drm-helper.c
-index 3831180..fa03d51 100644
---- a/kernel/nvidia-drm/nvidia-drm-helper.c
-+++ b/kernel/nvidia-drm/nvidia-drm-helper.c
-@@ -41,6 +41,11 @@
- #include <drm/drm_atomic_uapi.h>
- #endif
-
-+// Add header which is no longer indirectly referenced as of Linux 6.0-rc1
-+#if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)
-+#include <drm/drm_framebuffer.h>
-+#endif
-+
- static void __nv_drm_framebuffer_put(struct drm_framebuffer *fb)
- {
- #if defined(NV_DRM_FRAMEBUFFER_GET_PRESENT)
-diff --git a/kernel/nvidia/nv-acpi.c b/kernel/nvidia/nv-acpi.c
-index 2b7b988..76c36fa 100644
---- a/kernel/nvidia/nv-acpi.c
-+++ b/kernel/nvidia/nv-acpi.c
-@@ -16,7 +16,10 @@
-
- #include <linux/acpi.h>
-
--#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
-+#include <linux/version.h>
-+// Rel.commit "ACPI: bus: Drop unused list heads from struct acpi_device" (Rafael J. Wysocki, 4 Jun 2022)
-+// Disable ACPI support due to more GPL stuff (acpi_dev_for_each_child is only GPL-exported)
-+#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0))
- static NV_STATUS nv_acpi_extract_integer (const union acpi_object *, void *, NvU32, NvU32 *);
- static NV_STATUS nv_acpi_extract_buffer (const union acpi_object *, void *, NvU32, NvU32 *);
- static NV_STATUS nv_acpi_extract_package (const union acpi_object *, void *, NvU32, NvU32 *);
-diff --git a/kernel/nvidia/nv.c b/kernel/nvidia/nv.c
-index ab7d17c..e313e2e 100644
---- a/kernel/nvidia/nv.c
-+++ b/kernel/nvidia/nv.c
-@@ -5423,7 +5423,8 @@ NvBool NV_API_CALL nv_s2idle_pm_configured(void)
- {
- NvU8 buf[8];
-
--#if defined(NV_SEQ_READ_ITER_PRESENT)
-+// FIXME: Avoid this code path because on Linux 6.0-rc1, init_sync_kiocb references a GPL symbol
-+#if defined(NV_SEQ_READ_ITER_PRESENT) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0))
- struct file *file;
- ssize_t num_read;
- struct kiocb kiocb;
---
-2.37.1
-
diff --git a/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch
index 00ebf109..2144b6aa 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch
@@ -5,7 +5,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
-PACKAGE_NAME="nvidia"
-PACKAGE_VERSION="__VERSION_STRING"
+PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="470.141.03"
++PACKAGE_VERSION="470.161.03"
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-470.141.03-r2.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03.ebuild
index 3ccc9ca9..a6b908d0 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.141.03-r2.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03.ebuild
@@ -24,7 +24,6 @@ RDEPEND="${DEPEND}
!!sys-kernel/nvidia-drivers-dkms:515"
PATCHES=(
- "${FILESDIR}"/470-kernel6.patch
"${FILESDIR}"/dkms470.patch
)
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 263f6c67..a3e9ea8c 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,3 +1,3 @@
DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b SHA512 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
-DIST NVIDIA-Linux-x86_64-470.141.03.run 272986406 BLAKE2B 12ef580dd98146715442e6b8e9f27bab4a12121f3edb2e291961f8dea96ec1b81d2c974d380018223999c67a7bec9873675487f436e60aab34e83b1a5b7065f1 SHA512 07aca8ea6aac5592060b4177ef43e9a3a5b2e3bc1a2d5959bf2ae349763fc62ed80b987af5607bf2d9a48e25c4e38e64970bca0177d63bd57a703d47debf5e18
+DIST NVIDIA-Linux-x86_64-470.161.03.run 272397700 BLAKE2B eaa94b7398b3aaadf30c33c95c95b167094ca56114e2e3032978b0959264ac8b8663181485eb1af0282a59b43f912c0ecd48e5eadcb06b6fda601b357ac49bc7 SHA512 26b1640f9427847b68233ffacf5c4a07e75ed9923429dfc9e5de3d7e5c1f109dfaf0fe0a0639cbd47f056784ed3e00e2e741d5c84532df79590a0c9ffa5ba625
DIST NVIDIA-Linux-x86_64-515.65.01.run 364182561 BLAKE2B 552084a5347c0388f5cb0a6eecf41fb3d401356cbbbe957569e3eb0a4ca03b3db0dea0f7f6a37a6b66cf6d5377677ee57a6df73668002a13efd8140b153fcf03 SHA512 5221a4ac071eb39a37a841f19cfe4983286dc35e918956b40604404ef36c122612475df7b9a391a9a70bd60f44e598c8a0e5ec54ccc3e90d51f01e1b2fbe5e33
diff --git a/x11-drivers/nvidia-drivers/files/dkms470.patch b/x11-drivers/nvidia-drivers/files/dkms470.patch
index 00ebf109..2144b6aa 100644
--- a/x11-drivers/nvidia-drivers/files/dkms470.patch
+++ b/x11-drivers/nvidia-drivers/files/dkms470.patch
@@ -5,7 +5,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
-PACKAGE_NAME="nvidia"
-PACKAGE_VERSION="__VERSION_STRING"
+PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="470.141.03"
++PACKAGE_VERSION="470.161.03"
AUTOINSTALL="yes"
# By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild
index 66a260d4..66a260d4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.141.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.161.03.ebuild
diff --git a/x11-misc/nvidia-settings/Manifest b/x11-misc/nvidia-settings/Manifest
index b6a9cde7..09389da9 100644
--- a/x11-misc/nvidia-settings/Manifest
+++ b/x11-misc/nvidia-settings/Manifest
@@ -1,3 +1,3 @@
DIST nvidia-settings-390.157.tar.gz 1297247 BLAKE2B 3a2791f8b35131f2036333d31117f5315b4b79720bfbd7724f893caa9daabb5a813bda580f1f4c1df25260393e9c315b1aa362c489e9462ce395a8d58a695bc0 SHA512 03b8cfa287612eaa1699845136283fe1ec4a43212fb0b9d3d0682ce6dd51702fbdfc53c29ea9ebe914034d2c20abb35af7667e0314948842152efd746773771a
-DIST nvidia-settings-470.141.03.tar.gz 1235217 BLAKE2B 721377ad4431395cfd2989e8d21a1245892aafae5e37393750f6ae90e86f4ac768785fc38100f2295fc1ebdc7d2d1d823d72f8379232b3b28100f94c5a1a4a86 SHA512 3576b6296b5cc30dbca0158d0ca9691dc2e6b819aebe0dde0f0a6ff3e8672a1189e37f68fc7eefc4fd0b105131f7d644c7d27b0ed860c555e4b8fe7f4f60a625
+DIST nvidia-settings-470.161.03.tar.gz 1235242 BLAKE2B 2d520294dfeec793423d6194968cff7e403c921ed7bce089ac0fbd4b49210381e80e75b16e6c2970cecda6a80b7c5658f48e8907c073792ca2f1c166243c2ed8 SHA512 48d64e3f86053696b057e26678434bf18c9b179d138c414a67b2fbbd4dbcdc854b911bac34c0c419943b79d3bb49efea5372617518a16f099a905dedf4f37d8a
DIST nvidia-settings-515.65.01.tar.gz 1254045 BLAKE2B a2f572ac72d7a1c073d5ba3db713f6c8dea01728610232b478f297413492fe650617238c6c3a5008a72b1c897d52310e3a5955a5ee08499ac00835e6b230dffb SHA512 c7b6c1b9acdd9e4daa601fb27199946d48d1d59e1483f3187e93ee887a27027ef29f274ae068089b1abdf089b5c106aa09bd1c87bc7ace41606b019393106ea9
diff --git a/x11-misc/nvidia-settings/nvidia-settings-470.141.03-r2.ebuild b/x11-misc/nvidia-settings/nvidia-settings-470.161.03.ebuild
index 6e773e3b..6e773e3b 100644
--- a/x11-misc/nvidia-settings/nvidia-settings-470.141.03-r2.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-470.161.03.ebuild