x11-drivers/nvidia-drivers: EAPI=7, use nvidia-driver_check()
authorJeroen Roovers <jer@gentoo.org>
Wed, 27 Nov 2019 15:02:24 +0000 (16:02 +0100)
committerJeroen Roovers <jer@gentoo.org>
Wed, 27 Nov 2019 15:07:01 +0000 (16:07 +0100)
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
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

index 5f370d0daef95aeb6995e8ca8f7a49a7fe4d4617..b34dd683033912f2dc38e9fae8734132dd2f9cf5 100644 (file)
@@ -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
index 705a1973f01625fe83844a7049d37bf877bc785b..152ff221b9a3dee4ca021a56786b68625aed9c28 100644 (file)
@@ -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
index 368ed5f2bcdac906c3b2f042c9991f8649911eb7..4860d956b4b4d43feb81e681f061d13adacdfb4d 100644 (file)
@@ -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
index 4c25381ffa11721be559b5faecd24a1cbd2d1b3b..527d41f645f622087a091465d0a407a3564a2ca9 100644 (file)
@@ -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
index ba476b4116db827dddaf4566665cf4d947adc8ab..42b292bb521b1678958d98fa52baefff5e727c14 100644 (file)
@@ -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
index be2de040f761c02275e6c5619be031fb16bc04ae..4acf4397da75950134afd74f3eeb0ca4ab13acd8 100644 (file)
@@ -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
index f1723d4e80ded216df9431c3893b4490b5b33884..388adda4e50bedd5971844845da78d36241a7fb2 100644 (file)
@@ -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