x11-drivers/nvidia-drivers : version bump

12 files changed, 19 insertions, 15 deletions

diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.63.01 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.94
index 29af4e18..79be2b23 100644
--- a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.63.01
+++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.94
@@ -3,10 +3,11 @@ DEPEND=sys-kernel/dkms
 DESCRIPTION=NVIDIA driver sources for linux
 EAPI=6
 HOMEPAGE=http://www.nvidia.com/
+INHERIT=eutils
 KEYWORDS=amd64
 LICENSE=GPL-2 NVIDIA-r2
 RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-legacy-dkms
 SLOT=0
-SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/470.63.01/NVIDIA-Linux-x86_64-470.63.01.run )
+SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/470.94/NVIDIA-Linux-x86_64-470.94.run )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4877cba8e9c34ad8a2ff1cfd47be0f1c
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.63.01 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.94
index 5b6215de..6eafb19b 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.63.01
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.94
@@ -2,12 +2,14 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup t
 DEPEND=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(-)?] )
 DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=6
+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
-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-legacy acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-470.63.01:0 ) tools? ( ~x11-misc/nvidia-settings-470.63.01:0 ) wayland? ( >=gui-libs/egl-wayland-1.1.7-r1 ) X? ( <x11-base/xorg-server-1.20.99:= >=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.94:0 ) X? ( <x11-base/xorg-server-1.21 )
+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-legacy acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-470.94:0 ) wayland? ( >=gui-libs/egl-wayland-1.1.7-r1 ) 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 )
 SLOT=0
-SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/470.63.01/NVIDIA-Linux-x86_64-470.63.01.run )
+SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/470.94/NVIDIA-Linux-x86_64-470.94.run )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	4b66d835ec72e021e359bb81eacfe988	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	portability	d1186f1e621de7b27ddcae82e6253259	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	unpacker	928e1f35ef78ba9fc2b214e29c2b55a4	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c6505443c5e6d12df3e0538bba7c37bf
+_md5_=0cb8cb1ea06b6a45270fcb3f55df4c23
diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-470.63.01 b/metadata/md5-cache/x11-misc/nvidia-settings-470.94
index ea5ab0d1..436150be 100644
--- a/metadata/md5-cache/x11-misc/nvidia-settings-470.63.01
+++ b/metadata/md5-cache/x11-misc/nvidia-settings-470.94
@@ -3,10 +3,11 @@ DEPEND=x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs
 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-legacy
 SLOT=0
-SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/470.63.01.tar.gz -> nvidia-settings-470.63.01.tar.gz
+SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/470.94.tar.gz -> nvidia-settings-470.94.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	4b66d835ec72e021e359bb81eacfe988	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=7328851830b7018c9f0ab80e5584ddb7
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index cc2c07a4..ec795004 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -67,7 +67,7 @@ sys-kernel/linux-image-redcore-lts-legacy 5.4.167: Redcore Linux Kernel Image (L
 sys-kernel/linux-sources-redcore 5.14.21: Redcore Linux Kernel Sources
 sys-kernel/linux-sources-redcore-lts 5.10.87: Redcore Linux Kernel Sources (LTS)
 sys-kernel/linux-sources-redcore-lts-legacy 5.4.167: Redcore Linux Kernel Sources (LTS Legacy 5.4)
-sys-kernel/nvidia-drivers-dkms 470.63.01: NVIDIA driver sources for linux
+sys-kernel/nvidia-drivers-dkms 470.94: NVIDIA driver sources for linux
 sys-kernel/nvidia-drivers-legacy-dkms 390.147: NVIDIA driver sources for linux
 sys-kernel/rtl8821cu-dkms 5.8.1: Realtek RTL8811CU/RTL8821CU USB Wi-Fi adapter driver for Linux
 sys-kernel/vhba-dkms 20190831: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources
@@ -86,12 +86,12 @@ virtual/udev 1000: 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.1-r100: X.Org X servers
 x11-base/xwayland 21.1.3-r100: Standalone X server running under Wayland
-x11-drivers/nvidia-drivers 470.63.01: NVIDIA Accelerated Graphics Driver
+x11-drivers/nvidia-drivers 470.94: NVIDIA Accelerated Graphics Driver
 x11-drivers/nvidia-drivers-legacy 390.147: NVIDIA Accelerated Graphics Driver
 x11-drivers/xf86-video-qxl 0.1.5_p20200205-r10: QEMU QXL paravirt video driver
 x11-libs/gtk+ 2.24.33-r10 3.24.29-r10: Gimp ToolKit +
 x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities
-x11-misc/nvidia-settings 470.63.01: NVIDIA Linux X11 Settings Utility
+x11-misc/nvidia-settings 470.94: NVIDIA Linux X11 Settings Utility
 x11-misc/nvidia-settings-legacy 390.147: 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-r100: Simple Desktop Display Manager
diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest
index 7001d5c4..665448a6 100644
--- a/sys-kernel/nvidia-drivers-dkms/Manifest
+++ b/sys-kernel/nvidia-drivers-dkms/Manifest
@@ -1 +1 @@
-DIST NVIDIA-Linux-x86_64-470.63.01.run 271484294 BLAKE2B 7769f53897dccea716d459a12808d1f5a738072415639063e47dee82b489bb17121516cf585c1bb6b39f71b11f62f636a466284aba5854a5cfb4f553353cf8d3 SHA512 d3dadf93df86e5462ecb4ae6a04f03b05bf1450ad91e8c2aa73e838ddc9aa11b4e926fc32714d32bd7c606498fee5a54c77d5e40ecc08a039d3e9c2d331ad454
+DIST NVIDIA-Linux-x86_64-470.94.run 272262854 BLAKE2B 23785ec9d434f48793547a3a0d8708c0928b1926f9d8973d872f1745291095cba494310b2fa25a62f3d29bfb4f660fa1ef78d49da651d8a094a23d64ca110e8a SHA512 b70542af04691da623b494d49fcbd58c58b83388fdb1c7ea6dcc779755b595444a324f613840ccbba0d9029456668376fe6049a3e4496c6054efbbf1e0a59c0f
diff --git a/sys-kernel/nvidia-drivers-dkms/files/dkms.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms.patch
index 33707051..02ee1aa0 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/dkms.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/dkms.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.63.01"
++PACKAGE_VERSION="470.94"
  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.63.01.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.94.ebuild
index 63bdc6ce..63bdc6ce 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.63.01.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.94.ebuild
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 7001d5c4..665448a6 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1 +1 @@
-DIST NVIDIA-Linux-x86_64-470.63.01.run 271484294 BLAKE2B 7769f53897dccea716d459a12808d1f5a738072415639063e47dee82b489bb17121516cf585c1bb6b39f71b11f62f636a466284aba5854a5cfb4f553353cf8d3 SHA512 d3dadf93df86e5462ecb4ae6a04f03b05bf1450ad91e8c2aa73e838ddc9aa11b4e926fc32714d32bd7c606498fee5a54c77d5e40ecc08a039d3e9c2d331ad454
+DIST NVIDIA-Linux-x86_64-470.94.run 272262854 BLAKE2B 23785ec9d434f48793547a3a0d8708c0928b1926f9d8973d872f1745291095cba494310b2fa25a62f3d29bfb4f660fa1ef78d49da651d8a094a23d64ca110e8a SHA512 b70542af04691da623b494d49fcbd58c58b83388fdb1c7ea6dcc779755b595444a324f613840ccbba0d9029456668376fe6049a3e4496c6054efbbf1e0a59c0f
diff --git a/x11-drivers/nvidia-drivers/files/dkms.patch b/x11-drivers/nvidia-drivers/files/dkms.patch
index 33707051..02ee1aa0 100644
--- a/x11-drivers/nvidia-drivers/files/dkms.patch
+++ b/x11-drivers/nvidia-drivers/files/dkms.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.63.01"
++PACKAGE_VERSION="470.94"
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
index 41b95655..505bde7c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.63.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
@@ -36,17 +36,17 @@ RDEPEND="
 	!!x11-drivers/nvidia-drivers-legacy
 	acpi? ( sys-power/acpid )
 	dkms? ( ~sys-kernel/${PN}-dkms-${PV}:${SLOT} )
-	tools? ( ~x11-misc/nvidia-settings-${PV}:${SLOT} )
 	wayland? (
 		>=gui-libs/egl-wayland-1.1.7-r1
 	)
 	X? (
-		<x11-base/xorg-server-1.20.99:=
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		sys-libs/zlib[${MULTILIB_USEDEP}]
 	)
 "
+PDEPEND="tools? ( ~x11-misc/nvidia-settings-${PV}:${SLOT} )
+	X? ( <x11-base/xorg-server-1.21 )"
 
 QA_PREBUILT="opt/* usr/lib*"
 S=${WORKDIR}/
diff --git a/x11-misc/nvidia-settings/Manifest b/x11-misc/nvidia-settings/Manifest
index 84b2d46f..295a69fc 100644
--- a/x11-misc/nvidia-settings/Manifest
+++ b/x11-misc/nvidia-settings/Manifest
@@ -1 +1 @@
-DIST nvidia-settings-470.63.01.tar.gz 1235088 BLAKE2B 4d3066d2b05ecf6b8b2ff399883abbdfccf4978a3f1d61a7ec03737084ee98462c1b932a4d7b79546b575b824667e7f64a0313a6ff05aca388b92a0034824026 SHA512 5190ded139f46c54e30ac050e5240b8927baf49a0de9a00794026db97badaa23aee6f29dd57285300807cdba9dc9b4a1668c25d12a1d396c877552e34dc98531
+DIST nvidia-settings-470.94.tar.gz 1235132 BLAKE2B 7f46d7225b18c2e287d1d6aa72408dcfbd2a6afacb02679c6d229de02518aa3d584a1987841914079a23b424eb18ff9b13d6ca28d63b3d539c7b271213fb6b26 SHA512 d8a8a1574d27ec77e25e13bbfff60b3e673b125c2053788c83481c3684af8cb51c2ae19267b01827bb4c53eef84645a9d9a4ea840159414bf51162148067652d
diff --git a/x11-misc/nvidia-settings/nvidia-settings-470.63.01.ebuild b/x11-misc/nvidia-settings/nvidia-settings-470.94.ebuild
index 0b05240a..0b05240a 100644
--- a/x11-misc/nvidia-settings/nvidia-settings-470.63.01.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-470.94.ebuild