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

[Jeroen Roovers]

commit:     30aa94be2952165e9df0dd9036629d2bc5132ff7
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 04:03:58 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 04:03:58 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30aa94be

Readd USE=uvm (bug #557016).

Package-Manager: portage-2.2.20.1

 x11-drivers/nvidia-drivers/nvidia-drivers-355.06.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-355.06.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-355.06.ebuild
index 8391d84..bc779a0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-355.06.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-355.06.ebuild
@@ -28,7 +28,7 @@ KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
 
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X 
uvm"
 REQUIRED_USE="
        tools? ( X || ( gtk2 gtk3 ) )
 "
@@ -113,6 +113,7 @@ pkg_setup() {
 
        if use kernel_linux; then
                MODULE_NAMES="nvidia(video:${S}/kernel)"
+               use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
 
                # This needs to run after MODULE_NAMES (so that the eclass 
checks
                # whether the kernel supports loadable modules) but before 
BUILD_PARAMS
@@ -241,6 +242,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 "$(get_udevdir)"