From 77e7800a9e300dc178ad9d280aebe8267c80c967 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Wed, 23 Sep 2015 07:31:12 +0200 Subject: [PATCH] Replace mask advice with sub-SLOT advice --- eclass/nvidia-driver.eclass | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/eclass/nvidia-driver.eclass b/eclass/nvidia-driver.eclass index 44ef003fd136..def839554bed 100644 --- a/eclass/nvidia-driver.eclass +++ b/eclass/nvidia-driver.eclass @@ -88,11 +88,11 @@ drv_340x=" 0caf 0cb0 0cb1 0cbc 10c0 10c3 10c5 10d8 " -mask_71xx=">=x11-drivers/nvidia-drivers-72.0.0" -mask_96xx=">=x11-drivers/nvidia-drivers-97.0.0" -mask_173x=">=x11-drivers/nvidia-drivers-177.0.0" -mask_304x=">=x11-drivers/nvidia-drivers-305.0.0" -mask_340x=">=x11-drivers/nvidia-drivers-341.0.0" +mask_71xx="x11-drivers/nvidia-drivers:0/71" +mask_96xx="x11-drivers/nvidia-drivers:0/96" +mask_173x="x11-drivers/nvidia-drivers:0/173" +mask_304x="x11-drivers/nvidia-drivers:0/304" +mask_340x="x11-drivers/nvidia-drivers:0/340" # @FUNCTION: nvidia-driver-get-card # @DESCRIPTION: @@ -171,12 +171,8 @@ nvidia-driver-check-warning() { ewarn "system. If this is intentional, please ignore this. If it is not" ewarn "please perform the following steps:" ewarn - ewarn "Add the following mask entry to /etc/portage/package.mask by" - if [ -d "${ROOT}/etc/portage/package.mask" ]; then - ewarn "echo \"${NVIDIA_MASK}\" > /etc/portage/package.mask/nvidia-drivers" - else - ewarn "echo \"${NVIDIA_MASK}\" >> /etc/portage/package.mask" - fi + ewarn "Emerge the following branch of x11-drivers/nvidia-drivers:" + ewarn "emerge ${NVIDIA_MASK}" ewarn ewarn "Failure to perform the steps above could result in a non-working" ewarn "X setup." -- 2.26.2