dev-util/nvidia-cuda-sdk: Drop arch specific patch; #516020

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

4 files changed, 24 insertions, 35 deletions

diff --git a/dev-util/nvidia-cuda-sdk/ChangeLog b/dev-util/nvidia-cuda-sdk/ChangeLog
index eaa7be491b5d..cf72f3a50c6e 100644
--- a/dev-util/nvidia-cuda-sdk/ChangeLog
+++ b/dev-util/nvidia-cuda-sdk/ChangeLog
@@ -1,6 +1,10 @@
 # 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.45 2014/05/28 09:50:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.46 2014/07/02 13:27:02 jlec Exp $
+
+  02 Jul 2014; Justin Lecher <jlec@gentoo.org> nvidia-cuda-sdk-6.0.37.ebuild,
+  -files/nvidia-cuda-sdk-6.0.37-simpleMPI.patch:
+  Drop arch specific patch; #516020
 
 *nvidia-cuda-sdk-6.0.37 (28 May 2014)
 
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index 9638fc0f3095..6169e7e6a760 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -5,7 +5,6 @@ AUX nvidia-cuda-sdk-2.02.0807.1535-make_cpp_fix.patch 3398 SHA256 1b8038fe9ceef3
 AUX nvidia-cuda-sdk-2.10.1215.2015-vararg_inline_fix.patch 785 SHA256 b685cd8915e45494c0c8c458f607c46d4716deae26442bf62ea9bf8bc3e2e942 SHA512 e877a1dba1c66f5ac881cb2986d70fb03c610f93310b65a09fc582b8baea1715e63266dfbaae91c6cf2c909d9d725032f76604afe3a7634e80c0a63dc451339e WHIRLPOOL 72c3bb42ecff9f5723c5491bd115f29327b5e9ad4119be289c9a914436470fb7b9e0149221623227d00bc0d7e15454672e8f4ff1d86b3aa4a59b8d53fee05907
 AUX nvidia-cuda-sdk-4.2.9-asneeded.patch 3955 SHA256 090855efe5bfda15650aaaf3be834b2d6e0bbabadd2d52e6a7dea0635dca1a34 SHA512 c7a8f7e55b50db76e681b6f9ce7942c9bc42fe0dcc0cfeec9b71d085bce2f31ed65a6297e5334729bf3e429a4458cc67443c52392a8487abca79fe829d536a04 WHIRLPOOL 8868d6773a60227c45032ef7577dc64065e0c441ee9cff99a9f0213ea1c002a52f5b7aca278dd374308a8dd7769aac3f47ff4c65858897064c2fde0168422c66
 AUX nvidia-cuda-sdk-6.0.37-asneeded.patch 854 SHA256 773071fec636fcc17fcbd515c5faff52c37153efac7283ae730e7383fc69d934 SHA512 1719bc2f155000a192b81afb5b0a54b7a181451306a09facae0306c4a5a9859627af07701a45c1f9c6d63ac8f827b40fd4abf8fe966a488bd3e6448f5d040134 WHIRLPOOL 177403ac68c366e81ec23a396a873ef2156158dcf6ac5b1c6e85346e2b26cef9ef85bbb2f1a289b0812f23f9c9320cf6485b2fb7fcd496256f531b8c197d0e21
