commit:     5d22b8b850a567c9a5e97b541fd90e9f7e77a494
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  1 11:59:59 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jul  1 12:02:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d22b8b8

x11-drivers/nvidia-drivers: Make CONFIG_DRM check non-fatal

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Closes: https://bugs.gentoo.org/730124
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild    | 4 ++--
 x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild | 2 +-
 x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild | 2 +-
 x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild    | 2 +-
 x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild  | 2 +-
 x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild  | 2 +-
 x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild | 2 +-
 x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild  | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
index 94c58283034..7ab4dac5757 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.108.ebuild
@@ -72,9 +72,9 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
 CONFIG_CHECK="
        !DEBUG_MUTEXES
-       DRM
-       DRM_KMS_HELPER
        ~!LOCKDEP
+       ~DRM
+       ~DRM_KMS_HELPER
        ~SYSVIPC
 "
 

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
index 3f2495a4af1..211c4615cef 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild
@@ -82,8 +82,8 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
 CONFIG_CHECK="
        !DEBUG_MUTEXES
-       DRM
        ~!LOCKDEP
+       ~DRM
        ~DRM_KMS_HELPER
        ~SYSVIPC
 "

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
index d042a6ee3dd..9956c57d17b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r2.ebuild
@@ -86,8 +86,8 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
 CONFIG_CHECK="
        !DEBUG_MUTEXES
-       DRM
        ~!LOCKDEP
+       ~DRM
        ~DRM_KMS_HELPER
        ~SYSVIPC
 "

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
index 3bf3c71b97c..b100ce18918 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
@@ -86,9 +86,9 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.8"
 CONFIG_CHECK="
        !DEBUG_MUTEXES
-       DRM
        ~!I2C_NVIDIA_GPU
        ~!LOCKDEP
+       ~DRM
        ~DRM_KMS_HELPER
        ~SYSVIPC
 "

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
index d2aeed7b169..9da083cdec9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
@@ -77,9 +77,9 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.5"
 CONFIG_CHECK="
        !DEBUG_MUTEXES
-       DRM
        ~!I2C_NVIDIA_GPU
        ~!LOCKDEP
+       ~DRM
        ~DRM_KMS_HELPER
        ~SYSVIPC
 "

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
index a0a7e2f2d5f..6a7a8243317 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
@@ -81,9 +81,9 @@ S=${WORKDIR}/
 NV_KV_MAX_PLUS="5.4"
 CONFIG_CHECK="
        !DEBUG_MUTEXES
-       DRM
        ~!I2C_NVIDIA_GPU
        ~!LOCKDEP
+       ~DRM
        ~DRM_KMS_HELPER
        ~SYSVIPC
 "

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
index 5772b74a7c2..22a311dd0d1 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
@@ -84,9 +84,9 @@ PATCHES=(
 NV_KV_MAX_PLUS="5.8"
 CONFIG_CHECK="
        !DEBUG_MUTEXES
-       DRM
        ~!I2C_NVIDIA_GPU
        ~!LOCKDEP
+       ~DRM
        ~DRM_KMS_HELPER
        ~SYSVIPC
 "

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
index f6e28fa006f..d4a8209c521 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
@@ -85,10 +85,10 @@ PATCHES=(
 NV_KV_MAX_PLUS="5.8"
 CONFIG_CHECK="
        !DEBUG_MUTEXES
-       DRM
-       DRM_KMS_HELPER
        ~!I2C_NVIDIA_GPU
        ~!LOCKDEP
+       ~DRM
+       ~DRM_KMS_HELPER
        ~SYSVIPC
 "
 

Reply via email to