dev-util/nvidia-cuda-sdk: Restrict nvidia-drivers dependency for x86 to <346.35 becau...

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

diff --git a/dev-util/nvidia-cuda-sdk/ChangeLog b/dev-util/nvidia-cuda-sdk/ChangeLog
index 362815b26d8648a4cf211ef905bab4c6a64089bf..de6f830f7e69e029a623d03ed1d232e740b4adcf 100644 (file)
--- a/dev-util/nvidia-cuda-sdk/ChangeLog
+++ b/dev-util/nvidia-cuda-sdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/nvidia-cuda-sdk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.59 2014/12/26 18:08:45 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.60 2015/01/26 07:12:37 jlec Exp $
+
+  26 Jan 2015; Justin Lecher <jlec@gentoo.org> nvidia-cuda-sdk-6.5.14.ebuild,
+  nvidia-cuda-sdk-6.5.19.ebuild:
+  Restrict nvidia-drivers dependency for x86 to <346.35 because of missing uvm
+  support, #534156
 
   26 Dec 2014; Justin Lecher <jlec@gentoo.org> -nvidia-cuda-sdk-5.5.22.ebuild,
   -nvidia-cuda-sdk-6.0.37.ebuild, nvidia-cuda-sdk-6.5.14.ebuild:

diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index ec92c8b84498c4707e3228ae090f15bfec7184f2..bdaee97c36accbb3138ed34bb4c9962aebea1978 100644 (file)
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -9,26 +9,26 @@ DIST cuda_6.5.14_linux_32.run 76788277 SHA256 63fa1fe5d013e9944d6c1a3a71768fa4dc
 DIST cuda_6.5.14_linux_64.run 972320904 SHA256 f3e527f34f317314fe8fcd8c85f10560729069298c0f73105ba89225db69da48 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e WHIRLPOOL 0b890771dcca352168fed1b1df9b29504b03f8c29da59cec29914c541283998edf65f5ca6a41362143a2d5d7359822b036894f563c56b39583b1ac4c64e35180
 DIST cuda_6.5.19_linux_32.run 81882112 SHA256 9f767f38b84f52c097bec81669f99e4a6c4c9c09b5da1bc09fe49e0f804bc7a6 SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e WHIRLPOOL ac94b4e7f29811b4240623fb69b3c54214e7f0c60a286d899944dbab9da7fd3c122760199a3357667e33879bd48fbf352d5d39029acca6021e7caf21785557ed
 DIST cuda_6.5.19_linux_64.run 982446238 SHA256 5279bc159b72b7445d8aae5f289d24bb4042c35422ef32da68049d8f666d3ff5 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797 WHIRLPOOL 6ae8e53719e12997de60ec3688167f3fe33b1145d01217182e39ac386c25b358c8ba6cee45ad6c80e33ef66fd9a511338dce4589f10a31635b8437b6e528fd7a
