x11-drivers/nvidia-drivers : drop SLOT 525

29 files changed, 25 insertions, 550 deletions

diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-390.157-r5 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-390.157-r5
index 65e2b3f9..c28d0264 100644
--- a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-390.157-r5
+++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-390.157-r5
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.nvidia.com/
 INHERIT=eutils
 KEYWORDS=amd64
 LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-dkms:470 !!sys-kernel/nvidia-drivers-dkms:525 !!sys-kernel/nvidia-drivers-dkms:535
+RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-dkms:470 !!sys-kernel/nvidia-drivers-dkms:535
 SLOT=390
 SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a6045930f2fb8944d9e5e6d8f2a402b5
+_md5_=a9f81b5be2afc3b854425aabc172c4ee
diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.199.02-r2 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.199.02-r2
index a27fb152..5073ca89 100644
--- a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.199.02-r2
+++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-470.199.02-r2
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.nvidia.com/
 INHERIT=eutils
 KEYWORDS=amd64
 LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-dkms:390 !!sys-kernel/nvidia-drivers-dkms:525 !!sys-kernel/nvidia-drivers-dkms:535
+RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-dkms:390 !!sys-kernel/nvidia-drivers-dkms:535
 SLOT=470
 SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/470.199.02/NVIDIA-Linux-x86_64-470.199.02.run )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a6e38639e5ac60e12cf0a74c9c81d05c
+_md5_=5f0874c822f3f3f6e874658daa62a147
diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-525.125.06-r1 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-525.125.06-r1
deleted file mode 100644
index 20eee7fe..00000000
--- a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-525.125.06-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm unpack
-DEPEND=sys-kernel/dkms
-DESCRIPTION=NVIDIA driver sources for linux
-EAPI=6
-HOMEPAGE=http://www.nvidia.com/
-INHERIT=eutils
-IUSE=kernel-open
-KEYWORDS=amd64
-LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-dkms:390 !!sys-kernel/nvidia-drivers-dkms:470 !!sys-kernel/nvidia-drivers-dkms:535
-SLOT=525
-SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/525.125.06/NVIDIA-Linux-x86_64-525.125.06.run )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7a449af915978b18e68047360bb5e778
diff --git a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-535.113.01 b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-535.113.01
index 98eecd0b..076c2957 100644
--- a/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-535.113.01
+++ b/metadata/md5-cache/sys-kernel/nvidia-drivers-dkms-535.113.01
@@ -7,8 +7,8 @@ INHERIT=eutils
 IUSE=kernel-open
 KEYWORDS=amd64
 LICENSE=GPL-2 NVIDIA-r2
-RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-dkms:390 !!sys-kernel/nvidia-drivers-dkms:470 !!sys-kernel/nvidia-drivers-dkms:525
+RDEPEND=sys-kernel/dkms !!sys-kernel/nvidia-drivers-dkms:390 !!sys-kernel/nvidia-drivers-dkms:470
 SLOT=535
 SRC_URI=amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/535.113.01/NVIDIA-Linux-x86_64-535.113.01.run )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c06c93073879327e09287f3815b5b2e7
+_md5_=b697f3b0fb390c6235fd6ef10fd7e646
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r5 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r5
index 1d9ac07d..02244be5 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r5
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r5
@@ -8,9 +8,9 @@ IUSE=acpi +dkms multilib +tools wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi
 KEYWORDS=-* ~amd64
 LICENSE=GPL-2 NVIDIA-r2
 PDEPEND=tools? ( x11-misc/nvidia-settings:390 )
-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:470 !!x11-drivers/nvidia-drivers:525 !!x11-drivers/nvidia-drivers:535 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-390.157:390 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] )
+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:470 !!x11-drivers/nvidia-drivers:535 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-390.157:390 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] )
 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	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	flag-o-matic	baa4d385108ac87993edac956a916a36	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	portability	a74d533f258f1f435be71312558c12f9	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	unpacker	aa6a4e924009232d8b78b31e932c30b5	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=314e7e22266f1072a43216b37656e208
+_md5_=11b6e757998216435cb8c6a40c7e73d7
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.199.02-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.199.02-r2
index 6c82ef9c..4617fa20 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.199.02-r2
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.199.02-r2
@@ -7,10 +7,10 @@ IUSE=acpi +dkms multilib +tools wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi
 KEYWORDS=-* ~amd64
 LICENSE=GPL-2 NVIDIA-r2
 PDEPEND=tools? ( x11-misc/nvidia-settings: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:525 !!x11-drivers/nvidia-drivers:535 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-470.199.02: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(-)?] )
+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:535 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-470.199.02: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.199.02/NVIDIA-Linux-x86_64-470.199.02.run )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	flag-o-matic	baa4d385108ac87993edac956a916a36	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	portability	a74d533f258f1f435be71312558c12f9	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	unpacker	aa6a4e924009232d8b78b31e932c30b5	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d39cf6b258c4f340ccb7a507985ef750
+_md5_=e878875a7191e188bd6c8c3f2d07efdd
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.125.06-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-525.125.06-r2
deleted file mode 100644
index 7edfdd73..00000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-525.125.06-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-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
-PDEPEND=tools? ( x11-misc/nvidia-settings:525 )
-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:470 !!x11-drivers/nvidia-drivers:535 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-525.125.06:525 ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 ) 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=525
-SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/525.125.06/NVIDIA-Linux-x86_64-525.125.06.run )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	flag-o-matic	baa4d385108ac87993edac956a916a36	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	portability	a74d533f258f1f435be71312558c12f9	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	unpacker	aa6a4e924009232d8b78b31e932c30b5	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3aef755957420cb5a8f4d9d09b5ea9a2
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.113.01 b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.113.01
index 2734c75e..ee6ce18e 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-535.113.01
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-535.113.01
@@ -7,10 +7,10 @@ IUSE=acpi +dkms multilib +tools wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi
 KEYWORDS=-* ~amd64
 LICENSE=GPL-2 NVIDIA-r2
 PDEPEND=tools? ( x11-misc/nvidia-settings:535 )
-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:470 !!x11-drivers/nvidia-drivers:525 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-535.113.01:535 ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 ) 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(-)?] )
+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:470 acpi? ( sys-power/acpid ) dkms? ( ~sys-kernel/nvidia-drivers-dkms-535.113.01:535 ) wayland? ( gui-libs/egl-gbm >=gui-libs/egl-wayland-1.1.10 ) 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=535
 SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/535.113.01/NVIDIA-Linux-x86_64-535.113.01.run )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	flag-o-matic	baa4d385108ac87993edac956a916a36	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	portability	a74d533f258f1f435be71312558c12f9	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	unpacker	aa6a4e924009232d8b78b31e932c30b5	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ee3698658cf3ef4c4c336c52b2309bac
+_md5_=dab6bc651f3a665b4789a87c0189647f
diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-390.157-r4 b/metadata/md5-cache/x11-misc/nvidia-settings-390.157-r4
index d39bf7d0..b635ed78 100644
--- a/metadata/md5-cache/x11-misc/nvidia-settings-390.157-r4
+++ b/metadata/md5-cache/x11-misc/nvidia-settings-390.157-r4
@@ -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:470 !!x11-misc/nvidia-settings:525 !!x11-misc/nvidia-settings:535 x11-drivers/nvidia-drivers:390 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:470 !!x11-misc/nvidia-settings:535 x11-drivers/nvidia-drivers:390 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:470 !!x11-misc/nvidia-settings:525 !!x11-misc/nvidia-settings:535 x11-drivers/nvidia-drivers:390
+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:470 !!x11-misc/nvidia-settings:535 x11-drivers/nvidia-drivers:390
 SLOT=390
 SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/390.157.tar.gz -> nvidia-settings-390.157.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=91eeda60148fdbd1b342701339626ec5
+_md5_=bb4bae6fb30d310638e27acedcc7153d
diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-470.199.02-r2 b/metadata/md5-cache/x11-misc/nvidia-settings-470.199.02-r2
index 8f1e4505..1c71fd40 100644
--- a/metadata/md5-cache/x11-misc/nvidia-settings-470.199.02-r2
+++ b/metadata/md5-cache/x11-misc/nvidia-settings-470.199.02-r2
@@ -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:525 !!x11-misc/nvidia-settings:535 x11-drivers/nvidia-drivers: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:535 x11-drivers/nvidia-drivers: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:525 !!x11-misc/nvidia-settings:535 x11-drivers/nvidia-drivers: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:535 x11-drivers/nvidia-drivers:470
 SLOT=470
 SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/470.199.02.tar.gz -> nvidia-settings-470.199.02.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c0753bb7bc8f86f79e4c3cdaf1d3fa6a
