x11-drivers/nvidia-drivers : check kernel config unconditionally, install GSP firmware

7 files changed, 11 insertions, 9 deletions

diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r9 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r10
index 394fadb0..230165dd 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r9
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r10
@@ -14,4 +14,4 @@ RESTRICT=strip
 SLOT=3
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.157.tar.bz2
 _eclasses_=desktop	56973babb9c5f19cab0eeb53ece644c6	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=188fb4aa252a2cedaabba2eecb9d1a9f
+_md5_=091223e6ffc2ec54a76b4035f36276a0
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r1
index 1db6283c..4e2b2425 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r1
@@ -14,4 +14,4 @@ RESTRICT=strip
 SLOT=4
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/470.256.02/NVIDIA-Linux-x86_64-470.256.02.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.256.02.tar.bz2
 _eclasses_=desktop	56973babb9c5f19cab0eeb53ece644c6	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=dfc0e91f019d2335fee041df886f011a
+_md5_=dd2d87a41eb50bc254fba9d8ef0c354c
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02 b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02-r1
index 98f524d0..229790d4 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02-r1
@@ -14,4 +14,4 @@ RESTRICT=strip
 SLOT=5
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/550.107.02/NVIDIA-Linux-x86_64-550.107.02.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.107.02.tar.bz2
 _eclasses_=desktop	56973babb9c5f19cab0eeb53ece644c6	flag-o-matic	fa33e3696fe4689dda7e9affe92e2c94	multilib	7e1347c006a76bb812f3a9f663b79991	multiprocessing	e644caa6eb7ce7e5ab0864383ac13ad9	readme.gentoo-r1	32b48460d813533d85f082897cec1b80	systemd	0f241b5c9f3758c3d3423df59a7f655a	toolchain-funcs	948855ec7ad9f11351edf9066708dfa9	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=17c4e2d0191f238c1333011271b13c8f
+_md5_=bf119f76a6d58bb353ff7bb17f2cda66
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index a724c196..f0625c63 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -82,7 +82,7 @@ virtual/tmpfiles 1.314.1337-r1: Virtual to select between different tmpfiles.d h
 virtual/udev 314.1337-r1: Virtual to select between different udev daemon providers
 www-client/ungoogled-chromium 128.0.6613.84: Modifications to Chromium for removing Google integration and enhancing privacy
 x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg drivers (dummy package)
-x11-drivers/nvidia-drivers 390.157-r9 470.256.02 550.107.02: NVIDIA Accelerated Graphics Driver
+x11-drivers/nvidia-drivers 390.157-r10 470.256.02-r1 550.107.02-r1: NVIDIA Accelerated Graphics Driver
 x11-libs/gtk+ 2.24.33-r5 3.24.41-r5: Gimp ToolKit +
 x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities
 x11-misc/nvidia-settings 390.157-r7 470.256.02 550.107.02: NVIDIA Linux X11 Settings Utility
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r9.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r10.ebuild
index bdf740c4..0a584315 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r9.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r10.ebuild
@@ -89,7 +89,7 @@ pkg_setup() {
 	Please ignore if not having issues, but otherwise try to unset or
 	pass ibt=off to the kernel's command line." #911142
 
-	kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+	CONFIG_CHECK+=" X86_PAT" #817764
 }
 
 src_prepare() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r1.ebuild
index e9e45d49..6f731093 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r1.ebuild
@@ -88,7 +88,7 @@ pkg_setup() {
 	broken CUDA/NVENC. Please ignore if not having issues, but otherwise
 	try to unset or pass ibt=off to the kernel's command line." #911142
 
-	kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+	CONFIG_CHECK+=" X86_PAT" #817764
 }
 
 src_prepare() {
@@ -171,7 +171,8 @@ src_install() {
 	)
 	local skip_modules=(
 		$(usev !X "nvfbc vdpau xdriver")
-		installer gsp nvpd # handled separately / built from source
+		$(usev !dkms gsp)
+		installer nvpd # handled separately / built from source
 	)
 	local skip_types=(
 		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild
index 5d60b6a8..a17310c0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild
@@ -88,7 +88,7 @@ pkg_setup() {
 	selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
 	DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
 
-	kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+	CONFIG_CHECK+=" X86_PAT" #817764
 
 	CONFIG_CHECK+=" MMU_NOTIFIER" #843827
 	local ERROR_MMU_NOTIFIER="CONFIG_MMU_NOTIFIER: is not set but required.
@@ -178,8 +178,9 @@ src_install() {
 	)
 	local skip_modules=(
 		$(usev !X "nvfbc vdpau xdriver")
+		$(usev !dkms gsp)
 		$(usev !powerd powerd)
-		installer gsp nvpd # handled separately / built from source
+		installer nvpd # handled separately / built from source
 	)
 	local skip_types=(
 		GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # media-libs/libglvnd