| 1 |
commit: 232dfcd76959f6996ae76528303916967527530a |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 27 15:02:24 2019 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 27 15:07:01 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=232dfcd7 |
| 7 |
|
| 8 |
x11-drivers/nvidia-drivers: EAPI=7, use nvidia-driver_check() |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
| 11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 12 |
|
| 13 |
.../nvidia-drivers-340.107-r1.ebuild | 52 ++++------------------ |
| 14 |
.../nvidia-drivers/nvidia-drivers-390.129.ebuild | 49 ++++---------------- |
| 15 |
.../nvidia-drivers/nvidia-drivers-390.132.ebuild | 49 ++++---------------- |
| 16 |
.../nvidia-drivers/nvidia-drivers-430.64.ebuild | 46 +++---------------- |
| 17 |
.../nvidia-drivers/nvidia-drivers-435.21.ebuild | 46 +++---------------- |
| 18 |
.../nvidia-drivers/nvidia-drivers-440.31.ebuild | 46 +++---------------- |
| 19 |
.../nvidia-drivers/nvidia-drivers-440.36.ebuild | 46 +++---------------- |
| 20 |
7 files changed, 55 insertions(+), 279 deletions(-) |
| 21 |
|
| 22 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.107-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.107-r1.ebuild |
| 23 |
index 5f370d0daef..b34dd683033 100644 |
| 24 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.107-r1.ebuild |
| 25 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.107-r1.ebuild |
| 26 |
@@ -1,9 +1,9 @@ |
| 27 |
# Copyright 1999-2019 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
-EAPI=6 |
| 31 |
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \ |
| 32 |
- portability toolchain-funcs unpacker user udev |
| 33 |
+EAPI=7 |
| 34 |
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \ |
| 35 |
+ nvidia-driver portability toolchain-funcs unpacker user udev |
| 36 |
|
| 37 |
NV_URI="https://us.download.nvidia.com/XFree86/" |
| 38 |
X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" |
| 39 |
@@ -66,54 +66,20 @@ RDEPEND=" |
| 40 |
) |
| 41 |
) |
| 42 |
" |
| 43 |
- |
| 44 |
REQUIRED_USE="tools? ( X )" |
| 45 |
- |
| 46 |
QA_PREBUILT="opt/* usr/lib*" |
| 47 |
- |
| 48 |
S=${WORKDIR}/ |
| 49 |
- |
| 50 |
-nvidia_drivers_versions_check() { |
| 51 |
- if use amd64 && has_multilib_profile && \ |
| 52 |
- [ "${DEFAULT_ABI}" != "amd64" ]; then |
| 53 |
- eerror "This ebuild doesn't currently support changing your default ABI" |
| 54 |
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" |
| 55 |
- fi |
| 56 |
- |
| 57 |
- if use kernel_linux && kernel_is ge 4 18; then |
| 58 |
- ewarn "Gentoo supports kernels which are supported by NVIDIA" |
| 59 |
- ewarn "which are limited to the following kernels:" |
| 60 |
- ewarn "<sys-kernel/gentoo-sources-4.18" |
| 61 |
- ewarn "<sys-kernel/vanilla-sources-4.18" |
| 62 |
- ewarn "" |
| 63 |
- ewarn "You are free to utilize eapply_user to provide whatever" |
| 64 |
- ewarn "support you feel is appropriate, but will not receive" |
| 65 |
- ewarn "support as a result of those changes." |
| 66 |
- ewarn "" |
| 67 |
- ewarn "Do not file a bug report about this." |
| 68 |
- ewarn "" |
| 69 |
- fi |
| 70 |
- |
| 71 |
- # Since Nvidia ships many different series of drivers, we need to give the user |
| 72 |
- # some kind of guidance as to what version they should install. This tries |
| 73 |
- # to point the user in the right direction but can't be perfect. check |
| 74 |
- # nvidia-driver.eclass |
| 75 |
- nvidia-driver-check-warning |
| 76 |
- |
| 77 |
- # Kernel features/options to check for |
| 78 |
- CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 79 |
- use x86 && CONFIG_CHECK+=" ~HIGHMEM" |
| 80 |
- |
| 81 |
- # Now do the above checks |
| 82 |
- use kernel_linux && check_extra_config |
| 83 |
-} |
| 84 |
+NV_KV_MAX_PLUS="4.18" |
| 85 |
+CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 86 |
|
| 87 |
pkg_pretend() { |
| 88 |
- nvidia_drivers_versions_check |
| 89 |
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM" |
| 90 |
+ nvidia-driver_check |
| 91 |
} |
| 92 |
|
| 93 |
pkg_setup() { |
| 94 |
- nvidia_drivers_versions_check |
| 95 |
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM" |
| 96 |
+ nvidia-driver_check |
| 97 |
|
| 98 |
# try to turn off distcc and ccache for people that have a problem with it |
| 99 |
export DISTCC_DISABLE=1 |
| 100 |
|
| 101 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.129.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.129.ebuild |
| 102 |
index 705a1973f01..152ff221b9a 100644 |
| 103 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.129.ebuild |
| 104 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.129.ebuild |
| 105 |
@@ -1,9 +1,9 @@ |
| 106 |
# Copyright 1999-2019 Gentoo Authors |
| 107 |
# Distributed under the terms of the GNU General Public License v2 |
| 108 |
|
| 109 |
-EAPI=6 |
| 110 |
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \ |
| 111 |
- portability toolchain-funcs unpacker user udev |
| 112 |
+EAPI=7 |
| 113 |
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \ |
| 114 |
+ nvidia-driver portability toolchain-funcs unpacker user udev |
| 115 |
|
| 116 |
DESCRIPTION="NVIDIA Accelerated Graphics Driver" |
| 117 |
HOMEPAGE="https://www.nvidia.com/" |
| 118 |
@@ -82,48 +82,17 @@ RDEPEND=" |
| 119 |
" |
| 120 |
QA_PREBUILT="opt/* usr/lib*" |
| 121 |
S=${WORKDIR}/ |
| 122 |
- |
| 123 |
-nvidia_drivers_versions_check() { |
| 124 |
- if use amd64 && has_multilib_profile && \ |
| 125 |
- [ "${DEFAULT_ABI}" != "amd64" ]; then |
| 126 |
- eerror "This ebuild doesn't currently support changing your default ABI" |
| 127 |
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" |
| 128 |
- fi |
| 129 |
- |
| 130 |
- if use kernel_linux && kernel_is ge 5 4; then |
| 131 |
- ewarn "Gentoo supports kernels which are supported by NVIDIA" |
| 132 |
- ewarn "which are limited to the following kernels:" |
| 133 |
- ewarn "<sys-kernel/gentoo-sources-5.4" |
| 134 |
- ewarn "<sys-kernel/vanilla-sources-5.4" |
| 135 |
- ewarn "" |
| 136 |
- ewarn "You are free to utilize epatch_user to provide whatever" |
| 137 |
- ewarn "support you feel is appropriate, but will not receive" |
| 138 |
- ewarn "support as a result of those changes." |
| 139 |
- ewarn "" |
| 140 |
- ewarn "Do not file a bug report about this." |
| 141 |
- ewarn "" |
| 142 |
- fi |
| 143 |
- |
| 144 |
- # Since Nvidia ships many different series of drivers, we need to give the user |
| 145 |
- # some kind of guidance as to what version they should install. This tries |
| 146 |
- # to point the user in the right direction but can't be perfect. check |
| 147 |
- # nvidia-driver.eclass |
| 148 |
- nvidia-driver-check-warning |
| 149 |
- |
| 150 |
- # Kernel features/options to check for |
| 151 |
- CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 152 |
- use x86 && CONFIG_CHECK+=" ~HIGHMEM" |
| 153 |
- |
| 154 |
- # Now do the above checks |
| 155 |
- use kernel_linux && check_extra_config |
| 156 |
-} |
| 157 |
+NV_KV_MAX_PLUS="5.4" |
| 158 |
+CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 159 |
|
| 160 |
pkg_pretend() { |
| 161 |
- nvidia_drivers_versions_check |
| 162 |
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM" |
| 163 |
+ nvidia-driver_check |
| 164 |
} |
| 165 |
|
| 166 |
pkg_setup() { |
| 167 |
- nvidia_drivers_versions_check |
| 168 |
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM" |
| 169 |
+ nvidia-driver_check |
| 170 |
|
| 171 |
# try to turn off distcc and ccache for people that have a problem with it |
| 172 |
export DISTCC_DISABLE=1 |
| 173 |
|
| 174 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild |
| 175 |
index 368ed5f2bcd..4860d956b4b 100644 |
| 176 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild |
| 177 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132.ebuild |
| 178 |
@@ -1,9 +1,9 @@ |
| 179 |
# Copyright 1999-2019 Gentoo Authors |
| 180 |
# Distributed under the terms of the GNU General Public License v2 |
| 181 |
|
| 182 |
-EAPI=6 |
| 183 |
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \ |
| 184 |
- portability toolchain-funcs unpacker user udev |
| 185 |
+EAPI=7 |
| 186 |
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \ |
| 187 |
+ nvidia-driver portability toolchain-funcs unpacker user udev |
| 188 |
|
| 189 |
DESCRIPTION="NVIDIA Accelerated Graphics Driver" |
| 190 |
HOMEPAGE="https://www.nvidia.com/" |
| 191 |
@@ -82,48 +82,17 @@ RDEPEND=" |
| 192 |
" |
| 193 |
QA_PREBUILT="opt/* usr/lib*" |
| 194 |
S=${WORKDIR}/ |
| 195 |
- |
| 196 |
-nvidia_drivers_versions_check() { |
| 197 |
- if use amd64 && has_multilib_profile && \ |
| 198 |
- [ "${DEFAULT_ABI}" != "amd64" ]; then |
| 199 |
- eerror "This ebuild doesn't currently support changing your default ABI" |
| 200 |
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" |
| 201 |
- fi |
| 202 |
- |
| 203 |
- if use kernel_linux && kernel_is ge 5 4; then |
| 204 |
- ewarn "Gentoo supports kernels which are supported by NVIDIA" |
| 205 |
- ewarn "which are limited to the following kernels:" |
| 206 |
- ewarn "<sys-kernel/gentoo-sources-5.4" |
| 207 |
- ewarn "<sys-kernel/vanilla-sources-5.4" |
| 208 |
- ewarn "" |
| 209 |
- ewarn "You are free to utilize epatch_user to provide whatever" |
| 210 |
- ewarn "support you feel is appropriate, but will not receive" |
| 211 |
- ewarn "support as a result of those changes." |
| 212 |
- ewarn "" |
| 213 |
- ewarn "Do not file a bug report about this." |
| 214 |
- ewarn "" |
| 215 |
- fi |
| 216 |
- |
| 217 |
- # Since Nvidia ships many different series of drivers, we need to give the user |
| 218 |
- # some kind of guidance as to what version they should install. This tries |
| 219 |
- # to point the user in the right direction but can't be perfect. check |
| 220 |
- # nvidia-driver.eclass |
| 221 |
- nvidia-driver-check-warning |
| 222 |
- |
| 223 |
- # Kernel features/options to check for |
| 224 |
- CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 225 |
- use x86 && CONFIG_CHECK+=" ~HIGHMEM" |
| 226 |
- |
| 227 |
- # Now do the above checks |
| 228 |
- use kernel_linux && check_extra_config |
| 229 |
-} |
| 230 |
+NV_KV_MAX_PLUS="5.4" |
| 231 |
+CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 232 |
|
| 233 |
pkg_pretend() { |
| 234 |
- nvidia_drivers_versions_check |
| 235 |
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM" |
| 236 |
+ nvidia-driver_check |
| 237 |
} |
| 238 |
|
| 239 |
pkg_setup() { |
| 240 |
- nvidia_drivers_versions_check |
| 241 |
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM" |
| 242 |
+ nvidia-driver_check |
| 243 |
|
| 244 |
# try to turn off distcc and ccache for people that have a problem with it |
| 245 |
export DISTCC_DISABLE=1 |
| 246 |
|
| 247 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64.ebuild |
| 248 |
index 4c25381ffa1..527d41f645f 100644 |
| 249 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64.ebuild |
| 250 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64.ebuild |
| 251 |
@@ -1,9 +1,9 @@ |
| 252 |
# Copyright 1999-2019 Gentoo Authors |
| 253 |
# Distributed under the terms of the GNU General Public License v2 |
| 254 |
|
| 255 |
-EAPI=6 |
| 256 |
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \ |
| 257 |
- portability toolchain-funcs unpacker user udev |
| 258 |
+EAPI=7 |
| 259 |
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \ |
| 260 |
+ nvidia-driver portability toolchain-funcs unpacker user udev |
| 261 |
|
| 262 |
DESCRIPTION="NVIDIA Accelerated Graphics Driver" |
| 263 |
HOMEPAGE="https://www.nvidia.com/" |
| 264 |
@@ -77,47 +77,15 @@ RDEPEND=" |
| 265 |
" |
| 266 |
QA_PREBUILT="opt/* usr/lib*" |
| 267 |
S=${WORKDIR}/ |
| 268 |
- |
| 269 |
-nvidia_drivers_versions_check() { |
| 270 |
- if use amd64 && has_multilib_profile && \ |
| 271 |
- [ "${DEFAULT_ABI}" != "amd64" ]; then |
| 272 |
- eerror "This ebuild doesn't currently support changing your default ABI" |
| 273 |
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" |
| 274 |
- fi |
| 275 |
- |
| 276 |
- if use kernel_linux && kernel_is ge 5 4; then |
| 277 |
- ewarn "Gentoo supports kernels which are supported by NVIDIA" |
| 278 |
- ewarn "which are limited to the following kernels:" |
| 279 |
- ewarn "<sys-kernel/gentoo-sources-5.4" |
| 280 |
- ewarn "<sys-kernel/vanilla-sources-5.4" |
| 281 |
- ewarn "" |
| 282 |
- ewarn "You are free to utilize epatch_user to provide whatever" |
| 283 |
- ewarn "support you feel is appropriate, but will not receive" |
| 284 |
- ewarn "support as a result of those changes." |
| 285 |
- ewarn "" |
| 286 |
- ewarn "Do not file a bug report about this." |
| 287 |
- ewarn "" |
| 288 |
- fi |
| 289 |
- |
| 290 |
- # Since Nvidia ships many different series of drivers, we need to give the user |
| 291 |
- # some kind of guidance as to what version they should install. This tries |
| 292 |
- # to point the user in the right direction but can't be perfect. check |
| 293 |
- # nvidia-driver.eclass |
| 294 |
- nvidia-driver-check-warning |
| 295 |
- |
| 296 |
- # Kernel features/options to check for |
| 297 |
- CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 298 |
- |
| 299 |
- # Now do the above checks |
| 300 |
- use kernel_linux && check_extra_config |
| 301 |
-} |
| 302 |
+NV_KV_MAX_PLUS="5.4" |
| 303 |
+CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 304 |
|
| 305 |
pkg_pretend() { |
| 306 |
- nvidia_drivers_versions_check |
| 307 |
+ nvidia-driver_check |
| 308 |
} |
| 309 |
|
| 310 |
pkg_setup() { |
| 311 |
- nvidia_drivers_versions_check |
| 312 |
+ nvidia-driver_check |
| 313 |
|
| 314 |
# try to turn off distcc and ccache for people that have a problem with it |
| 315 |
export DISTCC_DISABLE=1 |
| 316 |
|
| 317 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild |
| 318 |
index ba476b4116d..42b292bb521 100644 |
| 319 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild |
| 320 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild |
| 321 |
@@ -1,9 +1,9 @@ |
| 322 |
# Copyright 1999-2019 Gentoo Authors |
| 323 |
# Distributed under the terms of the GNU General Public License v2 |
| 324 |
|
| 325 |
-EAPI=6 |
| 326 |
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \ |
| 327 |
- portability toolchain-funcs unpacker user udev |
| 328 |
+EAPI=7 |
| 329 |
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \ |
| 330 |
+ nvidia-driver portability toolchain-funcs unpacker user udev |
| 331 |
|
| 332 |
DESCRIPTION="NVIDIA Accelerated Graphics Driver" |
| 333 |
HOMEPAGE="https://www.nvidia.com/" |
| 334 |
@@ -81,47 +81,15 @@ RDEPEND=" |
| 335 |
" |
| 336 |
QA_PREBUILT="opt/* usr/lib*" |
| 337 |
S=${WORKDIR}/ |
| 338 |
- |
| 339 |
-nvidia_drivers_versions_check() { |
| 340 |
- if use amd64 && has_multilib_profile && \ |
| 341 |
- [ "${DEFAULT_ABI}" != "amd64" ]; then |
| 342 |
- eerror "This ebuild doesn't currently support changing your default ABI" |
| 343 |
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" |
| 344 |
- fi |
| 345 |
- |
| 346 |
- if use kernel_linux && kernel_is ge 5 4; then |
| 347 |
- ewarn "Gentoo supports kernels which are supported by NVIDIA" |
| 348 |
- ewarn "which are limited to the following kernels:" |
| 349 |
- ewarn "<sys-kernel/gentoo-sources-5.4" |
| 350 |
- ewarn "<sys-kernel/vanilla-sources-5.4" |
| 351 |
- ewarn "" |
| 352 |
- ewarn "You are free to utilize epatch_user to provide whatever" |
| 353 |
- ewarn "support you feel is appropriate, but will not receive" |
| 354 |
- ewarn "support as a result of those changes." |
| 355 |
- ewarn "" |
| 356 |
- ewarn "Do not file a bug report about this." |
| 357 |
- ewarn "" |
| 358 |
- fi |
| 359 |
- |
| 360 |
- # Since Nvidia ships many different series of drivers, we need to give the user |
| 361 |
- # some kind of guidance as to what version they should install. This tries |
| 362 |
- # to point the user in the right direction but can't be perfect. check |
| 363 |
- # nvidia-driver.eclass |
| 364 |
- nvidia-driver-check-warning |
| 365 |
- |
| 366 |
- # Kernel features/options to check for |
| 367 |
- CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 368 |
- |
| 369 |
- # Now do the above checks |
| 370 |
- use kernel_linux && check_extra_config |
| 371 |
-} |
| 372 |
+NV_KV_MAX_PLUS="5.4" |
| 373 |
+CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 374 |
|
| 375 |
pkg_pretend() { |
| 376 |
- nvidia_drivers_versions_check |
| 377 |
+ nvidia-driver_check |
| 378 |
} |
| 379 |
|
| 380 |
pkg_setup() { |
| 381 |
- nvidia_drivers_versions_check |
| 382 |
+ nvidia-driver_check |
| 383 |
|
| 384 |
# try to turn off distcc and ccache for people that have a problem with it |
| 385 |
export DISTCC_DISABLE=1 |
| 386 |
|
| 387 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.31.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.31.ebuild |
| 388 |
index be2de040f76..4acf4397da7 100644 |
| 389 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.31.ebuild |
| 390 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.31.ebuild |
| 391 |
@@ -1,9 +1,9 @@ |
| 392 |
# Copyright 1999-2019 Gentoo Authors |
| 393 |
# Distributed under the terms of the GNU General Public License v2 |
| 394 |
|
| 395 |
-EAPI=6 |
| 396 |
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \ |
| 397 |
- portability toolchain-funcs unpacker user udev |
| 398 |
+EAPI=7 |
| 399 |
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \ |
| 400 |
+ nvidia-driver portability toolchain-funcs unpacker user udev |
| 401 |
|
| 402 |
DESCRIPTION="NVIDIA Accelerated Graphics Driver" |
| 403 |
HOMEPAGE="https://www.nvidia.com/" |
| 404 |
@@ -84,47 +84,15 @@ S=${WORKDIR}/ |
| 405 |
PATCHES=( |
| 406 |
"${FILESDIR}"/${PN}-440.26-locale.patch |
| 407 |
) |
| 408 |
- |
| 409 |
-nvidia_drivers_versions_check() { |
| 410 |
- if use amd64 && has_multilib_profile && \ |
| 411 |
- [ "${DEFAULT_ABI}" != "amd64" ]; then |
| 412 |
- eerror "This ebuild doesn't currently support changing your default ABI" |
| 413 |
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" |
| 414 |
- fi |
| 415 |
- |
| 416 |
- if use kernel_linux && kernel_is ge 5 4; then |
| 417 |
- ewarn "Gentoo supports kernels which are supported by NVIDIA" |
| 418 |
- ewarn "which are limited to the following kernels:" |
| 419 |
- ewarn "<sys-kernel/gentoo-sources-5.4" |
| 420 |
- ewarn "<sys-kernel/vanilla-sources-5.4" |
| 421 |
- ewarn "" |
| 422 |
- ewarn "You are free to utilize epatch_user to provide whatever" |
| 423 |
- ewarn "support you feel is appropriate, but will not receive" |
| 424 |
- ewarn "support as a result of those changes." |
| 425 |
- ewarn "" |
| 426 |
- ewarn "Do not file a bug report about this." |
| 427 |
- ewarn "" |
| 428 |
- fi |
| 429 |
- |
| 430 |
- # Since Nvidia ships many different series of drivers, we need to give the user |
| 431 |
- # some kind of guidance as to what version they should install. This tries |
| 432 |
- # to point the user in the right direction but can't be perfect. check |
| 433 |
- # nvidia-driver.eclass |
| 434 |
- nvidia-driver-check-warning |
| 435 |
- |
| 436 |
- # Kernel features/options to check for |
| 437 |
- CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 438 |
- |
| 439 |
- # Now do the above checks |
| 440 |
- use kernel_linux && check_extra_config |
| 441 |
-} |
| 442 |
+NV_KV_MAX_PLUS="5.4" |
| 443 |
+CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 444 |
|
| 445 |
pkg_pretend() { |
| 446 |
- nvidia_drivers_versions_check |
| 447 |
+ nvidia-driver_check |
| 448 |
} |
| 449 |
|
| 450 |
pkg_setup() { |
| 451 |
- nvidia_drivers_versions_check |
| 452 |
+ nvidia-driver_check |
| 453 |
|
| 454 |
# try to turn off distcc and ccache for people that have a problem with it |
| 455 |
export DISTCC_DISABLE=1 |
| 456 |
|
| 457 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.36.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.36.ebuild |
| 458 |
index f1723d4e80d..388adda4e50 100644 |
| 459 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.36.ebuild |
| 460 |
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.36.ebuild |
| 461 |
@@ -1,9 +1,9 @@ |
| 462 |
# Copyright 1999-2019 Gentoo Authors |
| 463 |
# Distributed under the terms of the GNU General Public License v2 |
| 464 |
|
| 465 |
-EAPI=6 |
| 466 |
-inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \ |
| 467 |
- portability toolchain-funcs unpacker user udev |
| 468 |
+EAPI=7 |
| 469 |
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \ |
| 470 |
+ nvidia-driver portability toolchain-funcs unpacker user udev |
| 471 |
|
| 472 |
DESCRIPTION="NVIDIA Accelerated Graphics Driver" |
| 473 |
HOMEPAGE="https://www.nvidia.com/" |
| 474 |
@@ -84,47 +84,15 @@ S=${WORKDIR}/ |
| 475 |
PATCHES=( |
| 476 |
"${FILESDIR}"/${PN}-440.26-locale.patch |
| 477 |
) |
| 478 |
- |
| 479 |
-nvidia_drivers_versions_check() { |
| 480 |
- if use amd64 && has_multilib_profile && \ |
| 481 |
- [ "${DEFAULT_ABI}" != "amd64" ]; then |
| 482 |
- eerror "This ebuild doesn't currently support changing your default ABI" |
| 483 |
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" |
| 484 |
- fi |
| 485 |
- |
| 486 |
- if use kernel_linux && kernel_is ge 5 4; then |
| 487 |
- ewarn "Gentoo supports kernels which are supported by NVIDIA" |
| 488 |
- ewarn "which are limited to the following kernels:" |
| 489 |
- ewarn "<sys-kernel/gentoo-sources-5.4" |
| 490 |
- ewarn "<sys-kernel/vanilla-sources-5.4" |
| 491 |
- ewarn "" |
| 492 |
- ewarn "You are free to utilize epatch_user to provide whatever" |
| 493 |
- ewarn "support you feel is appropriate, but will not receive" |
| 494 |
- ewarn "support as a result of those changes." |
| 495 |
- ewarn "" |
| 496 |
- ewarn "Do not file a bug report about this." |
| 497 |
- ewarn "" |
| 498 |
- fi |
| 499 |
- |
| 500 |
- # Since Nvidia ships many different series of drivers, we need to give the user |
| 501 |
- # some kind of guidance as to what version they should install. This tries |
| 502 |
- # to point the user in the right direction but can't be perfect. check |
| 503 |
- # nvidia-driver.eclass |
| 504 |
- nvidia-driver-check-warning |
| 505 |
- |
| 506 |
- # Kernel features/options to check for |
| 507 |
- CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 508 |
- |
| 509 |
- # Now do the above checks |
| 510 |
- use kernel_linux && check_extra_config |
| 511 |
-} |
| 512 |
+NV_KV_MAX_PLUS="5.4" |
| 513 |
+CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA" |
| 514 |
|
| 515 |
pkg_pretend() { |
| 516 |
- nvidia_drivers_versions_check |
| 517 |
+ nvidia-driver_check |
| 518 |
} |
| 519 |
|
| 520 |
pkg_setup() { |
| 521 |
- nvidia_drivers_versions_check |
| 522 |
+ nvidia-driver_check |
| 523 |
|
| 524 |
# try to turn off distcc and ccache for people that have a problem with it |
| 525 |
export DISTCC_DISABLE=1 |
Archives