-AUX nvidia-cuda-sdk-6.0.37-simpleMPI.patch 438 SHA256 5051fc66d41cda833446cd1250eacad0d94cf47cfcf4506b26839aa4e381bc7c SHA512 a7a9813121d474e34e92687ae57698337a0756f4474da3003e35fc1f33664b91524142df1d540b6f3e2c080a42a86a9cf8436fd505ba30e6e0e31e3907c7308a WHIRLPOOL 5eb6be2bb8e59e2feda1ae6575bad8c3030b1566a19f54ecdb2ebf2155f5dea8c7492be5d5e204c26255c16c32ee7491e9137add9f4f06b8c06619c016441634
 DIST NVIDIA_CUDA_SDK_2.02.0807.1535_linux.run 41918865 SHA256 5ceb6ac9d973b7d3544ed5ee3c52de40451ca234df587fb93bd3c5b73f5610c4
 DIST cuda_5.5.22_linux_32.run 686412076 SHA256 0e7aad303807bb0ede8f6f6e825cfcd0f9ddb677bc8cc898ec38990b8226778d SHA512 e2e4fbc78c2e6373b3f81778d8044b299429459e8e27632e86c0d97e6fe7f4db7cd5652044beb0ce7ee3c7abaa7dcec7d85639a2de4b9cc213ab52a2d204aa6b WHIRLPOOL e5df7de03aaec8488a7fa093e272d64b5d3adaedca1458c550d4ae9c6bf2a0ead71496c8a0c9aac966500aa01401e95cc57a951e3a2554e8d823b97c10336850
 DIST cuda_5.5.22_linux_64.run 849417929 SHA256 b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4 SHA512 25233b34a35fdb5ee3479a87c89484a00dcd760837436c263c3eb8731cbd24a9ed3fb57ce2d4e5bf7cd31abb9b0d990b45720a5f6a376b2488de4506a7c57c20 WHIRLPOOL 550594121a53feae4e74a4dc9ba40c4cd2ac91305f23397cd7ea421fcb801e3ce8fcf90f439c966accca44d586bc51d85ef3e211f35fd751dc9299dd07d65175
@@ -15,25 +14,25 @@ DIST gpucomputingsdk_4.2.9_linux.run 152436489 SHA256 b6a53afcf8f8422b5075aa37ce
 EBUILD nvidia-cuda-sdk-2.02.0807.1535.ebuild 1699 SHA256 49edb1f4fb13ee4832ca93b941f98fd2a2437dc3a98bda7a6c72442eae47cefe SHA512 f25d32f029e910bff6400cf9b36416200c266fc937676062dbbb883b63eddf5e43735d72ef77e5d13a37f7833a1ea439753477b8e80d07aaf86fe92632c44245 WHIRLPOOL 74d5f4cc23ad3bef82e36a85daf42bbcac99c56cabcf22d355f7202bff4938580867dfd7154e07e819f7d75c89e40693c36710d1c82bb6f57552fdf229fd4cf7
 EBUILD nvidia-cuda-sdk-4.2.9-r2.ebuild 2807 SHA256 c07aa0e51964f1e86c24d00ce0a42c483577c0a80c7aa7d0c50c681c1dc84274 SHA512 32cf9f80d801689f583cb81da45043b1459293cdb2c84e4776851f42e6c957592f680c1a1ad225fc743fe04c1be578ac6df47d7b520a24c9881608822bb3c4a6 WHIRLPOOL 51caab3def7f470f6726392192079594d2dd8b1f3641dd3bb4a3ec72cb75f161bb90d32d3261bdbdbe79379afe32f82140c38e0eaa02b5eedacac52ae5d1cc55
 EBUILD nvidia-cuda-sdk-5.5.22.ebuild 3492 SHA256 aee800191191f229de9a42812db4d4314a17cf13e8bf4b42b20d91ca4cb2ffb9 SHA512 46ed4382cc7dd84dee9295e8bd70346b7c11f36fdfd824f72a08f0bdfd290ded83790fb72633e710a3770ea291ad62b6cb7fab81638b0cf4d2c760751ca388bb WHIRLPOOL c60f95c966ac56b43a8790ba4ccccfa3cfbf50cd7f214fb89c9ba73ec6a534fad51f782c1f723649110648c44197e6d104162b96af13a7936b15e4100908e23e
-EBUILD nvidia-cuda-sdk-6.0.37.ebuild 3824 SHA256 63e37583326a4b196a74115910c06ff18f612257d268cb8c890f21a4d005e834 SHA512 ab9b2ad0bcde39022520dae2b357b6c69f8d92d546f08821a259ecb4c55ff10f74b3be59fbe6f507d472cc2b6c0d492f93f2534f7d1b1bbedce1722d6a4e87bf WHIRLPOOL c7a3f43e3f4ae31846f9523efd40301f6be4c7ee53997d35e008d106ec029fe87db510b30255fcc834dbce084b22e3c1590f1c1a0012ded4872d951f736ee537
-MISC ChangeLog 9071 SHA256 fee08002052e056e8d2c2ef130c741a54121b376af8ee2703214cde54b074756 SHA512 a3c40e3b96a269f8ad9bfbd6cfa7932395a73c8613cd2f86dd715212b15b72af8ca9cb50e6d35883396e75fcc4a180f4be375b12bfa055a323052afe516bb93d WHIRLPOOL 1c64e4192a4969182ed2cb9c96cd264bb188e0ddb596e6cf545c1fc3975bc9ff607500dba10dec8002210d10bf24142257d9f50cba93aff17bae20927376fdef
+EBUILD nvidia-cuda-sdk-6.0.37.ebuild 3630 SHA256 8f83dadf9b8f80b88871d3d9afcc8d55b8f4b05ed7f015c304b0b561a9163249 SHA512 cee237bf5f2b35e561c91b918b1a347c0e6a642b1557945cf628227d2370dde97b79bad95fa1e62ebed169f40815242d818ddf098fc85fea505db873364d4aed WHIRLPOOL 566b304cf14d8a0c45bcd34a0f14371f6629f5d5f32affece81ff002fe7d863fcdf4bc774c6cec0e2661833bf411dbd72e92ebed155ba6976a9b341b7d136b52
+MISC ChangeLog 9235 SHA256 03e995220e842d3ddacb4e4277da182c582a3102ca3bb2273bff4d03d488f299 SHA512 f37c8cafb22eddd7817cc85068237864abb3f1040fc47d5a69c974f996ca4155531d0909b3f683bdef2646ec951253f9532dfe4daa4e951f258f9d69d9c16fda WHIRLPOOL 57890ad953b5f46ccf2843bf0a119aa277ae15a9ecbb55b05663ab7071fff54d41c5bc6ae7cf03dbc4caf479c8c22f1acf1f1e2fb9737938e4923252f0e3b53a
 MISC metadata.xml 536 SHA256 3da647c87e8de0cfc06fc065a9ada0e3ad174269ab4b03d70813e75f5b768639 SHA512 f15baad2d36378791b0a256812becb55dec29b98ce2aecf4f7e54148d09a9dda1461d12dc652e3be7a8fed61e4d844c18c6d7ea80e924c77b76fb5f185e40568 WHIRLPOOL 51ede006137c1a3037934f33c00b1bfa45846b3bd60d9d61081a89b89215c0ffbfeb8d0725e62504d22e50699ddc8b6eb917ea220c00afa05fcd9c98167cc5ac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJThbFrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTtAinXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViraUMP/A11JgWjB/qhnW2ySlaqHDlC
