From bfaccee12711d45a8f9050c7d94ba3dfb7bd2c8f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 29 Mar 2023 12:09:34 +0100
Subject: sys-kernel/nvidia-drivers-dkms{:390,:470,:515} : only build for
 kernels v5.x.x and up to v6.1.x (broken with kernel v6.2.x) &&
 x11-drivers/nvidia-drivers{:390,:470,:515} : revision bump

---
 sys-kernel/nvidia-drivers-dkms/files/dkms390.patch |  7 +--
 sys-kernel/nvidia-drivers-dkms/files/dkms470.patch |  7 +--
 sys-kernel/nvidia-drivers-dkms/files/dkms515.patch | 14 +++---
 .../nvidia-drivers-dkms-390.157-r1.ebuild          | 49 --------------------
 .../nvidia-drivers-dkms-390.157-r2.ebuild          | 49 ++++++++++++++++++++
 .../nvidia-drivers-dkms-470.161.03-r1.ebuild       | 49 --------------------
 .../nvidia-drivers-dkms-470.161.03-r2.ebuild       | 49 ++++++++++++++++++++
 .../nvidia-drivers-dkms-515.86.01-r1.ebuild        | 53 ----------------------
 .../nvidia-drivers-dkms-515.86.01-r2.ebuild        | 53 ++++++++++++++++++++++
 9 files changed, 167 insertions(+), 163 deletions(-)
 delete mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r1.ebuild
 create mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r2.ebuild
 delete mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03-r1.ebuild
 create mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03-r2.ebuild
 delete mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.86.01-r1.ebuild
 create mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.86.01-r2.ebuild

(limited to 'sys-kernel/nvidia-drivers-dkms')

diff --git a/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch
index 45fff603..402ecdf1 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch
@@ -1,11 +1,12 @@
 diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2021-11-02 06:16:12.000000000 +0000
-+++ b/kernel/dkms.conf	2022-10-16 19:24:47.535006817 +0100
-@@ -1,12 +1,19 @@
+--- a/kernel/dkms.conf	2021-11-07 11:53:27.000000000 +0000
++++ b/kernel/dkms.conf	2023-03-29 11:57:23.888798613 +0100
+@@ -1,12 +1,20 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
 +PACKAGE_VERSION="390.157"
++BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-1]\.)" # only build for kernels v5.x.x up to and including v6.1.x
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch
index 2144b6aa..1a6c223c 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/dkms470.patch
@@ -1,11 +1,12 @@
 diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2022-06-30 19:31:05.000000000 +0100
-+++ b/kernel/dkms.conf	2022-10-16 19:27:00.128002886 +0100
-@@ -1,12 +1,21 @@
+--- a/kernel/dkms.conf	2022-10-19 01:02:01.000000000 +0100
++++ b/kernel/dkms.conf	2023-03-29 11:59:55.126812687 +0100
+@@ -1,12 +1,22 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
 +PACKAGE_VERSION="470.161.03"
++BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-1]\.)" # only build for kernels v5.x.x up to and including v6.1.x
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/sys-kernel/nvidia-drivers-dkms/files/dkms515.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms515.patch
index 6d83f27d..b18f38f5 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/dkms515.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/dkms515.patch
@@ -1,11 +1,12 @@
 diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2022-07-20 14:40:39.000000000 +0100
-+++ b/kernel/dkms.conf	2022-10-16 17:59:20.342158844 +0100
-@@ -1,12 +1,21 @@
+--- a/kernel/dkms.conf	2022-10-26 09:58:29.000000000 +0100
++++ b/kernel/dkms.conf	2023-03-29 12:04:16.447837005 +0100
+@@ -1,12 +1,22 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
 +PACKAGE_VERSION="515.86.01"
++BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-1]\.)" # only build for kernels v5.x.x up to and including v6.1.x
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
@@ -28,13 +29,14 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
 +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	2022-07-20 14:40:39.000000000 +0100
