Add a modprobe.d script for the UVM driver by Alexander Monakov (bug #506168).

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 18 insertions, 3 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 17cf5a2024c9..3a42fa0d5a37 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.540 2014/03/20 16:05:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.541 2014/03/29 16:49:49 jer Exp $
+
+*nvidia-drivers-334.21-r2 (29 Mar 2014)
+*nvidia-drivers-331.49-r2 (29 Mar 2014)
+
+  29 Mar 2014; Jeroen Roovers <jer@gentoo.org>
+  -nvidia-drivers-331.49-r1.ebuild, +nvidia-drivers-331.49-r2.ebuild,
+  -nvidia-drivers-334.21-r1.ebuild, +nvidia-drivers-334.21-r2.ebuild,
+  +files/nvidia-uvm.conf:
+  Add a modprobe.d script for the UVM driver by Alexander Monakov (bug
+  #506168).
 
   20 Mar 2014; Jeroen Roovers <jer@gentoo.org> -nvidia-drivers-304.119.ebuild,
   nvidia-drivers-304.121.ebuild:
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-uvm.conf b/x11-drivers/nvidia-drivers/files/nvidia-uvm.conf
new file mode 100644
index 000000000000..18566d7dc0f3
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-uvm.conf
@@ -0,0 +1,3 @@
+# Nvidia UVM support
+
+softdep nvidia post: nvidia-uvm
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r2.ebuild
index 4e789f6ab598..cef94eb8f72c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r1.ebuild,v 1.1 2014/03/20 16:03:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-331.49-r2.ebuild,v 1.1 2014/03/29 16:49:49 jer Exp $
 
 EAPI=5
 
@@ -255,6 +255,7 @@ src_install() {
 		# pkg_preinst, see bug #491414
 		insinto /etc/modprobe.d
 		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
 
 		# Ensures that our device nodes are created when not using X
 		exeinto "$(udev_get_udevdir)"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r2.ebuild
index f907fbfcaee0..ff98ccf786cd 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r1.ebuild,v 1.1 2014/03/20 16:03:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-334.21-r2.ebuild,v 1.1 2014/03/29 16:49:49 jer Exp $
 
 EAPI=5
 
@@ -255,6 +255,7 @@ src_install() {
 		# pkg_preinst, see bug #491414
 		insinto /etc/modprobe.d
 		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
 
 		# Ensures that our device nodes are created when not using X
 		exeinto "$(udev_get_udevdir)"