x11-drivers/nvidia-drivers : drop SLOT 525

6 files changed, 1 insertions, 118 deletions

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