From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1125778-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id DA5D7138335
for <garchives@archives.gentoo.org>; Wed, 27 Nov 2019 15:07:09 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id EA3C7E07A5;
Wed, 27 Nov 2019 15:07:08 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id BC023E07A5
for <gentoo-commits@lists.gentoo.org>; Wed, 27 Nov 2019 15:07:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 9BA0834D4C6
for <gentoo-commits@lists.gentoo.org>; Wed, 27 Nov 2019 15:07:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 715098C3
for <gentoo-commits@lists.gentoo.org>; Wed, 27 Nov 2019 15:07:05 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1574867221.232dfcd76959f6996ae76528303916967527530a.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-drivers/nvidia-drivers/nvidia-drivers-340.107-r1.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-390.129.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-430.64.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-440.31.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-440.36.ebuild
X-VCS-Directories: x11-drivers/nvidia-drivers/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 232dfcd76959f6996ae76528303916967527530a
X-VCS-Branch: master
Date: Wed, 27 Nov 2019 15:07:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 77e91782-9452-4570-8c24-3e57cbb0715b
X-Archives-Hash: 506fd9f5fa536a43275601f52d2c534b
commit: 232dfcd76959f6996ae76528303916967527530a
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 15:02:24 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 15:07:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=232dfcd7
x11-drivers/nvidia-drivers: EAPI=7, use nvidia-driver_check()
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../nvidia-drivers-340.107-r1.ebuild | 52 ++++------------------
.../nvidia-drivers/nvidia-drivers-390.129.ebuild | 49 ++++----------------
.../nvidia-drivers/nvidia-drivers-390.132.ebuild | 49 ++++----------------
.../nvidia-drivers/nvidia-drivers-430.64.ebuild | 46 +++----------------
.../nvidia-drivers/nvidia-drivers-435.21.ebuild | 46 +++----------------
.../nvidia-drivers/nvidia-drivers-440.31.ebuild | 46 +++----------------
.../nvidia-drivers/nvidia-drivers-440.36.ebuild | 46 +++----------------
7 files changed, 55 insertions(+), 279 deletions(-)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.107-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.107-r1.ebuild
index 5f370d0daef..b34dd683033 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.107-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.107-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
- portability toolchain-funcs unpacker user udev
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+ nvidia-driver portability toolchain-funcs unpacker user udev
NV_URI="https://us.download.nvidia.com/XFree86/"
X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
@@ -66,54 +66,20 @@ RDEPEND="
)
)
"
-
REQUIRED_USE="tools? ( X )"
-
QA_PREBUILT="opt/* usr/lib*"
-
S=${WORKDIR}/
-
-nvidia_drivers_versions_check() {
- if use amd64 && has_multilib_profile && \
- [ "${DEFAULT_ABI}" != "amd64" ]; then
- eerror "This ebuild doesn't currently support changing your default ABI"
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
- fi
-
- if use kernel_linux && kernel_is ge 4 18; then
- ewarn "Gentoo supports kernels which are supported by NVIDIA"
- ewarn "which are limited to the following kernels:"
- ewarn "<sys-kernel/gentoo-sources-4.18"
- ewarn "<sys-kernel/vanilla-sources-4.18"
- ewarn ""
- ewarn "You are free to utilize eapply_user to provide whatever"
- ewarn "support you feel is appropriate, but will not receive"
- ewarn "support as a result of those changes."
- ewarn ""
- ewarn "Do not file a bug report about this."
- ewarn ""
- fi
-
- # Since Nvidia ships many different series of drivers, we need to give the user
- # some kind of guidance as to what version they should install. This tries
- # to point the user in the right direction but can't be perfect. check
- # nvidia-driver.eclass
- nvidia-driver-check-warning
-
- # Kernel features/options to check for
- CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
- use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
- # Now do the above checks
- use kernel_linux && check_extra_config
-}
+NV_KV_MAX_PLUS="4.18"
+CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
pkg_pretend() {
- nvidia_drivers_versions_check
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+ nvidia-driver_check
}
pkg_setup() {
- nvidia_drivers_versions_check
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+ nvidia-driver_check
# try to turn off distcc and ccache for people that have a problem with it
export DISTCC_DISABLE=1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.129.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.129.ebuild
index 705a1973f01..152ff221b9a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.129.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.129.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
- portability toolchain-funcs unpacker user udev
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+ nvidia-driver portability toolchain-funcs unpacker user udev
DESCRIPTION="NVIDIA Accelerated Graphics Driver"
HOMEPAGE="https://www.nvidia.com/"
@@ -82,48 +82,17 @@ RDEPEND="
"
QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/
-
-nvidia_drivers_versions_check() {
- if use amd64 && has_multilib_profile && \
- [ "${DEFAULT_ABI}" != "amd64" ]; then
- eerror "This ebuild doesn't currently support changing your default ABI"
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
- fi
-
- if use kernel_linux && kernel_is ge 5 4; then
- ewarn "Gentoo supports kernels which are supported by NVIDIA"
- ewarn "which are limited to the following kernels:"
- ewarn "<sys-kernel/gentoo-sources-5.4"
- ewarn "<sys-kernel/vanilla-sources-5.4"
- ewarn ""
- ewarn "You are free to utilize epatch_user to provide whatever"
- ewarn "support you feel is appropriate, but will not receive"
- ewarn "support as a result of those changes."
- ewarn ""
- ewarn "Do not file a bug report about this."
- ewarn ""
- fi
-
- # Since Nvidia ships many different series of drivers, we need to give the user
- # some kind of guidance as to what version they should install. This tries
- # to point the user in the right direction but can't be perfect. check
- # nvidia-driver.eclass
- nvidia-driver-check-warning
-
- # Kernel features/options to check for
- CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
- use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
- # Now do the above checks
- use kernel_linux && check_extra_config
-}
+NV_KV_MAX_PLUS="5.4"
+CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
pkg_pretend() {
- nvidia_drivers_versions_check
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+ nvidia-driver_check
}
pkg_setup() {
- nvidia_drivers_versions_check
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+ nvidia-driver_check
# try to turn off distcc and ccache for people that have a problem with it
export DISTCC_DISABLE=1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild
index 368ed5f2bcd..4860d956b4b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
- portability toolchain-funcs unpacker user udev
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+ nvidia-driver portability toolchain-funcs unpacker user udev
DESCRIPTION="NVIDIA Accelerated Graphics Driver"
HOMEPAGE="https://www.nvidia.com/"
@@ -82,48 +82,17 @@ RDEPEND="
"
QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/
-
-nvidia_drivers_versions_check() {
- if use amd64 && has_multilib_profile && \
- [ "${DEFAULT_ABI}" != "amd64" ]; then
- eerror "This ebuild doesn't currently support changing your default ABI"
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
- fi
-
- if use kernel_linux && kernel_is ge 5 4; then
- ewarn "Gentoo supports kernels which are supported by NVIDIA"
- ewarn "which are limited to the following kernels:"
- ewarn "<sys-kernel/gentoo-sources-5.4"
- ewarn "<sys-kernel/vanilla-sources-5.4"
- ewarn ""
- ewarn "You are free to utilize epatch_user to provide whatever"
- ewarn "support you feel is appropriate, but will not receive"
- ewarn "support as a result of those changes."
- ewarn ""
- ewarn "Do not file a bug report about this."
- ewarn ""
- fi
-
- # Since Nvidia ships many different series of drivers, we need to give the user
- # some kind of guidance as to what version they should install. This tries
- # to point the user in the right direction but can't be perfect. check
- # nvidia-driver.eclass
- nvidia-driver-check-warning
-
- # Kernel features/options to check for
- CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
- use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
- # Now do the above checks
- use kernel_linux && check_extra_config
-}
+NV_KV_MAX_PLUS="5.4"
+CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
pkg_pretend() {
- nvidia_drivers_versions_check
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+ nvidia-driver_check
}
pkg_setup() {
- nvidia_drivers_versions_check
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+ nvidia-driver_check
# try to turn off distcc and ccache for people that have a problem with it
export DISTCC_DISABLE=1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64.ebuild
index 4c25381ffa1..527d41f645f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
- portability toolchain-funcs unpacker user udev
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+ nvidia-driver portability toolchain-funcs unpacker user udev
DESCRIPTION="NVIDIA Accelerated Graphics Driver"
HOMEPAGE="https://www.nvidia.com/"
@@ -77,47 +77,15 @@ RDEPEND="
"
QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/
-
-nvidia_drivers_versions_check() {
- if use amd64 && has_multilib_profile && \
- [ "${DEFAULT_ABI}" != "amd64" ]; then
- eerror "This ebuild doesn't currently support changing your default ABI"
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
- fi
-
- if use kernel_linux && kernel_is ge 5 4; then
- ewarn "Gentoo supports kernels which are supported by NVIDIA"
- ewarn "which are limited to the following kernels:"
- ewarn "<sys-kernel/gentoo-sources-5.4"
- ewarn "<sys-kernel/vanilla-sources-5.4"
- ewarn ""
- ewarn "You are free to utilize epatch_user to provide whatever"
- ewarn "support you feel is appropriate, but will not receive"
- ewarn "support as a result of those changes."
- ewarn ""
- ewarn "Do not file a bug report about this."
- ewarn ""
- fi
-
- # Since Nvidia ships many different series of drivers, we need to give the user
- # some kind of guidance as to what version they should install. This tries
- # to point the user in the right direction but can't be perfect. check
- # nvidia-driver.eclass
- nvidia-driver-check-warning
-
- # Kernel features/options to check for
- CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-
- # Now do the above checks
- use kernel_linux && check_extra_config
-}
+NV_KV_MAX_PLUS="5.4"
+CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
pkg_pretend() {
- nvidia_drivers_versions_check
+ nvidia-driver_check
}
pkg_setup() {
- nvidia_drivers_versions_check
+ nvidia-driver_check
# try to turn off distcc and ccache for people that have a problem with it
export DISTCC_DISABLE=1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
index ba476b4116d..42b292bb521 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
- portability toolchain-funcs unpacker user udev
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+ nvidia-driver portability toolchain-funcs unpacker user udev
DESCRIPTION="NVIDIA Accelerated Graphics Driver"
HOMEPAGE="https://www.nvidia.com/"
@@ -81,47 +81,15 @@ RDEPEND="
"
QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/
-
-nvidia_drivers_versions_check() {
- if use amd64 && has_multilib_profile && \
- [ "${DEFAULT_ABI}" != "amd64" ]; then
- eerror "This ebuild doesn't currently support changing your default ABI"
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
- fi
-
- if use kernel_linux && kernel_is ge 5 4; then
- ewarn "Gentoo supports kernels which are supported by NVIDIA"
- ewarn "which are limited to the following kernels:"
- ewarn "<sys-kernel/gentoo-sources-5.4"
- ewarn "<sys-kernel/vanilla-sources-5.4"
- ewarn ""
- ewarn "You are free to utilize epatch_user to provide whatever"
- ewarn "support you feel is appropriate, but will not receive"
- ewarn "support as a result of those changes."
- ewarn ""
- ewarn "Do not file a bug report about this."
- ewarn ""
- fi
-
- # Since Nvidia ships many different series of drivers, we need to give the user
- # some kind of guidance as to what version they should install. This tries
- # to point the user in the right direction but can't be perfect. check
- # nvidia-driver.eclass
- nvidia-driver-check-warning
-
- # Kernel features/options to check for
- CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-
- # Now do the above checks
- use kernel_linux && check_extra_config
-}
+NV_KV_MAX_PLUS="5.4"
+CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
pkg_pretend() {
- nvidia_drivers_versions_check
+ nvidia-driver_check
}
pkg_setup() {
- nvidia_drivers_versions_check
+ nvidia-driver_check
# try to turn off distcc and ccache for people that have a problem with it
export DISTCC_DISABLE=1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.31.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.31.ebuild
index be2de040f76..4acf4397da7 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.31.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.31.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
- portability toolchain-funcs unpacker user udev
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+ nvidia-driver portability toolchain-funcs unpacker user udev
DESCRIPTION="NVIDIA Accelerated Graphics Driver"
HOMEPAGE="https://www.nvidia.com/"
@@ -84,47 +84,15 @@ S=${WORKDIR}/
PATCHES=(
"${FILESDIR}"/${PN}-440.26-locale.patch
)
-
-nvidia_drivers_versions_check() {
- if use amd64 && has_multilib_profile && \
- [ "${DEFAULT_ABI}" != "amd64" ]; then
- eerror "This ebuild doesn't currently support changing your default ABI"
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
- fi
-
- if use kernel_linux && kernel_is ge 5 4; then
- ewarn "Gentoo supports kernels which are supported by NVIDIA"
- ewarn "which are limited to the following kernels:"
- ewarn "<sys-kernel/gentoo-sources-5.4"
- ewarn "<sys-kernel/vanilla-sources-5.4"
- ewarn ""
- ewarn "You are free to utilize epatch_user to provide whatever"
- ewarn "support you feel is appropriate, but will not receive"
- ewarn "support as a result of those changes."
- ewarn ""
- ewarn "Do not file a bug report about this."
- ewarn ""
- fi
-
- # Since Nvidia ships many different series of drivers, we need to give the user
- # some kind of guidance as to what version they should install. This tries
- # to point the user in the right direction but can't be perfect. check
- # nvidia-driver.eclass
- nvidia-driver-check-warning
-
- # Kernel features/options to check for
- CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-
- # Now do the above checks
- use kernel_linux && check_extra_config
-}
+NV_KV_MAX_PLUS="5.4"
+CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
pkg_pretend() {
- nvidia_drivers_versions_check
+ nvidia-driver_check
}
pkg_setup() {
- nvidia_drivers_versions_check
+ nvidia-driver_check
# try to turn off distcc and ccache for people that have a problem with it
export DISTCC_DISABLE=1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.36.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.36.ebuild
index f1723d4e80d..388adda4e50 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.36.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.36.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
- portability toolchain-funcs unpacker user udev
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+ nvidia-driver portability toolchain-funcs unpacker user udev
DESCRIPTION="NVIDIA Accelerated Graphics Driver"
HOMEPAGE="https://www.nvidia.com/"
@@ -84,47 +84,15 @@ S=${WORKDIR}/
PATCHES=(
"${FILESDIR}"/${PN}-440.26-locale.patch
)
-
-nvidia_drivers_versions_check() {
- if use amd64 && has_multilib_profile && \
- [ "${DEFAULT_ABI}" != "amd64" ]; then
- eerror "This ebuild doesn't currently support changing your default ABI"
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
- fi
-
- if use kernel_linux && kernel_is ge 5 4; then
- ewarn "Gentoo supports kernels which are supported by NVIDIA"
- ewarn "which are limited to the following kernels:"
- ewarn "<sys-kernel/gentoo-sources-5.4"
- ewarn "<sys-kernel/vanilla-sources-5.4"
- ewarn ""
- ewarn "You are free to utilize epatch_user to provide whatever"
- ewarn "support you feel is appropriate, but will not receive"
- ewarn "support as a result of those changes."
- ewarn ""
- ewarn "Do not file a bug report about this."
- ewarn ""
- fi
-
- # Since Nvidia ships many different series of drivers, we need to give the user
- # some kind of guidance as to what version they should install. This tries
- # to point the user in the right direction but can't be perfect. check
- # nvidia-driver.eclass
- nvidia-driver-check-warning
-
- # Kernel features/options to check for
- CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-
- # Now do the above checks
- use kernel_linux && check_extra_config
-}
+NV_KV_MAX_PLUS="5.4"
+CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
pkg_pretend() {
- nvidia_drivers_versions_check
+ nvidia-driver_check
}
pkg_setup() {
- nvidia_drivers_versions_check
+ nvidia-driver_check
# try to turn off distcc and ccache for people that have a problem with it
export DISTCC_DISABLE=1