public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog nvidia-driver.eclass
@ 2012-11-27 17:39 Jeroen Roovers (jer)
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers (jer) @ 2012-11-27 17:39 UTC (permalink / raw
  To: gentoo-commits

jer         12/11/27 17:39:48

  Modified:             ChangeLog nvidia-driver.eclass
  Log:
  Remove ebeep because newer nvidia-drivers have EAPI=4.

Revision  Changes    Path
1.526                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.526&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.526&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.525&r2=1.526

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -r1.525 -r1.526
--- ChangeLog	27 Nov 2012 12:50:40 -0000	1.525
+++ ChangeLog	27 Nov 2012 17:39:48 -0000	1.526
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.525 2012/11/27 12:50:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.526 2012/11/27 17:39:48 jer Exp $
+
+  27 Nov 2012; Jeroen Roovers <jer@gentoo.org> nvidia-driver.eclass:
+  Remove ebeep because newer nvidia-drivers have EAPI=4.
 
   27 Nov 2012; Ulrich Müller <ulm@gentoo.org> scsh.eclass:
   Drop default LICENSE assignment.



1.18                 eclass/nvidia-driver.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?r1=1.17&r2=1.18

Index: nvidia-driver.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nvidia-driver.eclass	18 Nov 2012 06:35:06 -0000	1.17
+++ nvidia-driver.eclass	27 Nov 2012 17:39:48 -0000	1.18
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.17 2012/11/18 06:35:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.18 2012/11/27 17:39:48 jer Exp $
 
 # @ECLASS: nvidia-driver.eclass
 # @MAINTAINER:
@@ -125,7 +125,6 @@
 			ewarn
 			ewarn "For more information please read:"
 			ewarn "http://www.nvidia.com/object/IO_32667.html"
-			ebeep 5
 		fi
 	fi
 }





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog nvidia-driver.eclass
@ 2013-04-10 15:10 Jeroen Roovers (jer)
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers (jer) @ 2013-04-10 15:10 UTC (permalink / raw
  To: gentoo-commits

jer         13/04/10 15:10:18

  Modified:             ChangeLog nvidia-driver.eclass
  Log:
  Update documentation URL.

Revision  Changes    Path
1.782                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.782&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.782&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.781&r2=1.782

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.781
retrieving revision 1.782
diff -u -r1.781 -r1.782
--- ChangeLog	10 Apr 2013 15:06:42 -0000	1.781
+++ ChangeLog	10 Apr 2013 15:10:18 -0000	1.782
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.781 2013/04/10 15:06:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.782 2013/04/10 15:10:18 jer Exp $
+
+  10 Apr 2013; Jeroen Roovers <jer@gentoo.org> nvidia-driver.eclass:
+  Update documentation URL.
 
   10 Apr 2013; Jeroen Roovers <jer@gentoo.org> nvidia-driver.eclass:
   Remove duplicate PCI ID.



1.21                 eclass/nvidia-driver.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?r1=1.20&r2=1.21

Index: nvidia-driver.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nvidia-driver.eclass	10 Apr 2013 15:06:42 -0000	1.20
+++ nvidia-driver.eclass	10 Apr 2013 15:10:18 -0000	1.21
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.20 2013/04/10 15:06:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.21 2013/04/10 15:10:18 jer Exp $
 
 # @ECLASS: nvidia-driver.eclass
 # @MAINTAINER:
@@ -17,7 +17,7 @@
 DEPEND="sys-apps/pciutils"
 
 # the data below is derived from
-# http://us.download.nvidia.com/XFree86/Linux-x86_64/177.13/README/appendix-a.html
+# http://us.download.nvidia.com/XFree86/Linux-x86_64/319.12/README/supportedchips.html
 
 drv_96xx="0110 0111 0112 0113 0170 0171 0172 0173 0174 0175 0176 0177 0178 \
 0179 017a 017c 017d 0181 0182 0183 0185 0188 018a 018b 018c 01a0 01f0 0200 \





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog nvidia-driver.eclass
@ 2013-05-16 14:25 Jeroen Roovers (jer)
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers (jer) @ 2013-05-16 14:25 UTC (permalink / raw
  To: gentoo-commits

jer         13/05/16 14:25:13

  Modified:             ChangeLog nvidia-driver.eclass
  Log:
  Check for lspci before use.

Revision  Changes    Path
1.826                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.826&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.826&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.825&r2=1.826

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.825
retrieving revision 1.826
diff -u -r1.825 -r1.826
--- ChangeLog	15 May 2013 19:01:36 -0000	1.825
+++ ChangeLog	16 May 2013 14:25:13 -0000	1.826
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.825 2013/05/15 19:01:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.826 2013/05/16 14:25:13 jer Exp $
+
+  16 May 2013; Jeroen Roovers <jer@gentoo.org> nvidia-driver.eclass:
+  Check for lspci before use.
 
   15 May 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass:
   prune_libtool_files: do not remove .la files which are not libtool files.



1.22                 eclass/nvidia-driver.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?r1=1.21&r2=1.22

Index: nvidia-driver.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nvidia-driver.eclass	10 Apr 2013 15:10:18 -0000	1.21
+++ nvidia-driver.eclass	16 May 2013 14:25:13 -0000	1.22
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.21 2013/04/10 15:10:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.22 2013/05/16 14:25:13 jer Exp $
 
 # @ECLASS: nvidia-driver.eclass
 # @MAINTAINER:
@@ -49,7 +49,10 @@
 # @DESCRIPTION:
 # Retrieve the PCI device ID for each Nvidia video card you have
 nvidia-driver-get-card() {
-	local NVIDIA_CARD="$(/usr/sbin/lspci -d 10de: -n | awk -F'[: ]' '/ 0300: /{print $6}')"
+	local NVIDIA_CARD=$(
+		[ -x /usr/sbin/lspci ] && /usr/sbin/lspci -d 10de: -n \
+			| awk -F'[: ]' '/ 0300: /{print $6}'
+	)
 
 	if [ -n "$NVIDIA_CARD" ]; then
 		echo "$NVIDIA_CARD"





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog nvidia-driver.eclass
@ 2013-10-12 15:13 Jeroen Roovers (jer)
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers (jer) @ 2013-10-12 15:13 UTC (permalink / raw
  To: gentoo-commits

jer         13/10/12 15:13:00

  Modified:             ChangeLog nvidia-driver.eclass
  Log:
  Use readme.gentoo.eclass (bug #457594).

Revision  Changes    Path
1.1020               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1020&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1020&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1019&r2=1.1020

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1019
retrieving revision 1.1020
diff -u -r1.1019 -r1.1020
--- ChangeLog	12 Oct 2013 11:08:12 -0000	1.1019
+++ ChangeLog	12 Oct 2013 15:12:59 -0000	1.1020
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1019 2013/10/12 11:08:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1020 2013/10/12 15:12:59 jer Exp $
+
+  12 Oct 2013; Jeroen Roovers <jer@gentoo.org> nvidia-driver.eclass:
+  Use readme.gentoo.eclass (bug #457594).
 
   12 Oct 2013; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass:
   Do not look up Python for binary package install.



1.23                 eclass/nvidia-driver.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/nvidia-driver.eclass?r1=1.22&r2=1.23

Index: nvidia-driver.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nvidia-driver.eclass	16 May 2013 14:25:13 -0000	1.22
+++ nvidia-driver.eclass	12 Oct 2013 15:12:59 -0000	1.23
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.22 2013/05/16 14:25:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nvidia-driver.eclass,v 1.23 2013/10/12 15:12:59 jer Exp $
 
 # @ECLASS: nvidia-driver.eclass
 # @MAINTAINER:
@@ -12,10 +12,28 @@
 # Provide useful messages for nvidia-drivers based on currently installed Nvidia
 # card. It inherits versionator.
 
-inherit versionator
+inherit readme.gentoo versionator
 
 DEPEND="sys-apps/pciutils"
 
+# Variables for readme.gentoo.eclass:
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You must be in the video group to use the NVIDIA device
+For more info, read the docs at
+http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6
+
+This ebuild installs a kernel module and X driver. Both must
+match explicitly in their version. This means, if you restart
+X, you must modprobe -r nvidia before starting it back up
+
+To use the NVIDIA GLX, run \"eselect opengl set nvidia\"
+
+To use the NVIDIA CUDA/OpenCL, run \"eselect opencl set nvidia\"
+
+NVIDIA has requested that any bug reports submitted have the
+output of nvidia-bug-report.sh included.
+"
+
 # the data below is derived from
 # http://us.download.nvidia.com/XFree86/Linux-x86_64/319.12/README/supportedchips.html
 





^ permalink raw reply	[flat|nested] 5+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog nvidia-driver.eclass
@ 2014-08-10 10:02 Jeroen Roovers (jer)
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers (jer) @ 2014-08-10 10:02 UTC (permalink / raw
  To: gentoo-commits

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 <jer@gentoo.org> nvidia-driver.eclass:
+  Check for earlier version, not different version (bug #519558 by kavol).
 
   10 Aug 2014; Robin H. Johnson <robbat2@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
 }





^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2014-08-11 20:28 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-10 15:10 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog nvidia-driver.eclass Jeroen Roovers (jer)
  -- strict thread matches above, loose matches on Subject: below --
2014-08-10 10:02 Jeroen Roovers (jer)
2013-10-12 15:13 Jeroen Roovers (jer)
2013-05-16 14:25 Jeroen Roovers (jer)
2012-11-27 17:39 Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox