dev-util/nvidia-cuda-toolkit: Add uvm UDE-dep to nvidia-drvers, #505198

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 34 insertions, 20 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/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index dbe942bd6d7e..df87be0438cb 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -6,24 +6,26 @@ DIST cuda_5.5.22_linux_32.run 686412076 SHA256 0e7aad303807bb0ede8f6f6e825cfcd0f
 DIST cuda_5.5.22_linux_64.run 849417929 SHA256 b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4 SHA512 25233b34a35fdb5ee3479a87c89484a00dcd760837436c263c3eb8731cbd24a9ed3fb57ce2d4e5bf7cd31abb9b0d990b45720a5f6a376b2488de4506a7c57c20 WHIRLPOOL 550594121a53feae4e74a4dc9ba40c4cd2ac91305f23397cd7ea421fcb801e3ce8fcf90f439c966accca44d586bc51d85ef3e211f35fd751dc9299dd07d65175
 DIST cudatoolkit_4.2.9_linux_32_ubuntu11.04.run 209998124 SHA256 0c91d51e49c7cabc13fafa75cbf547c6902557cb5c3e19b4cf3c83c26172a03f SHA512 f1ca065e9cbe6273f165388d3579e28868c7b1330b341cabab9fdd6695fd3450dd8c77978a5aa3063617b371c68c37661b4f2d8fcbc4e585bb508254bef064ef WHIRLPOOL 9cbb668a1fba9748c0a42ce9a93ba0e7ff592c48155b0d87c22999f90aea29fc02120febcf4b07b8bd1ded96ca057ca0450261ea30ffdf5076e0991b10474a18
 DIST cudatoolkit_4.2.9_linux_64_ubuntu11.04.run 282394341 SHA256 22d857db6b3831670bc2ca7ed22ac257b6946f68f6e4b6f534ec98b69690ad38 SHA512 3a54c278f486cbc92a7e262f39183c7babca8ab6d04c5f85ff875d3b2bcdd699631049be375fde2a3ba2746bd5ea04ba0149616e245556257c470632b91b4b1c WHIRLPOOL eac55ac70ac986772b4cbd1b76940b41eaca20276ac68e59ccfb5a09eb41de7c023d78dc85392ebfb9e5d36ee7f29e31e0173aeca0b89a510e7c89c087b72f1f
