From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-828209-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 115211386F3
for <garchives@archives.gentoo.org>; Thu, 13 Aug 2015 04:04:23 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 315631418A;
Thu, 13 Aug 2015 04:04:20 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id CFA031418A
for <gentoo-commits@lists.gentoo.org>; Thu, 13 Aug 2015 04:04:19 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B424E340906
for <gentoo-commits@lists.gentoo.org>; Thu, 13 Aug 2015 04:04:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D3EA13F
for <gentoo-commits@lists.gentoo.org>; Thu, 13 Aug 2015 04:04:17 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1439438638.30aa94be2952165e9df0dd9036629d2bc5132ff7.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-drivers/nvidia-drivers/nvidia-drivers-355.06.ebuild
X-VCS-Directories: x11-drivers/nvidia-drivers/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 30aa94be2952165e9df0dd9036629d2bc5132ff7
X-VCS-Branch: master
Date: Thu, 13 Aug 2015 04:04:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: f2e597bf-85b5-4ba0-9717-da42d3a44c8a
X-Archives-Hash: 102693e8d87293a1b5034ca4a53b6d25
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)"