-zF+zEniwsR7vjw4uX5mFxRO7VYh1Xam1FFoXJYmgW8EKYpztg677YT8LEa5+kGvS
-T6OhQdmrXBqHWFcGBUEsV6VuHgCloXW0oueC0oEVWaSHX5/B3ZejEZzsUCi2rE7H
-poerbqwMl9ViwpnNFNBS5qcy8LrLZVyQImvX5mmz2FU1GZsb7UYOdHhsSZogaDvY
-3NrCHNzvRA458yG1kE3Z4cK61+RTNC6PcQxJM5IhAcK74ck0dkgUAST4JMwtqgpp
-x4h1miRYcd9wOR56+zMR65fUUwNfQqZcWYGPW01fH0KLqc3FqRRHG/RCji7AqCRK
-MyYOvHBWNMqJ74J+aqn6JF0owOCjwWRQSj0Z61PaGP0hmR9Ck/8AZWDeVytSPrhM
-CBfp+D9qwWvv47v1oWs0qUtkv0QaF9msZ962dloe/mJX8nZ4v5nhZoLiulQoYQjX
-+SeVLzwtXfjjWLrVxJ47e3uuakyWPZxFU/ZUojqx8YQzfBz8hdl81MCv8GQ+XTIm
-oXWPvwSE5zxgNdxOFZo04qrws/Q5I/ZxkOh0brmWHP+vCMnfTvlBrKZkCE9f23Tc
-bqNg4Szr1q7aBG8cAqhpnEKkq8cB94tBXg1Kpuqdxopq1axuiQgby9GzJK39BoLB
-Z/i0bEAmJP2UuWOYqc5R
-=RzfL
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir6CEP/3biLQMb7NAkEssxyeW8x+qT
+6uRHgFyS+fKlOBuE12ExTrqKKFkLENG5Cva+WivSbNDqLhVFaJUZMlVWO3ZYJRSZ
+awJ+YwCr8snPWmoinIZZaDBnhHSR23RBrh1TGWY3qrqrWDWhsRtxUGyt6XX2931A
+rIqVw93y+poW+h2+7UwMt56hdP8rzmEIo37fgthT3fxo1NUBmC0ZkMfxoYk90wVt
+int7PQAhRLhpOQLu4VOvdQgKzH4Sw5TJlysh9vNXkAfup+beAZnyJv0G2bdZVPBF
+ViOdV86xKJVTxTLzskIgWCTdOm1pgy0ZmdJNYnMIzT7CgUkRkUjF3ydzJpEHgo3h
+hat3NwHuOu1y7+8IgjzIpvG6t/6j3j8ZGPREpO9kILCNSrXtUiLJOktUQTi5K2PA
+NCrWDzOOYHGL2sxt+RxAEAzEBqS7nUiEvfNjVNoPQhtVp+w4WmcgoqustnpIHLLK
+jwe+Xf8sUdpTPNTBFnd1M80wHo+DV+bFOE1LV6Mx4+BP0UhBXAnA14EXvRpeMcON
+rc6lwJxJpB5noHnexCQA4ysY4nwcygkSxinDK55D+ljGwmhoJBG/T5owLSAba97Q
+o22ROrQKKTGFSkIJOGBuEnvQgMiEksBQRIY4Z3ShTdHvnbb6bNWuMs/pN8KwmnKZ
+GvGnh7SqYEl6ajv+JklY
+=6Ok7
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-6.0.37-simpleMPI.patch b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-6.0.37-simpleMPI.patch
deleted file mode 100644
index fd8fc59b20c6..000000000000
--- a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-6.0.37-simpleMPI.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cuda-samples/0_Simple/simpleMPI/Makefile
-+++ b/cuda-samples/0_Simple/simpleMPI/Makefile
-@@ -172,7 +172,7 @@
-       MPICXX=mpicxx
-       EXEC=@echo "[@]"
- else
--      MPI_GCC := $(shell $(MPICXX) -v 2>&1 | grep x86_64-pc-linux-gnu-gcc | wc -l | tr -d ' ')
-+      MPI_GCC := $(shell $(MPICXX) -v 2>&1 | grep gcc | wc -l | tr -d ' ')
- ifeq ($(MPI_GCC),0)
-       MPI_CCFLAGS += -stdlib=libstdc++
-       MPI_LDFLAGS += -stdlib=libstdc++
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.0.37.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.0.37.ebuild
index 74bfdee1b7cc..7ca76f12330f 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.0.37.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.0.37.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-sdk/nvidia-cuda-sdk-6.0.37.ebuild,v 1.1 2014/05/28 09:50:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.0.37.ebuild,v 1.2 2014/07/02 13:27:02 jlec Exp $
 
 EAPI=5
 
@@ -76,10 +76,6 @@ src_prepare() {
 #		-e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
 	find common/inc/GL -delete || die
 	find . -type f -name "*\.a" -delete || die
-
-	# sed corrupts the simpleMPI Makefile, resulting in a failed libstdc++ detection.
-	# Therefore we need this patch, if we don't wont to touch the sed command above.
-	epatch "${FILESDIR}"/${P}-simpleMPI.patch
 }
 
 src_compile() {
@@ -90,6 +86,7 @@ src_compile() {
 	emake \
 		cuda-install="${EPREFIX}/opt/cuda" \
 		CUDA_PATH="${EPREFIX}/opt/cuda/" \
+		MPI_GCC=10 \
 		${myopts} ${verbose}
 }