3 files changed, 169 insertions, 16 deletions
diff --git a/dev-util/nvidia-cuda-sdk/ChangeLog b/dev-util/nvidia-cuda-sdk/ChangeLog
index 18c753157784..450af6401498 100644
--- 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.49 2014/08/14 06:11:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.50 2014/08/21 08:58:16 jlec Exp $
+
+*nvidia-cuda-sdk-6.5.14 (21 Aug 2014)
+
+  21 Aug 2014; Justin Lecher <jlec@gentoo.org> +nvidia-cuda-sdk-6.5.14.ebuild:
+  Version BUmp, #520302
 
   14 Aug 2014; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Drop unused local USE-description: 'emulation'
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index 2b8afdda87d4..b71e97950638 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -9,26 +9,28 @@ 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 cuda_6.0.37_linux_32.run 779831016 SHA256 54084c2c808b0a4af91b5bb9cf0757f40510d6b259cd84373e7af3c90baec172 SHA512 c2e6e16b780a87c8530853dc63e6c8e000bc122428e474fd99a33c19977082eda0ef93f86a981a36c4f884ddcc2fd0d14b2f4f886cccc7c8a3f2c9441ea3c895 WHIRLPOOL 08d0a7a0eb4f6f3c07a939d949f4fa7f8bef8969224156256430de11abf204c00a0b8d6d1a2e37d4985c4dcb1f440f83380de75386dd53bbfc2aa8392e36e840
 DIST cuda_6.0.37_linux_64.run 1032032789 SHA256 991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40 SHA512 251f87fa797eb0ba40f76d94852c3a8a401057bdc6d921dcaf294d9972755b77b7180bbbfb655aa3fa9be6ea499e558ab02fa122ad225ddb0afdbbf3622483de WHIRLPOOL 88567cf44508cad899ab5591ee22785330b570b1447725ba120c829b9982e4629288a2c6033eb02e091c98b811fe68747d0405eacb6931389eabe05905de4d71
+DIST cuda_6.5.14_linux_64.run 972320904 SHA256 f3e527f34f317314fe8fcd8c85f10560729069298c0f73105ba89225db69da48 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e WHIRLPOOL 0b890771dcca352168fed1b1df9b29504b03f8c29da59cec29914c541283998edf65f5ca6a41362143a2d5d7359822b036894f563c56b39583b1ac4c64e35180
 EBUILD nvidia-cuda-sdk-5.5.22.ebuild 3496 SHA256 3ec9890ee5876ec56443d01332b261b97cc912758b9620662cfbbe50e576bdd2 SHA512 3199ef15b770c5c55ff313814d028db2b788305fc63ce77b72d480869a6235fcb4d4962ccc92ad3d7d1324513a0462015e9f9399cdc7f9d0979345357da4c4ce WHIRLPOOL 72f71818d133e8b6a3803720f285e7f00a475feab05327668df76e2b8f9ee33ea3e1ec078622563ad3b7c25734f83a2d3710171f2f97c16d991682bfc51588e8
 EBUILD nvidia-cuda-sdk-6.0.37.ebuild 3630 SHA256 8f83dadf9b8f80b88871d3d9afcc8d55b8f4b05ed7f015c304b0b561a9163249 SHA512 cee237bf5f2b35e561c91b918b1a347c0e6a642b1557945cf628227d2370dde97b79bad95fa1e62ebed169f40815242d818ddf098fc85fea505db873364d4aed WHIRLPOOL 566b304cf14d8a0c45bcd34a0f14371f6629f5d5f32affece81ff002fe7d863fcdf4bc774c6cec0e2661833bf411dbd72e92ebed155ba6976a9b341b7d136b52