-EBUILD nvidia-cuda-sdk-6.5.14.ebuild 4048 SHA256 2fcf18bdcba7c05006fb7310ee1cf95200b3e534c7595777bb9c518b61c24dd4 SHA512 c5b483caab62ef05147982e7ef442d099e7dd0c08a700e5989ecadfd5fb4d68a820dd121b39e89909dd9a6e98ec4317e2e44650b67691d00b7c083ac80c141a1 WHIRLPOOL 2f18f570461c44949b7edaac94854a9f4a9edbba2e97e71be126972bfa8cf0390df867b50e0147a1a3acdfee2e4b59b205ae960b9f42e86b19f4e85876bdba0f
-EBUILD nvidia-cuda-sdk-6.5.19.ebuild 4053 SHA256 3df7723eccebc3a850a8d53330ea8da6615be9ebeb5e2ed5435f699dd28ecbc3 SHA512 d071724cbe3c5e59ee458b6aa4e3ec3314c11337fc8e6bb148b02534be8ea81647185a425443eccdbcde65a3beb1aadd3d4b7f1870fbd2abcc5d4ab95425f940 WHIRLPOOL 63b1063d6f0149c7f9c19fef61ca7fbcda89bfd35b862336bddb0622c97f3f3c4d335eefd52a3091d6204d4bb24adb2bed380823cac3c7d03047ab95907005a6
-MISC ChangeLog 11112 SHA256 8f47d0e5c529d6b0dacf0e54a0cd4711e3a8bec45bb3ca50cafaa51dbd9bba90 SHA512 e58b104b42981ce2761d2281aa9f5e0cd1ba4096671a0dde47ebb0f4c88d80bf041cb093d246e6d7606e52e52d5a0c3f4d2e3051495019260f095d75faf655e1 WHIRLPOOL ddb7543d37eb6c483de787797481b9288c2dc081f7e50eb47f0f110d07ddffe8fcf3a6f04eb12378c23a0110c8f164286a235e153eec7d63e9f2c1aaf3facf19
+EBUILD nvidia-cuda-sdk-6.5.14.ebuild 4099 SHA256 53807f2cc8ad0f61882bcb7622f140e035bfc91a5bd9fd1c143af4b5acedce3e SHA512 d99b07c08e2769288dc37f15eb52edac8f85fcbab3b1691f693265c7ef543b2c09055c01bc19aa687cda788127c0a8b17aeda8ac3f05beafecd2fb9834c6b124 WHIRLPOOL 7595c4ddf8cda5ce912fccae73fca47b9c49dd42f6bb8a7fb0bc25392506cccc886ab0b620a75c512d75ffddf4922de9269b48bd1af42e4a027e9d1758f47207
+EBUILD nvidia-cuda-sdk-6.5.19.ebuild 4104 SHA256 90a338486c11e46bd38b20a67261fcca162114d3e247c63c4d7714cc7bb3c43a SHA512 87b5ed9f3a0135f8d07592affedfc7c225699ea5bca71c935d9741a2c89de062789c2d4309e746b8ba50d811cb1d7dbdc1797597515b4ac58fe9505620800c1f WHIRLPOOL fc61ba5ebdd2737fb0684c5bc7d76aa52e3563a5d6917ef6b5a422406467b116139227df81bd8968e78828432182f3b19825e08a583fa705834caa0887c8c5de
+MISC ChangeLog 11322 SHA256 075f71c60dbf03bc673d597d29b7955c7b8fe69ef415def98034b4d9b2a4ffbf SHA512 bdc4904fc34410eabe438e35e6c6ab46d0d883ac373f7cec961f9c077ff0049f61a484409132d5b12ee52044f81d09af0ab3f124ae6567fa75488c6b34fb33ee WHIRLPOOL 19cac010a0acb77dfb4dad54949e58139c986095c80d9231b7256a7f91eeb29dc709ee743f95af752d8641be50465dd28e371229970d4900414373d652a32c49
 MISC metadata.xml 390 SHA256 4b9b3df9c5ab72b576b25130e1ff41278c938cddd76df80f6aa0cd5015d695dc SHA512 bbee50e8b6cc7e3c2e1b31c5f7cca01dd634d2f3adea4a182664653d4fada3d71a8709ce6f10e387ca95526952e2c3ff09d65b517e7d2cea14ba742d5d1dac41 WHIRLPOOL 4bdcfd49c7f7a0ab5b7aeae9fdb15c8acaf40413c3a6fabdce22a8ee5a671eefc37724b9d82d4fe8031157dca7aff151231355f6419ff49cafa6a8265f3307f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUnaRXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUxejiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirkzoP/3kBdaiNCJvXivWaFHkO36D4