-EBUILD nvidia-cuda-toolkit-4.2.9-r2.ebuild 3187 SHA256 61938e090be590b47484c8be060c5c952a742c58f3762d423f5a513b72ae700c SHA512 247ea2cbf37814d1c7846058f1d36ab7b324911a3c2e419e86e72a802090e043601bdff4ec605c530d261c62fd3deb6912964e3045243b91e3ececfb0166e12d WHIRLPOOL 061c44843eb893fea46cd60b84d402679a14ea1ad14fcf7a4b962bfaec475c1f18e487537847def33481682b764c9be81f2396da521fe4c3b55cde38c878b9ac
-EBUILD nvidia-cuda-toolkit-5.5.22.ebuild 3452 SHA256 3187945a4e8e7b9c1b022770986da8e47baa99d9125e60c61a9f7848c6b64fd7 SHA512 01853cde04794e455ffec7e6b2f2b838e768b0995325151536cab7eb8f910f76333fd97b00a52eaff20e1aa209ae60c9adb496347a886272f40851a2bc3fc2ad WHIRLPOOL 732d85d098a4a9950147ba8f514d6adb1821973d293b91cbbbc336545742e576f3311fad4a8fdb4256eb227abe4ef5355f2017fcda9450b822ce69f8424d2122
-MISC ChangeLog 15214 SHA256 d8140f6018466c49b6ac07413c313418d79c03c1869e3479173255ff477d0b78 SHA512 11c5ebc1cb493ebb9bf7e066ab1e8873c8ab444a5fe7bebe9ee7ce32932c52813d2984f21c7e5088b573e8543ff7aafb564ad33b31cb8ba7aa9fe3b256262b2b WHIRLPOOL 43761abe2611f6068ffefdb82e5999010519f1d10e41fb2e85c0baeca5da72ea961513fa74710fa18ef903556f8539e45e8c7de784931cd53b74bf44bbc17d87
+EBUILD nvidia-cuda-toolkit-4.2.9-r2.ebuild 3270 SHA256 1828286a9c1d1c45ab6d724643ae34d7db6d1fceffe1fada51db2707d0da4ad6 SHA512 7f01d7963782c7343b66c912b68a7a15e10077dc249a4edff9f4670b98b4fb60edc350ca355dc0d9f9cce0cf5ac61d035b80634599a3ba8dbdf1318ab94b7734 WHIRLPOOL cfb5ae4a5190a32026dc7c48770a7084aecda2c70f4cbd763b42030c64b0bdfc6976a29795989ce555134a9749113cc13ed3da33325235b6a96be63ea12a545b
+EBUILD nvidia-cuda-toolkit-5.5.22.ebuild 3536 SHA256 e2eac1ad9940abe2b2df581435090f9a011630cb0f024a1846ea40a641b82e85 SHA512 27abae100b0b074f8ec390a793adbd4aee6c0edce16d5251d1540230b895b8c2e1760fdadfde0a281eaba5cc12701e49c2c160006867cb78d8e69c117398ff68 WHIRLPOOL 6aac5156f687099b93fd47554cc5a0049bbd9759d848f8c865a7280158c4bb6ea175e895b1ef834af2acc661e1767f2c4ed1268815884541dfb9aca288d598e8
+MISC ChangeLog 15380 SHA256 ac442a66a697c2920495af28f8bfef619104e15eb72c3b2eefe24f9c0da557fa SHA512 0784fb3efa3714c6fa1f73c570a16d1ae67b9dc64945fbb0de71123376aed8fe66a331a245ccca9d266e35d25a1ece5bb0d8891596f661ba1399c0746d938c33 WHIRLPOOL 1f6f6f56899dd39525b81439a014b3dedd8541b86b34f46607857ed8cc1e0035f32e1b77bd38f0aacfbac1718d7a36418fa3738ad46f554331f04fb1c392f53e
 MISC metadata.xml 506 SHA256 16d98da28f74ec82ae271f04e456547db8da2a9c576bf262ad897f4a3259fb56 SHA512 c1be2bc00a75ee9db0339938964d80214648df5a6cc16f3d1250f80d3142a1e511750dba34b54794227457db0d1a0f5ca4f692f34b9566ac3f58fef43196626e WHIRLPOOL 02f0c08cb4ab40b543e23c51ae81a7f04e452f3949808bd29a2790c565c2739d131d4d19fc3d4d279381a5ed05ad0623ba560aba82f7a3b510e44f8cf35c6473
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS5gajAAoJELnU8jG9FVirRjMP+wTisJ0y0u40kn7YMXHus+OW
-PBf5ukANEdWEVFd2uzxoEz2h+MvnIMoMYSXkrnHql7meYB/rFm1aJ+MrerG9Qohq
-iytuwhWWvgXGNu1NZbUGNNFf66rDdAteL9m4Pp+qIGrQQQG30sMZHfZV3JqkJ8vv
-5DqaEz0DuQGs9FUNs+CChbXcJqajvuw12XPRazTCj+Jk4ZQ2IJhhvEwq12LaqgMN
-6JJaYB+6/EXO3PQN53Bpl3wEJh4zBcFke01Ap4bobYKSLubCGO5/3eoBiPqjbw81
-1d1EIRsBho4Z//1NOq7K2FNUvVR+znxEMZf3pQaEEUseninV4iqTNS2COlpN/WXz
-bFVaW+z6INcT6k5w0V4oU7IDSvGJK6n50+SRcwcwwGxkq/uI/hJzrBFsUzmBvule
-FlRIWFxaT3kbuLaW7iQbdx9tU+EWFb6cVuiAdXf/7gBnlTyfkTZ+Gti+VUYz4vbA
-HsPwZmfh0aXlr5n2YRLtnpnSxbKGgAa70pONuEOJ4vAEpVAQb7L8Q/sE/57Jm9da
-CI05uA19wtAyubA36rnrBU5FRZX//eOxjtNOX32h5qtoLLtyguqMHz1xS/lr4l3W
-GxFimbFlEFB+SRywN5stPi4+BPdVFhaQG62mb2QNKu/mhnH6zw9zeprFl1m+8pqD
-rnwNLf6Vyp0aFQxT3M2v
-=DpeK
+iQJ8BAEBCgBmBQJTLVFAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirHJ0P/jkX2pId+LR9DNhp8HVYiN1d
+T6oGXOIkBY02jgnh2tsnTiBvjrIo8XSUuiWSAalKc+OXdjr2xkIysDQAM0pRvV+p
+cCTKGpSWUQLnzUiDyQjgG9+rLF6n9p/F226/fBcWRhgzEGg7vof+iRoLzgalZJUk
+0wjRtFLUCWiURTmPCB9PSJF57xGgHaLXYqsGVsozT6B1PgNG2m7457JJLOg+9/qJ
+Z0v09EaA1q2xjxvWxKy5NuDU0G1NugJqKj5pbp3QTSwXyKyBraRXXpoxd5gQE9aL
+SLbrVk6STzBpVw4+8dS2O8904EYFtkB+LElUiQ2UwLStPE90NLbMEc2tplAyT4u4
+Td5tkooffGT+uZP/4MfdJbuMBY24YbQzehTehmx0wU16SMZtRv7tDz3H3c4UyAri
+DunfknH5o5OGqGK7hK9z6Hs+GvT3soi8tQhlhSIsgyaTxuOxqMgUo8h3CMPCFgVu
+jxy3ZjNg1qZjq8pS+XKS+YMw+SqIA1eIxnTGKjhTYcd3iH6B6vQdLU1C7oKtnPO/
+PJSV3sYtI9cMtkKdRjSHwMj2f1a43OBfi6X/CURiDXSqE9APily/22gUH8a5AB38
+aabkX79OFdNVYGfj/GExGQJCkz1rIwvLrXqmbixXzyfj/+dE+oT5fDe3rB67HBUV
+mZSSowkbVuQ1s7zWFZX9
+=pgrm
 -----END PGP SIGNATURE-----
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]