-+++ b/kernel-open/dkms.conf	2022-10-16 17:59:28.942158589 +0100
-@@ -1,12 +1,21 @@
+--- a/kernel-open/dkms.conf	2022-10-26 09:58:29.000000000 +0100
++++ b/kernel-open/dkms.conf	2023-03-29 12:04:25.738837870 +0100
+@@ -1,12 +1,22 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
 +PACKAGE_VERSION="515.86.01"
++BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-1]\.)" # only build for kernels v5.x.x up to and including v6.1.x
  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-390.157-r1.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r1.ebuild
deleted file mode 100644
index 56f68d54..00000000
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r1.ebuild
+++ /dev/null
@@ -1,49 +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="390"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}
-	!!sys-kernel/nvidia-drivers-dkms:470
-	!!sys-kernel/nvidia-drivers-dkms:515
-	!!sys-kernel/nvidia-drivers-dkms:525"
-
-PATCHES=(
-	"${FILESDIR}"/dkms390.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}
-	doins -r "${S}"/kernel/*
-}
-
-pkg_postinst() {
-	dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
-	dkms remove ${PN}/${PV} --all
-}
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r2.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r2.ebuild
new file mode 100644
index 00000000..56f68d54
--- /dev/null
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.157-r2.ebuild
@@ -0,0 +1,49 @@
+# 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="390"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="sys-kernel/dkms"
+RDEPEND="${DEPEND}
+	!!sys-kernel/nvidia-drivers-dkms:470
+	!!sys-kernel/nvidia-drivers-dkms:515
+	!!sys-kernel/nvidia-drivers-dkms:525"
+
+PATCHES=(
+	"${FILESDIR}"/dkms390.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}
+	doins -r "${S}"/kernel/*
+}
+
+pkg_postinst() {
+	dkms add ${PN}/${PV}
+}
+
+pkg_prerm() {
+	dkms remove ${PN}/${PV} --all
+}
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03-r1.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03-r1.ebuild
deleted file mode 100644
index c44811c5..00000000
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03-r1.ebuild
+++ /dev/null
@@ -1,49 +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="470"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}
-	!!sys-kernel/nvidia-drivers-dkms:390
-	!!sys-kernel/nvidia-drivers-dkms:515
-	!!sys-kernel/nvidia-drivers-dkms:525"
-
-PATCHES=(
-	"${FILESDIR}"/dkms470.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}
-	doins -r "${S}"/kernel/*
-}
-
-pkg_postinst() {
-	dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
-	dkms remove ${PN}/${PV} --all
-}
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03-r2.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03-r2.ebuild
new file mode 100644
index 00000000..c44811c5
--- /dev/null
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-470.161.03-r2.ebuild
@@ -0,0 +1,49 @@
+# 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="470"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="sys-kernel/dkms"
+RDEPEND="${DEPEND}
+	!!sys-kernel/nvidia-drivers-dkms:390
+	!!sys-kernel/nvidia-drivers-dkms:515
+	!!sys-kernel/nvidia-drivers-dkms:525"
+
+PATCHES=(
+	"${FILESDIR}"/dkms470.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}
+	doins -r "${S}"/kernel/*
+}
+
+pkg_postinst() {
+	dkms add ${PN}/${PV}
+}
+
+pkg_prerm() {
+	dkms remove ${PN}/${PV} --all
+}
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.86.01-r1.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.86.01-r1.ebuild
deleted file mode 100644
index 45d81756..00000000
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.86.01-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="515"
-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:525"
-
-PATCHES=(
-	"${FILESDIR}"/dkms515.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-515.86.01-r2.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.86.01-r2.ebuild
new file mode 100644
index 00000000..45d81756
--- /dev/null
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-515.86.01-r2.ebuild
@@ -0,0 +1,53 @@
+# 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="515"
+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:525"
+
+PATCHES=(
+	"${FILESDIR}"/dkms515.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
+}
-- 
cgit v1.2.3