summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2014-03-22 09:00:44 +0000
committerJustin Lecher <jlec@gentoo.org>2014-03-22 09:00:44 +0000
commit9e326d18769b129128417ec656bf907a4eed03e5 (patch)
treef52ce81dcfdf6b518729b50da31a85f3bd615200 /dev-util
parentversion bump (diff)
downloadgentoo-2-9e326d18769b129128417ec656bf907a4eed03e5.tar.gz
gentoo-2-9e326d18769b129128417ec656bf907a4eed03e5.tar.bz2
gentoo-2-9e326d18769b129128417ec656bf907a4eed03e5.zip
dev-util/nvidia-cuda-toolkit: Add uvm UDE-dep to nvidia-drvers, #505198
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/nvidia-cuda-toolkit/ChangeLog6
-rw-r--r--dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild8
-rw-r--r--dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild6
3 files changed, 16 insertions, 4 deletions
diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 65c6248bd4a8..a9d88eba94cf 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/nvidia-cuda-toolkit
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.78 2014/01/27 07:11:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.79 2014/03/22 09:00:44 jlec Exp $
+
+ 22 Mar 2014; Justin Lecher <jlec@gentoo.org>
+ nvidia-cuda-toolkit-4.2.9-r2.ebuild, nvidia-cuda-toolkit-5.5.22.ebuild:
+ Add uvm UDE-dep to nvidia-drvers, #505198
27 Jan 2014; Justin Lecher <jlec@gentoo.org>
-nvidia-cuda-toolkit-4.2.9-r3.ebuild, -nvidia-cuda-toolkit-5.0.35-r2.ebuild,
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild
index 32c41859a979..46de9696059e 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild
@@ -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/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild,v 1.7 2013/11/26 09:28:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild,v 1.8 2014/03/22 09:00:44 jlec Exp $
EAPI=5
@@ -29,6 +29,10 @@ RDEPEND="${DEPEND}
sys-devel/gcc:4.6
)
!<=x11-drivers/nvidia-drivers-270.41
+ || (
+ >=x11-drivers/nvidia-drivers-334[uvm]
+ <x11-drivers/nvidia-drivers-334
+ )
debugger? ( sys-libs/libtermcap-compat )
profiler? ( >=virtual/jre-1.6 )"
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
index 9d7efbd24ea4..fc690d1bd6e2 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.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/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild,v 1.8 2014/01/26 11:42:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild,v 1.9 2014/03/22 09:00:44 jlec Exp $
EAPI=5
@@ -24,6 +24,10 @@ DEPEND=""
RDEPEND="${DEPEND}
sys-devel/gcc:4.7[cxx]
!<=x11-drivers/nvidia-drivers-270.41
+ || (
+ >=x11-drivers/nvidia-drivers-334[uvm]
+ <x11-drivers/nvidia-drivers-334
+ )
debugger? (
sys-libs/libtermcap-compat
sys-libs/ncurses[tinfo]