sci-chemistry/vmd: Add fix for cuda 5.5

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

4 files changed, 52 insertions, 17 deletions

diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index 75c4fc0db673..934542be9b45 100644
--- a/sci-chemistry/vmd/ChangeLog
+++ b/sci-chemistry/vmd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/vmd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.57 2013/10/02 11:12:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.58 2013/10/02 11:39:48 jlec Exp $
+
+  02 Oct 2013; Justin Lecher <jlec@gentoo.org> vmd-1.9.1-r2.ebuild,
+  +files/vmd-1.9.1-cuda-device_ptr.patch:
+  Add fix for cuda 5.5
 
   02 Oct 2013; Justin Lecher <jlec@gentoo.org> vmd-1.9.1-r2.ebuild:
   Update dependency for tk
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index 774cc4869b06..721e20a96ac4 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX vmd-1.9.1-cuda-device_ptr.patch 934 SHA256 8d32ebe81adb4ec0186ceba08743c0b6a25c76b3c58edaefa85df38328aaa87e SHA512 274756fe17fdcc39ce471c3187f3076407d34b64e49b0006ee30525a952277b2b5c713fffa8786162dc542eef2b021f2bf7339736cf9e81b673d5146114829ed WHIRLPOOL 400959a0b52ce0026308bf2c251de9e0c87ee65c8c10844a7cd2f21b319623868316970247984a22b19dcd17a15e8cdf6959b60c5575a05f3709191a55eb4fb2
 AUX vmd-1.9.1-tcl8.6.patch 1218 SHA256 41c1c3edf77f8ffcf8b7533625471d2dc384ca9a86ab9ba6be8d083718836b33 SHA512 ef729ddadbb865024abd6a532c328fe33e667faf0a6f9b09e3fcac852c2d88713b9efce772c42549fd62e9194634e3467d76700d0d317a1bd852be7baee8c125 WHIRLPOOL 9c122bb56fa66a1dffc6aa27d3e28bcf4848c3baf8a34a048fce3c2888a5ddfc6a92a5e8f9f1fa113b19c4b7d622d290be0e5cdafaae9d0a72402ef26143aa9f
 DIST vmd-1.9.1-gentoo-patches-2.tar.xz 79212 SHA256 1249957baea6fc8d4c05b008362b185b0851d70c6eeed8fbd44d41e7e77f23a8 SHA512 b313ed92652a93647790d668bd71233708fec3e9cead8b13b31dee1277f5ef6f0e8844f563ad51bc320b83a3cda126f8ab74fe4147218c65b594ee5624b46057 WHIRLPOOL 51b8a1486c286c002d893ec4e3aa8301ec7da6b9f2de31e880c7f9523a006a06712adecd5329269c892764761da691a36e1d6e5a730fc1a32c751b7658b96903
 DIST vmd-1.9.1-gentoo-patches.tar.xz 79240 SHA256 60fe1b017b1aed5cdd4a417d4a2dbd20f75eae24c83d1da68c504a31bfbdbcd8 SHA512 37856d5e00d3d4452324865190aef4ac05a7a49cbddffe83f568d3190b521f17e6e1e5323dee3127aadfb446ec0871bfd06dff47d640ed862547710ec4b0a421 WHIRLPOOL b3eebffe24a96ad1c7ce9ebc565e1b88d6f52894569a6d72c22e87fb3d6975d14779bd8c4305e3e9f2ecf9d981503b8bcea78a476a1a66eb37b78c759b3bdf60
 DIST vmd-1.9.1.src.tar.gz 30748110 SHA256 54aa88e03d86d763383e7b98592a152c9d68e78383e13af0dd2aca09b002491f SHA512 a54cb08e8a9ce801c2ca986f746bff0a041a25d5cffebc8d4af50813b6c05d04a3209a27830d580287230edaf3048a78923ae54bf367ab69c3d81388ab1787bd WHIRLPOOL 26d2a855c0768583cd45aed105fdd8f1ef59d59b8ce11c1903f5fc2008ea05989b8a32a0d817725e711613f8abfc22bb5301f20ea8d597efe9c7913790b25bb7
 EBUILD vmd-1.9.1-r1.ebuild 6833 SHA256 e48c5921f1904762723b10571afba42fffe4ecca6b61f261023d6df7a5c8f87f SHA512 dabb746625723b911b37c7e83b05e75fd82ced407831a4676a89d8ca2697305e06627e6707d254fd68c01c495e84e12af22e07ddb685fb715b7a4722cda2456d WHIRLPOOL c382fa4ba2db0d65c6fcc424f059d8cd2f8934d27a7f6d552db3fe12d2a408908f63286e38a441248e4c55ee5cc7444086879abaf45925a23fdcd44ddaa0f8b1
-EBUILD vmd-1.9.1-r2.ebuild 6589 SHA256 f379de996d08843f0678362164ce0e41555d4477ffb666e37790cc1dc50fdcad SHA512 0619e599449f325fa5704a31bbabf3761e1e466a34842fc922ca1a6e387eba77e0eaf4cd76016b2d9bc564f6062edc6f23ad1771a6e839b8e198bc0f6f38ac7a WHIRLPOOL d9215e4467474c5bc40ae64afad9dcad62a818de50299cd7b4f9c987bd33b2f43098203c0fee0274aca7096902944fd88e9d689a725d9494b777b4c786634908
+EBUILD vmd-1.9.1-r2.ebuild 6639 SHA256 6c1ab354435510fd2366cb82cd75d9f9b14d2c449d69d96931f3abf6a00b9ae4 SHA512 5a42a368681740aa78519ca1ed181510a907ce54860565dfa73749b8ac142612847d3a63ad3a450c41d0a551681344ad392c4cafaa5731de29b820deecfac973 WHIRLPOOL b007a651ad42a42d1e7603ab88e901e9a1546d695f55c1c7e9b0dda19f6343c2dcb85a44cbadb049a1c40f0b380e1002cb3de77a3c6911a18400a665b9c6ddd0
 EBUILD vmd-1.9.1.ebuild 6488 SHA256 697574cd3122ead061f2a84b72421c3a17b1ad47cb284bb1cad7f01e87765fd6 SHA512 8a29afac2d5139778c2d26bd2e92d0c5a1ec5a6ccb5816e6b370ac14a1bf4c88ea982cb06b9684b6962498480f52e25cdf654b2849d4879b5c7c389a95349424 WHIRLPOOL 3b9bc58373a4eab84afac1d0ae455143145500e6b6ff4c21257c834ce92c8b880daab443ffb929c4df6a5cf3acf9d788129e373ea3db01f287e751475d7cd193
-MISC ChangeLog 9851 SHA256 9171bc04e77b5d154edba1a47cef14a2f485832fc208b2de37b3f08a4315cef1 SHA512 dc8beee349ca4cea053789a549ea81b219f11cb0de567e33d15b7ce8e09708a52aba737e595f0ec1a05deb3855b754898b313f84e62f597bd2cc8bd332aca59e WHIRLPOOL 9a67cd8550e1faba381eb19664abf6abacca9fbbde870dd8051eb02e86f0b6eade7b8d4f6ca9bf4bebc06866e44f8ec120d0cc72c9d194a95c80f0481e93a502
+MISC ChangeLog 9985 SHA256 b4e470cb95818592861588caf0a5b0a88181fd8218410cd9169ed3d3b76ba307 SHA512 aa142fa58e5280e9bfdf742469d251a00da0b366e9b51cf3976b1e2b01145b264986dad561d1a8ce8c9ac176069e6e0dbb06139d89a4754a0495d9ed0b08a231 WHIRLPOOL f6a818cc7dfc420e43b3e1b12b71a9792ced79ec015fc7b252e4ab3ca25b47b63d5aaa988d2a41103f25c0758ae226b0b53d929c6d6ad6bdf5c7b5b27bee9ff9
 MISC metadata.xml 597 SHA256 d2521313b36b55be1e391d0efaeb3bdb469f612c0bf00913e2f0fe83fecca3d6 SHA512 84119dffe17d4e4b12019e51df2d9dd1fc42d26f86238387f67f08e774deec21f838fd1f28eba8c69faa88002be00af97dc4b1a67d90d81d6196b91699d7e7f5 WHIRLPOOL 9eae5538aa93b3496a6dd2bfa7b1fa1a1e6da89b9e4a02e3bd383373f7031b95aa85200d40eaedd4f5121f724f9cd1e52171052e42deb81b1c201d12ad8d2164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSS/+TAAoJELnU8jG9FVirfGgP/jTKw3Y3ZdbCAKewDwcxT39G
-AsBXm3Q/2sVtJkauwGfAc+N97C3DvpfdImO1OyyOAISTuwbRVowkOB8yI8Q5OheP
-fm0h+p0yuGalBIo7FIc8FDBQK6j2E7DcfVsgPuFds1SQqaFIPZM6C0yI8vgJh1i+
-PKi3VltQnNbqCRd6Np20TIlDYP0oJVtVv5NLWcLS/w+oEn8ooNZu0c4XbWkXUjwG
-ZktJhLg3pFETRHOs1pbyCFnRXm0vGHMfjb77CImeFSpqi5uvgZt03cI+9v3OYH9B
-sxa9v3fK6vWdmluYdLeF9IX4ebU2PExStP4/4mAIsDuUy1DakLtg2ZIIPKP2fZty
-lf789sI5WCqvdbLk5AcBr6c3vIeC7UBDIgoPSr8H+tx19xaaN/G3W0gOyF6HKEh3
-wim41hJC0mm3cRuyKhdxd/SSjIw+vvZBaHk56KoKJ/6r4HxBznygmMIn47WjSMwU
-OLb5mgm5Vlp3fFM6gVLUlNwIgI6C3ykApYjsP6z6g917XPQiOgyXOyIvRqYYSdni
-kAfDUBhBp6jKi/VoljjUcOuqLyiaFvZ07tkG/No320urgPt4k9amkhs2R7xhrLeZ
-O0/NCaA6nBIi1+sVmXTAweuWZP8sRVAfZ/KVrm9511sArDxpUwgbOKMCvjRaJCkM
-d8pLOeRSLhHl7lyiaPiV
-=OS1C
+iQIcBAEBCgAGBQJSTAYGAAoJELnU8jG9FVirIHUP/Rg1QR4v4eVKF3iSoU9FwPMu
+e4RS9caDLR0MY3Im+95zWFF+76I+GjcdGI3PkblXARsS+sPv9Mr1dJX7tEncJQAC
+snRTdvdFIx+sB3+k/G1ZdjrMi8XdZzn9OzvXkKKUqOfyg49u4oODhUjCLLALsvcW
+TFIQ7HooRjeew/JHkemaFG2ZHnHOfYh98Iz1FRyjcxEBE2JNgdqDZUlinjDalRMd
+XC4RrQEK+17nTuD4SHhosTcvK6FRbSGSSTmYEH4IH2XJBapRy0Q2FOnuBau+cV2q
+uXLPX2GdA5r0x91a4Pn131Fm0sqs7e7r+oxkuxAuEnCCaLM/aCuraPbk9HczDs0x
+VCzY6a/QbrcB4sVhmYB85Tca2vBQYyGPolPrw29wM24khD3ehCU3oGCQ+4+63pP9
+AyBP4XNyIH08D+Us4J+O9j9XBi3T9jMYSkMYxlC7qrAS7vnULsYfjtj+H45wk7ub
+IFqlKCKcldUg5pk5VArQDETMiJDZ3KSaGaOQ7n0yli+5JyiGChGrDnyjlgVcWoYd
+YOvk44DdwxjWlEE8umJKvv9dLVXkXUYJcvkrOeCVzCh5y3GdtfW6FXCSFKLwuMVO
+2R6dp07imXFfzH52wUsMSyg18Q7UN5CsZT5ifBmD5GAWmE8vakc/LW2eCk1FerSF
+LbI1yqevrsu86c+htUCQ
+=kzfh
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/vmd/files/vmd-1.9.1-cuda-device_ptr.patch b/sci-chemistry/vmd/files/vmd-1.9.1-cuda-device_ptr.patch
new file mode 100644
index 000000000000..ce842448decf
--- /dev/null
+++ b/sci-chemistry/vmd/files/vmd-1.9.1-cuda-device_ptr.patch
@@ -0,0 +1,28 @@
+ vmd-1.9.1/src/CUDAMarchingCubes.cu | 1 +
+ vmd-1.9.1/src/CUDAQuickSurf.cu     | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/vmd-1.9.1/src/CUDAMarchingCubes.cu b/vmd-1.9.1/src/CUDAMarchingCubes.cu
+index 5bfe7bf..36faaf0 100755
+--- a/vmd-1.9.1/src/CUDAMarchingCubes.cu
++++ b/vmd-1.9.1/src/CUDAMarchingCubes.cu
+@@ -45,6 +45,7 @@
+ #include "CUDAMarchingCubes.h"
+ #include <thrust/scan.h>
+ #include <thrust/functional.h>
++#include <thrust/device_ptr.h>
+ 
+ // The number of threads to use for triangle generation 
+ // (limited by shared memory size)
+diff --git a/vmd-1.9.1/src/CUDAQuickSurf.cu b/vmd-1.9.1/src/CUDAQuickSurf.cu
+index a21ebde..56a42c8 100755
+--- a/vmd-1.9.1/src/CUDAQuickSurf.cu
++++ b/vmd-1.9.1/src/CUDAQuickSurf.cu
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <cuda.h>
++#include <thrust/device_ptr.h>
+ 
+ #if CUDART_VERSION < 4000
+ #error The VMD QuickSurf feature requires CUDA 4.0 or later
diff --git a/sci-chemistry/vmd/vmd-1.9.1-r2.ebuild b/sci-chemistry/vmd/vmd-1.9.1-r2.ebuild
index 89004e6d3f43..58d94f044413 100644
--- a/sci-chemistry/vmd/vmd-1.9.1-r2.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.9.1-r2.ebuild,v 1.4 2013/10/02 11:12:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.9.1-r2.ebuild,v 1.5 2013/10/02 11:39:48 jlec Exp $
 
 EAPI=5
 
@@ -66,6 +66,8 @@ pkg_setup() {
 src_prepare() {
 	use cuda && cuda_sanitize
 
+	epatch "${FILESDIR}"/${P}-cuda-device_ptr.patch
+
 	cd "${WORKDIR}"/plugins
 
 	epatch \