-MISC ChangeLog 9599 SHA256 eed330b5f35bc18556d625f1e3600fe490b39480d9f90cee7a5a643fb5746e51 SHA512 f1b38b294068e54b32b3f90cc9515c9d52438e35e6fc44ba21e8ab9d93bcb800262319e7ed598274c8e2ee7acd5ed0751ea88e02d2e82235c914c1726fa6b06f WHIRLPOOL 41e67d3643dca9fd8e37830f8ac3825714e3b8cb52a2efbde7cbf5bc0853f3da67f68c1a29fc10047186c34fd6d7d31fa9f71d9a9fed473a93adb523a390c21d
+EBUILD nvidia-cuda-sdk-6.5.14.ebuild 3588 SHA256 d835d49bf9bd11bb87bc9dd8971f150ad16097203c657335cc338e1d47500a83 SHA512 f8f36f9fbf121904e9ca9e55c064e82aab8411f387a0d0a92528c75c5ab5342bcd9a4e0eba60573ee782994fab3332e1439a6ec8023354b2618e0fe3cd7420a4 WHIRLPOOL 7eb33bb6c3a94213a0e064db69e4a82673385ed4438d9b58b642a605ef265130af05d73fcac3f988bc91b888b34dfc357571dd8314e816076340c7de697a7d40
+MISC ChangeLog 9742 SHA256 0e0f87fb0a45b74c1195db7e039217778410a2862d61260988e5d4f00b4d9734 SHA512 1d4e93848b2f5836bd02fbf2c60fe78473c1c9627b2ba20b20cd5c09824e97172a0f166ed652d1219acfbe1ab8b3d00af3e4b9eb37febf1a9f1a759f6177c794 WHIRLPOOL 875ec7def2f4c16c8e42d481f18a4118dea56a5552de5abc3c6791b0d03577be987ea7b5e8f7b66fe7727d3c6a65466ef6bf19d4686525579422a5311f3dfe6c
 MISC metadata.xml 390 SHA256 4b9b3df9c5ab72b576b25130e1ff41278c938cddd76df80f6aa0cd5015d695dc SHA512 bbee50e8b6cc7e3c2e1b31c5f7cca01dd634d2f3adea4a182664653d4fada3d71a8709ce6f10e387ca95526952e2c3ff09d65b517e7d2cea14ba742d5d1dac41 WHIRLPOOL 4bdcfd49c7f7a0ab5b7aeae9fdb15c8acaf40413c3a6fabdce22a8ee5a671eefc37724b9d82d4fe8031157dca7aff151231355f6419ff49cafa6a8265f3307f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJT7FMUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJT9bSlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirDxYP/R559Wrm0hVrBmqtWOO/aasf
-ra7qh3ZSKuQCcGrAC49mdWO/3+IPYvg8oxCUrGh6q6G6gPzmz7lgjoQ37FbanTMT
-Qm10PissUq+qX6XijZGvvZLzLTshFlSd1TnTuavWbHO26LMamzJa+JesSDGad6qH
-68mBa9TpJQ3YjD+2S5iANXOH6g1ER3lj4fHYI2MPXM8+zmNbmLShJprAHb1tOumW
-6RQJQE5z81G/n7VGg4pyAmgZcERcjKyLL29qZHLkcJNvW+pPzSfjL/GBvnvT4l1a
-y3gvfnYK/+zZmtzW7GTyHR2IEkCCIxB8OQdY6qeycYbu+7kgn9yZcGe8dWtlLjzD
-9ErhbSjUUlh8Vjp0okofxOXxvQXboYOB6NIsULywjlW0emCKpS8sGNh14Cdx6TeF
-n0DGxKkahwaiMl6Y6Y4BdOgbB4KIyiqUjhZIarFnu47vvGZ6cuEnm//q0uayQmNn
-wqjbMgiEGyfU7a5g5fT1pEuKpyCw5EcCVtDMRsS0eEC6DqxZEf6TmWbEJf5MsZut
-hULbsIs6zzt5TTf9StFCIzMgduKpB8K6xIuC8na94PtdfdD9AG/K6vX6eHvMvchl
-XHEZzjFnBvs5elft1Djc7rnAFF0KiCoPi+10C4F+ISv2ziuImXI78XVXOBunqdgp
-jHtor31AgFkGz+/2CUbj
-=rOVt
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirpYAQAJgw1uo3L5900l5m1Inrsk0t
+XJFRAcP2wZzPK0LgAxCwSpfxZ9xf3jr/mvzSp6gV1h6yyFlpbGTxyLUoGNcSJdyT
+W8ZOE2WDOnY9eEPwRRAUM+yWG04X+hpkfw3DYk0qed//1BWCSO9M3Cnc2yH5dB96
+JwcksYQLovEiC4vXutwl74+Gknud9eisvoGsQYH1iC04B/DqeE04Z8dKYoVuHp4f
+y8eBsHlkZSuCa4/9XNupgIVp6eLN3Q10GwQ/ElKAwELrkrbis32/oFvxPWaU7bXJ
+BSGX2/4J+Ru/23q+xe6zyj/b6hbCTqzDVv+436gY4FXdqH2b/aCD/rapJUC6WPnX
+K46ZBwKGqj560Pjx1IVZ4SuFbTkZMfqBYdwmX/A9RsiCRJxbc4fII8LT3+QmNbeu
+Iv6wD9SRZuXTaqgxEo5RLNAz6SkflVQNnsDHVjy3yv3+nfH36y6L4a73Nrh4uP43
+qMMpY5QnvU/fhT38a+shUtHBmRTwB8vdoKJ9OwnK883t/kc/Q7uSxhMY3C+lFpg4
+NlNxN3ZnqtSZeIHEfRwb6+4jTaTGJuIpPubwBYpWrwlqlLpFab07njFYjnaQclaj
+w8F3eZugJUG7e5z9hJ27xLxZSM005iq5S0TE/0tTJnobD1svXj/qYjs7+FE0zVwk
+a0EHSLYT8jOCaUMcnDeR
+=5oZR
 -----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
