[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     4299ada5fadaa2a6e1e492b010cd7e20dedcec3b
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  5 15:14:11 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Apr  5 15:22:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4299ada5

x11-drivers/nvidia-drivers: extend unsupported card warning

The suggested solution only works when the drivers are available
(and ideally supported, unlike masked 390.x). So make note of it
and suggest nouveau as the alternative.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03.ebuild | 6 ++++--
 x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01.ebuild | 6 ++++--
 x11-drivers/nvidia-drivers/nvidia-drivers-525.105.17.ebuild | 6 ++++--
 x11-drivers/nvidia-drivers/nvidia-drivers-525.47.18.ebuild  | 6 ++++--
 x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03.ebuild  | 6 ++++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03.ebuild
index ef70baa7d28b..2abb35e6737e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.182.03.ebuild
@@ -556,8 +556,10 @@ pkg_postinst() {
 		else
 			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
 		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
+		ewarn "...then downgrade to a legacy[1] branch if possible (not all old versions"
+		ewarn "are available or fully functional, may need to consider nouveau[2])."
+		ewarn "[1] https://www.nvidia.com/object/IO_32667.html"
+		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
 	fi
 
 	if use wayland && use driver && [[ ! -v NV_HAD_WAYLAND ]]; then

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01.ebuild
index 95ecc0e9a358..7fcb405e6acf 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.105.01.ebuild
@@ -606,8 +606,10 @@ pkg_postinst() {
 		else
 			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
 		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
+		ewarn "...then downgrade to a legacy[1] branch if possible (not all old versions"
+		ewarn "are available or fully functional, may need to consider nouveau[2])."
+		ewarn "[1] https://www.nvidia.com/object/IO_32667.html"
+		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
 	fi
 
 	if use kernel-open; then

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.105.17.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.105.17.ebuild
index 17ab77c86399..9b88248979ec 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.105.17.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.105.17.ebuild
@@ -604,8 +604,10 @@ pkg_postinst() {
 		else
 			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
 		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
+		ewarn "...then downgrade to a legacy[1] branch if possible (not all old versions"
+		ewarn "are available or fully functional, may need to consider nouveau[2])."
+		ewarn "[1] https://www.nvidia.com/object/IO_32667.html"
+		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
 	fi
 
 	if use kernel-open; then

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.18.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.18.ebuild
index e36092e03941..29a269054c53 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.18.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.47.18.ebuild
@@ -605,8 +605,10 @@ pkg_postinst() {
 		else
 			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
 		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
+		ewarn "...then downgrade to a legacy[1] branch if possible (not all old versions"
+		ewarn "are available or fully functional, may need to consider nouveau[2])."
+		ewarn "[1] https://www.nvidia.com/object/IO_32667.html"
+		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
 	fi
 
 	if use kernel-open; then

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03.ebuild
index 868a238ac913..f8db9bcd3aab 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-530.41.03.ebuild
@@ -604,8 +604,10 @@ pkg_postinst() {
 		else
 			ewarn "  echo '${NV_LEGACY_MASK}' >> ${EROOT}/etc/portage/package.mask"
 		fi
-		ewarn "...then downgrade to a legacy branch if possible. For details, see:"
-		ewarn "https://www.nvidia.com/object/IO_32667.html"
+		ewarn "...then downgrade to a legacy[1] branch if possible (not all old versions"
+		ewarn "are available or fully functional, may need to consider nouveau[2])."
+		ewarn "[1] https://www.nvidia.com/object/IO_32667.html"
+		ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
 	fi
 
 	if use kernel-open; then