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

[Jeroen Roovers]

commit:     5b59b721ce933854d4f6191fc67536d0f5e0113a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 05:32:13 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 05:32:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b59b721

x11-drivers/nvidia-drivers: Unload nvidia-modeset as needed (bug #566242 by 
Adam Shea).

Package-Manager: portage-2.2.26

 x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf                     | 3 +++
 .../{nvidia-drivers-358.16.ebuild => nvidia-drivers-358.16-r1.ebuild}  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf 
b/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf
new file mode 100644
index 0000000..48a8273
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf
@@ -0,0 +1,3 @@
+# Nvidia UVM support
+
+remove nvidia modprobe -r --ignore-remove nvidia-modeset nvidia-uvm nvidia

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r1.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r1.ebuild
index 44a9162..e81b1bc 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r1.ebuild
@@ -244,7 +244,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
+               doins "${FILESDIR}"/nvidia-rmmod.conf
 
                # Ensures that our device nodes are created when not using X
                exeinto "$(get_udevdir)"