+_md5_=e496672bdd7e996dd36040d81be37f69
diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-525.116.04-r2 b/metadata/md5-cache/x11-misc/nvidia-settings-525.116.04-r2
deleted file mode 100644
index ee089b67..00000000
--- a/metadata/md5-cache/x11-misc/nvidia-settings-525.116.04-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-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:470 !!x11-misc/nvidia-settings:535 x11-drivers/nvidia-drivers:525 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:470 !!x11-misc/nvidia-settings:535 x11-drivers/nvidia-drivers:525
-SLOT=525
-SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/525.116.04.tar.gz -> nvidia-settings-525.116.04.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6a38c3f376e0d392411d0c7625dd842b
diff --git a/metadata/md5-cache/x11-misc/nvidia-settings-535.113.01 b/metadata/md5-cache/x11-misc/nvidia-settings-535.113.01
index a03ab791..2ab86c7e 100644
--- a/metadata/md5-cache/x11-misc/nvidia-settings-535.113.01
+++ b/metadata/md5-cache/x11-misc/nvidia-settings-535.113.01
@@ -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:470 !!x11-misc/nvidia-settings:525 x11-drivers/nvidia-drivers:535 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:470 x11-drivers/nvidia-drivers:535 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:470 !!x11-misc/nvidia-settings:525 x11-drivers/nvidia-drivers:535
+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:470 x11-drivers/nvidia-drivers:535
 SLOT=535
 SRC_URI=https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/535.113.01.tar.gz -> nvidia-settings-535.113.01.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6deb8d7ba0d409df930a3499e28ceea4
+_md5_=e7ea7709bf40df039373a257f4ffb2d4
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index d0c4cc3a..572981c9 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -65,7 +65,7 @@ sys-kernel/linux-image-redcore 6.4.16-r1 6.5.12: Redcore Linux Kernel Image
 sys-kernel/linux-image-redcore-lts 5.10.201 5.15.139 6.1.63: Redcore Linux LTS Kernel Image
 sys-kernel/linux-sources-redcore 6.4.16-r1 6.5.12: Redcore Linux Kernel Sources
 sys-kernel/linux-sources-redcore-lts 5.10.201 5.15.139 6.1.63: Redcore Linux LTS Kernel Sources
-sys-kernel/nvidia-drivers-dkms 390.157-r5 470.199.02-r2 525.125.06-r1 535.113.01: NVIDIA driver sources for linux
+sys-kernel/nvidia-drivers-dkms 390.157-r5 470.199.02-r2 535.113.01: NVIDIA driver sources for linux
 sys-kernel/vhba-dkms 20211218-r5: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources
 sys-kernel/virtualbox-modules-dkms 7.0.12: Kernel Modules source for Virtualbox
 sys-kernel/zfs-dkms 2.1.13: ZFS sources for linux
@@ -76,10 +76,10 @@ virtual/notification-daemon 1.334.1337: Virtual (dummy package) for notification
 virtual/tmpfiles 1.314.1337-r1: Virtual to select between different tmpfiles.d handlers
 virtual/udev 314.1337-r1: 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-drivers/nvidia-drivers 390.157-r5 470.199.02-r2 525.125.06-r2 535.113.01: NVIDIA Accelerated Graphics Driver
+x11-drivers/nvidia-drivers 390.157-r5 470.199.02-r2 535.113.01: NVIDIA Accelerated Graphics Driver
 x11-libs/gtk+ 2.24.33-r3 3.24.37-r1: Gimp ToolKit +
 x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities
-x11-misc/nvidia-settings 390.157-r4 470.199.02-r2 525.116.04-r2 535.113.01: NVIDIA Linux X11 Settings Utility
+x11-misc/nvidia-settings 390.157-r4 470.199.02-r2 535.113.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.20.0: 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 2d9c4099..2f83c67d 100644
--- a/sys-kernel/nvidia-drivers-dkms/Manifest
+++ b/sys-kernel/nvidia-drivers-dkms/Manifest
@@ -1,4 +1,3 @@
 DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b SHA512 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
 DIST NVIDIA-Linux-x86_64-470.199.02.run 273256770 BLAKE2B 5ceca89da4b4c7de701602d3dbf26e71a1163be26e0e5eac65354ecd40bfc8d68c981a6ef75b13e95079835c95ef7f9e10e5f95a0ed09beffd5bc22cb81a5330 SHA512 e1265b6266473af652e9d7bf85dcd76e312af281c5f4f158ab322e34d378738acb87c30cfff7bf1f6e1b238883e7f665d9fc5151b1e0078dd9aece5a52655405
-DIST NVIDIA-Linux-x86_64-525.125.06.run 414318862 BLAKE2B 204c53bbf579edf6d88c9ab4efcf82983a2b58262df4748076de96f3d67b107949407ae0c5ffe9bf6747783b1bcb9a9efc4a3c60d7161427b1c85ecfc494171a SHA512 a5f13b633d111d9dc928e8522cd916a2b756fccbf2dc532649762a3f9bdc5503bd57c9c698da8205c49e82720b45789413a1afc26be77d741f823b49ae2f333d
 DIST NVIDIA-Linux-x86_64-535.113.01.run 341515532 BLAKE2B 2fe0564771f14618010bd1d8932db1d6c98701faabfd8a867f5f0e9939dcff6d64744c3f2272b62701c231473e49dd1b22687db777a1950c4e0f40f091b70ed2 SHA512 bf939843404bc163246b710ca336236f28af489f77ee1830a2d20d4ca926a434b6fbc2156d5777dc004692d5d1adbef77ce79071247f81da2db9adf42c32bfa7
diff --git a/sys-kernel/nvidia-drivers-dkms/files/dkms525.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms525.patch
deleted file mode 100644
index 4ec73fa9..00000000
--- a/sys-kernel/nvidia-drivers-dkms/files/dkms525.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2023-03-28 23:02:32.000000000 +0100
-+++ b/kernel/dkms.conf	2023-05-12 18:40:21.194005773 +0100
-@@ -1,12 +1,22 @@
--PACKAGE_NAME="nvidia"
--PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="525.125.06"
-+BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-4]\.)" # only build for kernels v5.x.x up to and including v6.4.x
- 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	2023-03-28 23:02:32.000000000 +0100
-+++ b/kernel-open/dkms.conf	2023-05-12 18:40:30.254006616 +0100
-@@ -1,12 +1,22 @@
--PACKAGE_NAME="nvidia"
--PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="525.125.06"
-+BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-4]\.)" # only build for kernels v5.x.x up to and including v6.4.x
- 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/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r5.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r5.ebuild
index 6b7293ce..db1a9e97 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r5.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r5.ebuild
@@ -21,7 +21,6 @@ IUSE=""
 DEPEND="sys-kernel/dkms"
 RDEPEND="${DEPEND}
 	!!sys-kernel/nvidia-drivers-dkms:470
-	!!sys-kernel/nvidia-drivers-dkms:525
 	!!sys-kernel/nvidia-drivers-dkms:535"
 
 PATCHES=(
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.199.02-r2.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.199.02-r2.ebuild
index 1db63694..d1640161 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.199.02-r2.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.199.02-r2.ebuild
@@ -21,7 +21,6 @@ IUSE=""
 DEPEND="sys-kernel/dkms"
 RDEPEND="${DEPEND}
 	!!sys-kernel/nvidia-drivers-dkms:390
-	!!sys-kernel/nvidia-drivers-dkms:525
 	!!sys-kernel/nvidia-drivers-dkms:535"
 
 PATCHES=(
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-525.125.06-r1.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-525.125.06-r1.ebuild
deleted file mode 100644
index 34ae9165..00000000
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-525.125.06-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA driver sources for linux"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="525"
-KEYWORDS="amd64"
-IUSE="kernel-open"
-
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}
-	!!sys-kernel/nvidia-drivers-dkms:390
-	!!sys-kernel/nvidia-drivers-dkms:470
-	!!sys-kernel/nvidia-drivers-dkms:535"
-
-PATCHES=(
-	"${FILESDIR}"/dkms525.patch
-)
-
-S="${WORKDIR}/${AMD64_NV_PACKAGE}"
-
-src_unpack() {
-	sh ${DISTDIR}/${AMD64_NV_PACKAGE}.run --extract-only
-}
-
-src_install() {
-	dodir usr/src/${P}
-	insinto usr/src/${P}
-	if use kernel-open; then
-		doins -r "${S}"/kernel-open/*
-	else
-		doins -r "${S}"/kernel/*
-	fi
-}
-
-pkg_postinst() {
-	dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
-	dkms remove ${PN}/${PV} --all
-}
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-535.113.01.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-535.113.01.ebuild
index bb60b833..77d7e0c9 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-535.113.01.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-535.113.01.ebuild
@@ -21,8 +21,7 @@ IUSE="kernel-open"
 DEPEND="sys-kernel/dkms"
 RDEPEND="${DEPEND}
 	!!sys-kernel/nvidia-drivers-dkms:390
-	!!sys-kernel/nvidia-drivers-dkms:470
-	!!sys-kernel/nvidia-drivers-dkms:525"
+	!!sys-kernel/nvidia-drivers-dkms:470"
 
 PATCHES=(
 	"${FILESDIR}"/dkms535.patch
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 2d9c4099..2f83c67d 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,4 +1,3 @@
 DIST NVIDIA-Linux-x86_64-390.157.run 85835541 BLAKE2B 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b SHA512 4780503a4cff0180b1b1f37d20a6ba3438dd78b51fa7f69b98d35521835e5d61099129746929d51d63afa2d47b672b3e145e1e1897584dc3799e7f822c5b3a0a
 DIST NVIDIA-Linux-x86_64-470.199.02.run 273256770 BLAKE2B 5ceca89da4b4c7de701602d3dbf26e71a1163be26e0e5eac65354ecd40bfc8d68c981a6ef75b13e95079835c95ef7f9e10e5f95a0ed09beffd5bc22cb81a5330 SHA512 e1265b6266473af652e9d7bf85dcd76e312af281c5f4f158ab322e34d378738acb87c30cfff7bf1f6e1b238883e7f665d9fc5151b1e0078dd9aece5a52655405
-DIST NVIDIA-Linux-x86_64-525.125.06.run 414318862 BLAKE2B 204c53bbf579edf6d88c9ab4efcf82983a2b58262df4748076de96f3d67b107949407ae0c5ffe9bf6747783b1bcb9a9efc4a3c60d7161427b1c85ecfc494171a SHA512 a5f13b633d111d9dc928e8522cd916a2b756fccbf2dc532649762a3f9bdc5503bd57c9c698da8205c49e82720b45789413a1afc26be77d741f823b49ae2f333d
 DIST NVIDIA-Linux-x86_64-535.113.01.run 341515532 BLAKE2B 2fe0564771f14618010bd1d8932db1d6c98701faabfd8a867f5f0e9939dcff6d64744c3f2272b62701c231473e49dd1b22687db777a1950c4e0f40f091b70ed2 SHA512 bf939843404bc163246b710ca336236f28af489f77ee1830a2d20d4ca926a434b6fbc2156d5777dc004692d5d1adbef77ce79071247f81da2db9adf42c32bfa7
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r5.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r5.ebuild
index d22d6524..ca1ada1e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r5.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r5.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
 	${COMMON}
 	>=virtual/opencl-3
 	!!x11-drivers/nvidia-drivers:470
-	!!x11-drivers/nvidia-drivers:525
 	!!x11-drivers/nvidia-drivers:535
 	acpi? ( sys-power/acpid )
 	dkms? ( ~sys-kernel/${PN}-dkms-${PV}:${SLOT} )
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02-r2.ebuild
index cc543e18..33d31ab3 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.199.02-r2.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
 	${COMMON}
 	>=virtual/opencl-3
 	!!x11-drivers/nvidia-drivers:390
-	!!x11-drivers/nvidia-drivers:525
 	!!x11-drivers/nvidia-drivers:535
 	acpi? ( sys-power/acpid )
 	dkms? ( ~sys-kernel/${PN}-dkms-${PV}:${SLOT} )
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06-r2.ebuild
deleted file mode 100644
index 4d0d394d..00000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.125.06-r2.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib-minimal portability toolchain-funcs unpacker
-
-NV_URI="https://us.download.nvidia.com/XFree86/"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-
-SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )"
-
-EMULTILIB_PKG="true"
-KEYWORDS="-* ~amd64"
-RESTRICT="bindist mirror strip"
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="525"
-
-IUSE="acpi +dkms multilib +tools wayland +X"
-REQUIRED_USE="tools? ( X )"
-
-COMMON="
-	acct-group/video
-	acct-user/nvpd
-	net-libs/libtirpc
-	X? (
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
-		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-	)
-"
-
-DEPEND="${COMMON}"
-
-RDEPEND="
-	${COMMON}
-	>=virtual/opencl-3
-	!!x11-drivers/nvidia-drivers:390
-	!!x11-drivers/nvidia-drivers:470
-	!!x11-drivers/nvidia-drivers:535
-	acpi? ( sys-power/acpid )
-	dkms? ( ~sys-kernel/${PN}-dkms-${PV}:${SLOT} )
-	wayland? (
-		gui-libs/egl-gbm
-		>=gui-libs/egl-wayland-1.1.10
-	)
-	X? (
-		>=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:${SLOT} )
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-PATCHES=(
-	"${FILESDIR}"/locale.patch
-)
-
-pkg_setup() {
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	NV_DOC="${S}"
-	NV_OBJ="${S}"
-	NV_SRC="${S}/kernel"
-	NV_MAN="${S}"
-	NV_X11="${S}"
-	NV_SOVER=${PV}
-}
-
-src_prepare() {
-	default
-	local man_file
-	for man_file in "${NV_MAN}"/*1.gz; do
-		gunzip $man_file || die
-	done
-
-	if ! [ -f nvidia_icd.json ]; then
-		cp nvidia_icd.json.template nvidia_icd.json || die
-		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
-	fi
-}
-
-donvidia() {
-	nv_LIB="${1}"
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-	nv_DEST="${2}"
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local GL_ROOT="/usr/$(get_libdir)"
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local nv_libdir="${NV_OBJ}"
-
-	if has_multilib_profile && [[ ${ABI} == "x86" ]]; then
-		nv_libdir="${NV_OBJ}"/32
-	fi
-
-	if use X; then
-		NV_GLX_LIBRARIES=(
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-allocator.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-glvkspirv.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libnvidia-opticalflow.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-			"libnvidia-ml.so.${NV_SOVER}"
-			"libnvidia-tls.so.${NV_SOVER}"
-		)
-
-		if has_multilib_profile && [[ ${ABI} == "amd64" ]]; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-ngx.so.${NV_SOVER}"
-				"libnvidia-rtcore.so.${NV_SOVER}"
-				"libnvoptix.so.${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia "${nv_libdir}"/${NV_LIB}
-		done
-	fi
-}
-
-src_install() {
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-	donvidia ${NV_OBJ}/libnvidia-nvvm.so.${NV_SOVER}
-	donvidia ${NV_OBJ}/libnvidia-vulkan-producer.so.${NV_SOVER}
-	donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-	donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-
-	if has_multilib_profile && use multilib; then
-		local OABI=${ABI}
-		for ABI in $(multilib_get_enabled_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-
-	if use X; then
-		donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} /usr/$(get_libdir)/nvidia/xorg
-		
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		insinto /usr/share/X11/xorg.conf.d
-		newins ${FILESDIR}/nvidia-drm-outputclass.conf 50-nvidia-drm-outputclass.conf
-
-		insinto /usr/share/glvnd/egl_vendor.d
-		doins ${NV_X11}/10_nvidia.json
-
-		exeinto /opt/bin
-		doexe ${NV_OBJ}/nvidia-xconfig
-
-		doman "${NV_MAN}"/nvidia-xconfig.1
-	fi
-
-	insinto /etc/modprobe.d
-	doins "${FILESDIR}"/nouveau.conf
-
-	insinto /etc/vulkan/icd.d
-	doins nvidia_icd.json
-
-	insinto /etc/vulkan/implicit_layer.d
-	doins nvidia_layers.json
-
-	insinto /etc/OpenCL/vendors
-	doins ${NV_OBJ}/nvidia.icd
-
-	exeinto /opt/bin/
-	doexe ${NV_OBJ}/nvidia-cuda-mps-control
-	doexe ${NV_OBJ}/nvidia-cuda-mps-server
-	doexe ${NV_OBJ}/nvidia-debugdump
-	doexe ${NV_OBJ}/nvidia-persistenced
-	doexe ${NV_OBJ}/nvidia-smi
-	doexe ${NV_OBJ}/nvidia-modprobe
-
-	fowners root:video /opt/bin/nvidia-modprobe
-	fperms 4710 /opt/bin/nvidia-modprobe
-	dosym /{opt,usr}/bin/nvidia-modprobe
-
-	newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-	newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-
-	newdoc "${NV_DOC}/README.txt" README
-	dodoc "${NV_DOC}/NVIDIA_Changelog"
-	doman "${NV_MAN}"/nvidia-smi.1
-	doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-	doman "${NV_MAN}"/nvidia-modprobe.1
-	doman "${NV_MAN}"/nvidia-persistenced.1
-
-	docinto html
-	dodoc -r ${NV_DOC}/html/*
-}
-
-_dracut_initramfs_regen() {
-	if [ -x $(which dracut) ]; then
-		dracut -N -f --no-hostonly-cmdline
-	fi
-}
-
-pkg_preinst() {
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-pkg_postinst() {
-	if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then
-		_dracut_initramfs_regen
-	fi
-}
-
-pkg_postrm() {
-	if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then
-		_dracut_initramfs_regen
-	fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.113.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.113.01.ebuild
index a32f04bd..6c110e92 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.113.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.113.01.ebuild
@@ -36,7 +36,6 @@ RDEPEND="
 	>=virtual/opencl-3
 	!!x11-drivers/nvidia-drivers:390
 	!!x11-drivers/nvidia-drivers:470
-	!!x11-drivers/nvidia-drivers:525
 	acpi? ( sys-power/acpid )
 	dkms? ( ~sys-kernel/${PN}-dkms-${PV}:${SLOT} )
 	wayland? (
diff --git a/x11-misc/nvidia-settings/Manifest b/x11-misc/nvidia-settings/Manifest
index 88760ea3..0927e1af 100644
--- a/x11-misc/nvidia-settings/Manifest
+++ b/x11-misc/nvidia-settings/Manifest
@@ -1,4 +1,3 @@
 DIST nvidia-settings-390.157.tar.gz 1297247 BLAKE2B 3a2791f8b35131f2036333d31117f5315b4b79720bfbd7724f893caa9daabb5a813bda580f1f4c1df25260393e9c315b1aa362c489e9462ce395a8d58a695bc0 SHA512 03b8cfa287612eaa1699845136283fe1ec4a43212fb0b9d3d0682ce6dd51702fbdfc53c29ea9ebe914034d2c20abb35af7667e0314948842152efd746773771a
 DIST nvidia-settings-470.199.02.tar.gz 1235155 BLAKE2B 06069632b0eb8197a78a73c3b4dbbb3d66ac160d8272add7ec1245f59112e7bbc9e294eca2af3f5a79c77f10abe3229d847ad90fdb3d48b26230acafc0ba1820 SHA512 d0e43b8e0ef4298ce92be63d6a985e6ba3e1b9133c52f21254435d79ff20e78b195b16a75b34c7ba1ec659529c67e617a2fe40e2f573f6f2ab26ddba7bf203ad
-DIST nvidia-settings-525.116.04.tar.gz 1264460 BLAKE2B 0af5695b4916af5ebb6083db186d78db81b5f27efee68af6c7fa24ae3af752de8b1f0a18b33c64e898dc9eba106104625debbe069adc7171af5e338cb3042566 SHA512 ff63dc50479022866f2e9bc8fba798b88fc819595517d839125dac1fb7e4c20f0027640c4dc7f7b0c544eba984190d4b204b4306ef36c55740681621be4e6fb3
 DIST nvidia-settings-535.113.01.tar.gz 1272684 BLAKE2B f6d608e8be941ee274353616f714431ec1069e000244cbd109b2d55102070ec2bf471b56c054421dc407485be937e912d4495a904b0fa80f189e1001cdd04f03 SHA512 0711eab8d7987a62fbab2e28ae6098c22b07d6e2469a97938ef46f33a380fd978efe13d3e9b749153815bb33bf35827a844ee933b5588f9b2fd59a5816a24c71
diff --git a/x11-misc/nvidia-settings/nvidia-settings-390.157-r4.ebuild b/x11-misc/nvidia-settings/nvidia-settings-390.157-r4.ebuild
index 9eccfde7..0b7600e9 100644
--- a/x11-misc/nvidia-settings/nvidia-settings-390.157-r4.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-390.157-r4.ebuild
@@ -34,7 +34,6 @@ COMMON_DEPEND="
 
 RDEPEND="${COMMON_DEPEND}
 	!!x11-misc/nvidia-settings:470
-	!!x11-misc/nvidia-settings:525
 	!!x11-misc/nvidia-settings:535
 	x11-drivers/nvidia-drivers:${SLOT}"
 DEPEND="${RDEPEND}
diff --git a/x11-misc/nvidia-settings/nvidia-settings-470.199.02-r2.ebuild b/x11-misc/nvidia-settings/nvidia-settings-470.199.02-r2.ebuild
index 8b541fce..9c4b2321 100644
--- a/x11-misc/nvidia-settings/nvidia-settings-470.199.02-r2.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-470.199.02-r2.ebuild
@@ -34,7 +34,6 @@ COMMON_DEPEND="
 
 RDEPEND="${COMMON_DEPEND}
 	!!x11-misc/nvidia-settings:390
-	!!x11-misc/nvidia-settings:525
 	!!x11-misc/nvidia-settings:535
 	x11-drivers/nvidia-drivers:${SLOT}"
 DEPEND="${RDEPEND}
diff --git a/x11-misc/nvidia-settings/nvidia-settings-525.116.04-r2.ebuild b/x11-misc/nvidia-settings/nvidia-settings-525.116.04-r2.ebuild
deleted file mode 100644
index 8cf0064d..00000000
--- a/x11-misc/nvidia-settings/nvidia-settings-525.116.04-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/${PV}.tar.gz -> nvidia-settings-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="525"
-KEYWORDS="-* amd64"
-IUSE=""
-
-QA_PREBUILT=
-
-COMMON_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"
-
-RDEPEND="${COMMON_DEPEND}
-	!!x11-misc/nvidia-settings:390
-	!!x11-misc/nvidia-settings:470
-	!!x11-misc/nvidia-settings:535
-	x11-drivers/nvidia-drivers:${SLOT}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/"${PN}"-linker.patch
-}
-
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl \
-		DO_STRIP= \
-		LIBDIR="$(get_libdir)" \
-		NVLD="$(tc-getLD)" \
-		NV_VERBOSE=1 \
-		OUTPUTDIR=. \
-		RANLIB="$(tc-getRANLIB)"
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		DO_STRIP= \
-		GTK3_AVAILABLE=1 \
-		LIBDIR="$(get_libdir)" \
-		NVLD="$(tc-getLD)" \
-		NVML_ENABLED=0 \
-		NV_USE_BUNDLED_LIBJANSSON=0 \
-		NV_VERBOSE=1 \
-		OUTPUTDIR=.
-}
-
-src_install() {
-	emake -C src/ \
-		DESTDIR="${D}" \
-		DO_STRIP= \
-		GTK3_AVAILABLE=1 \
-		LIBDIR="${D}/usr/$(get_libdir)" \
-		NV_USE_BUNDLED_LIBJANSSON=0 \
-		NV_VERBOSE=1 \
-		OUTPUTDIR=. \
-		PREFIX=/usr \
-		install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-	doicon doc/${PN}.png || die
-	domenu ${FILESDIR}/${PN}.desktop || die
-
-	dodoc doc/*.txt
-
-	rm -rvf ${D}usr/$(get_libdir)/libnvidia-gtk2.so.${PV}
-}
diff --git a/x11-misc/nvidia-settings/nvidia-settings-535.113.01.ebuild b/x11-misc/nvidia-settings/nvidia-settings-535.113.01.ebuild
index 00eed032..881a0e88 100644
--- a/x11-misc/nvidia-settings/nvidia-settings-535.113.01.ebuild
+++ b/x11-misc/nvidia-settings/nvidia-settings-535.113.01.ebuild
@@ -35,7 +35,6 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	!!x11-misc/nvidia-settings:390
 	!!x11-misc/nvidia-settings:470
-	!!x11-misc/nvidia-settings:525
 	x11-drivers/nvidia-drivers:${SLOT}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig