jer 14/08/10 10:02:43 Modified: ChangeLog nvidia-driver.eclass Log: Check for earlier version, not different version (bug #519558 by kavol).
Revision Changes Path 1.1348 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1348&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1348&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1347&r2=1.1348 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1347 retrieving revision 1.1348 diff -u -r1.1347 -r1.1348 --- ChangeLog 10 Aug 2014 05:47:25 -0000 1.1347 +++ ChangeLog 10 Aug 2014 10:02:43 -0000 1.1348 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1347 2014/08/10 05:47:25 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1348 2014/08/10 10:02:43 jer Exp $ + + 10 Aug 2014; Jeroen Roovers <j...@gentoo.org> nvidia-driver.eclass: + Check for earlier version, not different version (bug #519558 by kavol). 10 Aug 2014; Robin H. Johnson <robb...@gentoo.org> mysql-v2.eclass: Add extra download URL from overlay. 1.25 eclass/nvidia-driver.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?rev=1.25&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?rev=1.25&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?r1=1.24&r2=1.25 Index: nvidia-driver.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- nvidia-driver.eclass 8 Aug 2014 12:13:38 -0000 1.24 +++ nvidia-driver.eclass 10 Aug 2014 10:02:43 -0000 1.25 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.24 2014/08/08 12:13:38 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.25 2014/08/10 10:02:43 jer Exp $ # @ECLASS: nvidia-driver.eclass # @MAINTAINER: @@ -66,7 +66,6 @@ 03d2 03d5 03d6 0531 0533 053a 053b 053e 07e0 07e1 07e2 07e3 07e5 " - drv_340x=" 0191 0193 0194 0197 019d 019e 0400 0401 0402 0403 0404 0405 0406 0407 0408 0409 040a 040b 040c 040d 040e 040f 0410 0420 0421 0422 0423 0424 0425 0426 @@ -162,25 +161,28 @@ nvidia-driver-check-warning() { local NVIDIA_MASK="$(nvidia-driver-get-mask)" - if [ -n "${NVIDIA_MASK}" ] && ! version_compare "${NVIDIA_MASK##*-}" "${PV}"; then - ewarn "***** WARNING *****" - ewarn - ewarn "You are currently installing a version of nvidia-drivers that is" - ewarn "known not to work with a video card you have installed on your" - 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" + if [ -n "${NVIDIA_MASK}" ]; then + version_compare "${NVIDIA_MASK##*-}" "${PV}" + if [ x"${?}" = x1 ]; then + ewarn "***** WARNING *****" + ewarn + ewarn "You are currently installing a version of nvidia-drivers that is" + ewarn "known not to work with a video card you have installed on your" + 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 + ewarn "Failure to perform the steps above could result in a non-working" + ewarn "X setup." + ewarn + ewarn "For more information please read:" + ewarn "http://www.nvidia.com/object/IO_32667.html"; fi - ewarn - ewarn "Failure to perform the steps above could result in a non-working" - ewarn "X setup." - ewarn - ewarn "For more information please read:" - ewarn "http://www.nvidia.com/object/IO_32667.html"; fi }
