| 1 |
commit: 587feb1bdaa44fc87063880491cce5d88a0c782f |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 23 05:38:02 2015 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 23 05:45:27 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=587feb1b |
| 7 |
|
| 8 |
Revert "Replace mask advice with sub-SLOT advice" |
| 9 |
|
| 10 |
This reverts commit 0634398fa7c920efbab0ef30cf26eebec755deba. |
| 11 |
|
| 12 |
eclass/nvidia-driver.eclass | 18 +++++++++++------- |
| 13 |
1 file changed, 11 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/nvidia-driver.eclass b/eclass/nvidia-driver.eclass |
| 16 |
index def8395..44ef003 100644 |
| 17 |
--- a/eclass/nvidia-driver.eclass |
| 18 |
+++ b/eclass/nvidia-driver.eclass |
| 19 |
@@ -88,11 +88,11 @@ drv_340x=" |
| 20 |
0caf 0cb0 0cb1 0cbc 10c0 10c3 10c5 10d8 |
| 21 |
" |
| 22 |
|
| 23 |
-mask_71xx="x11-drivers/nvidia-drivers:0/71" |
| 24 |
-mask_96xx="x11-drivers/nvidia-drivers:0/96" |
| 25 |
-mask_173x="x11-drivers/nvidia-drivers:0/173" |
| 26 |
-mask_304x="x11-drivers/nvidia-drivers:0/304" |
| 27 |
-mask_340x="x11-drivers/nvidia-drivers:0/340" |
| 28 |
+mask_71xx=">=x11-drivers/nvidia-drivers-72.0.0" |
| 29 |
+mask_96xx=">=x11-drivers/nvidia-drivers-97.0.0" |
| 30 |
+mask_173x=">=x11-drivers/nvidia-drivers-177.0.0" |
| 31 |
+mask_304x=">=x11-drivers/nvidia-drivers-305.0.0" |
| 32 |
+mask_340x=">=x11-drivers/nvidia-drivers-341.0.0" |
| 33 |
|
| 34 |
# @FUNCTION: nvidia-driver-get-card |
| 35 |
# @DESCRIPTION: |
| 36 |
@@ -171,8 +171,12 @@ nvidia-driver-check-warning() { |
| 37 |
ewarn "system. If this is intentional, please ignore this. If it is not" |
| 38 |
ewarn "please perform the following steps:" |
| 39 |
ewarn |
| 40 |
- ewarn "Emerge the following branch of x11-drivers/nvidia-drivers:" |
| 41 |
- ewarn "emerge ${NVIDIA_MASK}" |
| 42 |
+ ewarn "Add the following mask entry to /etc/portage/package.mask by" |
| 43 |
+ if [ -d "${ROOT}/etc/portage/package.mask" ]; then |
| 44 |
+ ewarn "echo \"${NVIDIA_MASK}\" > /etc/portage/package.mask/nvidia-drivers" |
| 45 |
+ else |
| 46 |
+ ewarn "echo \"${NVIDIA_MASK}\" >> /etc/portage/package.mask" |
| 47 |
+ fi |
| 48 |
ewarn |
| 49 |
ewarn "Failure to perform the steps above could result in a non-working" |
| 50 |
ewarn "X setup." |
Archives