new file mode 100644
index 000000000000..48e62a1403c8
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.14.ebuild
@@ -0,0 +1,146 @@
+# 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.5.14.ebuild,v 1.1 2014/08/21 08:58:16 jlec Exp $
+
+EAPI=5
+
+inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
+
+MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
+
+DESCRIPTION="NVIDIA CUDA Software Development Kit"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
+SRC_URI="amd64? ( ${CURI}/cuda_${PV}_linux_64.run )"
+
+LICENSE="CUDPP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug +doc +examples opencl +cuda"
+
+RDEPEND="
+	~dev-util/nvidia-cuda-toolkit-${PV}
+	media-libs/freeglut
+	examples? (
+		media-libs/freeimage
+		media-libs/glew
+		virtual/mpi
+		>=x11-drivers/nvidia-drivers-334.16-r7[uvm]
+		)"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S=${WORKDIR}/cuda-samples
+
+QA_EXECSTACK=(
+	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
+	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
+	)
+
+src_unpack() {
+	unpacker
+	unpacker run_files/cuda-samples*run
+}
+
+pkg_setup() {
+	if use cuda || use opencl; then
+		cuda_pkg_setup
+	fi
+}
+
+src_prepare() {
+	export RAWLDFLAGS="$(raw-ldflags)"
+#	epatch "${FILESDIR}"/${P}-asneeded.patch
+
+	sed \
+		-e 's:-O2::g' \
+		-e 's:-O3::g' \
+		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
+		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
+		-e "/CC/s:gcc:$(tc-getCC):g" \
+		-e "/GCC/s:g++:$(tc-getCXX):g" \
+		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
+		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
+		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
+		-e 's:-Wimplicit::g' \
+		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
+		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
+		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
+		-i $(find . -type f -name "Makefile") || die
+
+#		-e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
+	find common/inc/GL -delete || die
+	find . -type f -name "*\.a" -delete || die
+}
+
+src_compile() {
+	use examples || return
+	local myopts verbose="verbose=1"
+	use debug && myopts+=" dbg=1"
+	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
+	emake \
+		cuda-install="${EPREFIX}/opt/cuda" \
+		CUDA_PATH="${EPREFIX}/opt/cuda/" \
+		MPI_GCC=10 \
+		${myopts} ${verbose}
+}
+
+src_test() {
+	local _dir _subdir
+
+	addwrite /dev/nvidiactl
+	addwrite /dev/nvidia0
+
+	for _dir in {0..9}*; do
+		pushd ${_dir} > /dev/null
+		for _subdir in *; do
+			emake -C ${_subdir} run
+		done
+		popd > /dev/null
+	done
+}
+
+src_install() {
+	local i j f t crap=""
+
+	if use doc; then
+		ebegin "Installing docs ..."
+			dodoc -r doc
+			dodoc *.txt */*.pdf
+			treecopy $(find -type f -name readme.txt) "${ED}"/usr/share/doc/${PF}/
+		eend
+	fi
+
+	crap+=" *.txt doc Samples.htm* */*.pdf"
+
+	ebegin "Cleaning before installation..."
+		for i in ${crap}; do
+			if [[ -e ${i} ]]; then
+				find ${i} -delete || die
+			fi
+		done
+		find -type f -name "*.o" -delete
+		find -type f -name "readme.txt" -delete
+	eend
+
+	ebegin "Moving files..."
+		for f in $(find .); do
+			local t="$(dirname ${f})"
+			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
+				continue
+			fi
+			if [[ ! -d ${f} ]]; then
+				if [[ -x ${f} ]]; then
+					exeinto /opt/cuda/sdk/${t}
+					doexe ${f}
+				else
+					insinto /opt/cuda/sdk/${t}
+					doins ${f}
+				fi
+			fi
+	done
+	eend
+}