-I6We6K2+Hlyt/NLhmu3ziTmqlGHCrHR3dF+Hxt6P6GqwsdDvuokU9VkckjBqI4Yt
-1SlJWv/d7iaoEJXTeestmdpzLW6EFXzc8IAoTVp36uj8f2S70Szqemzhsykcuulj
-e8eE+QjcNmqU2YhWiKf36u8VsWHPeuL681qcx6A2NlqffjR6s1CFuWl6e5+vASpt
-8pXamRr65uCAIZuAmVh5NVqd/IKMVNOS+ku/U2JqAXb1niHaJSmy9z5qxR3F0K8Z
-a6ERnMe3lgAj4HTZMxnvWYY3MHo4Uhz+ysl2BFMb//kbabKuPIxMfV8KreVDSRSe
-h+Kz12dMLbgvd0SPH1gMXmJ1f2AptxG3A/wxiB+zshEfKL0qzah0iNydnC4WcY2Q
-J6MsEUY5WkeWzjh1vF81/lYE5qN8mbvKK9HpxVH3qesgr4jZyCaJgA3hbMJsaDo0
-0kUxAhT9d5uOFJKpG+aV+c3UtusxImnEBbfR/GDyJkVfsEmmd9FBvWmhHE+7gVWj
-6L2yvsQsNBI06aFvKzf5YoXUBSadtxVLsp0nrSN/wm+opTloV9tZljK17rEabbc4
-aDWMyRgP5syR9odbhIUwv4a5h2DtqT3QC1eltRewMCUpIf+95SM2VOmQbKzq4dCE
-DHcVBhYmd8HF3BKaHlKs
-=A2Ig
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirWJcP/2KSTAIVupchWOypUK8f3LTV
+oAyWPKi3f+5SiNuO3osn1vcBYpv3TaTYhqRGBYE59z+FJ3Y747PIO/jNPJk3vblF
+24t3yozcx26IeuktZwlEJVhazervsEn+c9ancrUYDCFUQADeiWvebDYPzqhteI2y
+diDNJpWhlOs9kolWIxq0twP4SH2mtnw2SYYrbbejL3h+DGPrGOYIyZHfBQiktlPs
+rHkIi6NY+NtpUoFhKhATBWrfNcF/3z3mv76rXdglR0EQnsvYOyWRZoW5xYTCOjgp
+iiMdqcaQkPhMrKzkPrWAUrOUN8M6MPXTMsy6ZlYOMsBMmFu4f9xCiLJ5IZhFTVzD
+LEK8ZdJ1raL68vZQHhjRhwrOk+3U95WFDg2kxGRv1V9c5pEvKl0MmlIqMnWIssKL
+Wh1uRmhkcy3At/tNWbqJrQibBQvCEYjXXYDMXRQtv0K2/cBqG4lZyFFSvY/ZH2iX
+BA43IwKm4XRFYu6sjct1gf5EpxrX8ZNVTx13c8HLKDjCeXrXOfQvIbyzIhkcAJzP
+TL4oG6VjuDIxqJc1JO0YGDfiQWFWlv09g3CewoJ/05CPzImC8WyGqHGSNXAjysLh
+IPPGaTxuNvBeQvwC2SDYHORh5jqn2xKXLWjqk1sTd0zkFW8Ye/JuA35u470fDVk9
+MDTwFfZ80Dls31uCp1Tv
+=OQ2p
 -----END PGP SIGNATURE-----

diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild
index bf6bb80e71d1c1dd753c9415a0520e5cd1828138..a15b8e8088baf6745961854eff8c32132cddab9d 100644 (file)
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild,v 1.8 2014/12/26 18:08:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild,v 1.9 2015/01/26 07:12:37 jlec Exp $
 
 EAPI=5
 
@@ -28,6 +28,7 @@ RDEPEND="
                media-libs/glew
                virtual/mpi
                >=x11-drivers/nvidia-drivers-340.32[uvm]
+               x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
                )"
 DEPEND="${RDEPEND}"
 

diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
index dc751e259a5ae8f6da4bc9f6581e5b4d66d9f734..e083c559111f5ccf55c464b094f024c5c2a9a6a4 100644 (file)
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild,v 1.3 2014/11/18 12:32:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild,v 1.4 2015/01/26 07:12:37 jlec Exp $
 
 EAPI=5
 
@@ -27,7 +27,8 @@ RDEPEND="
                media-libs/freeimage
                media-libs/glew
                virtual/mpi
-               >=x11-drivers/nvidia-drivers-343.22[uvm]
+               >=x11-drivers/nvidia-drivers-340.32[uvm]
+               x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
                )"
 DEPEND="${RDEPEND}"