Add CUDA Toolkit v4.0 (bug #367529).

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

4 files changed, 178 insertions, 11 deletions

diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index b2fadf407961..6ae9f3818301 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -11,6 +11,7 @@ DIST gpucomputingsdk_3.0-beta1_linux.run 108531376 RMD160 f474240b59f3f14924b121
 DIST gpucomputingsdk_3.0_linux.run 100306703 RMD160 5850ac6e4c80d5b8f01dfb1f4b34500bc3264650 SHA1 5e1e32a8d27249ea1a427256eaffee7c1f885d21 SHA256 7a3afdd52023cfa49bc67182729ce498cc85fa370dcd4bd33c299fb75945ec5e
 DIST gpucomputingsdk_3.1_linux.run 222010279 RMD160 5ae82967b821dfaa8a0b90fbbf2a20c4fd8ef892 SHA1 8b78733e909e52b4e14bdfd8be986bb420268320 SHA256 57d71cf889df7bbbc8b18ba5e74b2dd9e5a64951867c007d63577c2e07afd7ce
 DIST gpucomputingsdk_3.2.16_linux.run 127914287 RMD160 56bde63eb2c0ea5c6ca0844f202154eb1186243d SHA1 8d98df6ea831d268259eefaf33340e619c5a9e21 SHA256 e815d80e183f4a77ddd5e3d5611432c387102c786d12a57c983b69ad74ce3e45
+DIST gpucomputingsdk_4.0.17_linux.run 129498736 RMD160 c5b80e9d58589733f228b90a8598f779f3af78a7 SHA1 8b1bc9bb0279cd842af98253eafedfa0b47068fb SHA256 d62baf4963ca58d7db711e0366439e2c63bc84ce6c513c8a9dfa82a0fc51f102
 EBUILD nvidia-cuda-sdk-2.02.0807.1535.ebuild 1690 RMD160 2b9b2561e15c2a6f38858153e91cdfe5b5276504 SHA1 78f2b3ab55abdad520fbed88a938e755e9c2f8cf SHA256 35049be3a74172f8ef6526e6f840810e9df553e756cc475768e5c9925e0591ef
 EBUILD nvidia-cuda-sdk-2.1.1215.2015.ebuild 1796 RMD160 c05985e8e0acfbe9895d7596a7ffe97e39989f15 SHA1 49217e4253f38662bfd14751c52dce7221eb2d3e SHA256 12caf8c7eaacfed5c99f1c0166bfade10dc221f7541010172fb093b882785839
 EBUILD nvidia-cuda-sdk-2.2-r1.ebuild 1898 RMD160 a2b21c5573df488c8ea2d2fddf86b3c8f9c5a528 SHA1 dce1df914c20d4b783d5d62d56eba16887184612 SHA256 dac3f544845b3cba9ac2ea15c6b9ea45644eacaaa7860303ccc0661e3b9772e9
@@ -20,12 +21,13 @@ EBUILD nvidia-cuda-sdk-3.0.ebuild 1954 RMD160 6b9972c3ac117e9ba6430eb73edc8b2ee6
 EBUILD nvidia-cuda-sdk-3.0_beta1.ebuild 1960 RMD160 7d78752c5cca97cdb9f82c40ddbc1c39b4f81b36 SHA1 df2acdb8b5f98d3783c86c8bf6f31fc9c4a5c01a SHA256 191ad85ff8e4b5462951b0f0b438551b189251394c2f7b6523fb68c664f4d09a
 EBUILD nvidia-cuda-sdk-3.1.ebuild 1622 RMD160 472830af8ea8c0eddb686885b3ff9048d6fcbcc2 SHA1 b1d1d4f2f7aaadb8efb90f196fe98a368571643b SHA256 b78cde588900a57beaeba145d3d76c4381d7128c2540fe591505f77513e67a01
 EBUILD nvidia-cuda-sdk-3.2.ebuild 1938 RMD160 79137d55c64181fdf3a180e3dc8d25436017919b SHA1 850ce58c79611be98e4a1626222b26d7598a76b4 SHA256 d28ce6a461e8a5752869d75f98b77ff438070d0afc137acf41ac2eaae72e9783
-MISC ChangeLog 5409 RMD160 60525f57cfed95e0cf5b279c2deb0c1e6b9b699d SHA1 4cc64c0cb1466061052ca64b6f221613c66231a3 SHA256 2b469502d5ff952abe72aef85e4416101c55625e5d99a99f7a05742c6e96427d
+EBUILD nvidia-cuda-sdk-4.0.ebuild 1933 RMD160 fcad6a74bea355101d99ef7d04d5518f9703f608 SHA1 ed6ca6c183d1c1f7eebdf29f6b3f4ccebf358209 SHA256 3133195df263e6567520e056af010e4b020d7e0ba46e9e223e8717ba6fbe323f
+MISC ChangeLog 5559 RMD160 24c93df183ec8e9c2e969a2ff5ace5d27dea548f SHA1 319105bd79b676b4b23900cb342be63e398e4271 SHA256 b2e978223b89f5030162bc929fb4faf97658ca4f41ded416f1c964565b595a16
 MISC metadata.xml 533 RMD160 e687824960583f9189283c95ad2630ba4bc34e12 SHA1 d0aa73f3b64351649b72867df05cb2a6785539fc SHA256 f41f0deb837dab23cf452542fb338fca84cec8665c78a08eaeaa7919b61e673f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0E4X4ACgkQchej4aZK9/dP9gCgh5UOd1pbONDokVOHiEHH8M6r
-hWoAn3NL9d0krL5JQSJsiF/OBUicl0DC
-=t4Ih
+iEYEARECAAYFAk3iq+kACgkQchej4aZK9/d1jACcCWMu3L6WdC84kaG9ROtKqMv1
+zLEAnRlJVXuYNH/QYsYms5T1emlCeFvx
+=B5o1
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 5dbb67d322e4..386c00dc0319 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/nvidia-cuda-toolkit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.35 2011/01/06 22:13:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.36 2011/05/29 20:24:29 spock Exp $
+
+*nvidia-cuda-toolkit-4.0 (29 May 2011)
+
+  29 May 2011; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-4.0.ebuild:
+  Add CUDA Toolkit v4.0 (bug #367529).
 
   06 Jan 2011; Michał Januszewski <spock@gentoo.org>
   nvidia-cuda-toolkit-3.2.ebuild:
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index b4e2d62517e1..2ef8c536ed68 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -16,17 +16,20 @@ DIST cudatoolkit_3.1_linux_32_ubuntu9.10.run 66247466 RMD160 ee6c509a33142686c93
 DIST cudatoolkit_3.1_linux_64_ubuntu9.10.run 77819853 RMD160 c07af6804da2f565b23458ee1f033bedd36c502b SHA1 fc44332458ec52b194a556c9d1f72b2752938f56 SHA256 06cebc47f2d2df8ff1ce5696493b606040657030838a165823a8b3145a7c6620
 DIST cudatoolkit_3.2.16_linux_32_ubuntu10.04.run 88078059 RMD160 5d3863e8edc5fe678e40e8af84a9cbceec06b319 SHA1 1ade180daabe623b01324921292486f5081fc3fe SHA256 7be5e8d81fae0acaa5fd711ce623ab709f5ed44654319487f169a7d0997ab184
 DIST cudatoolkit_3.2.16_linux_64_ubuntu10.04.run 114204677 RMD160 0e9c98bed3adffd50a9c66bab21b35f6f1fec7de SHA1 709bf5bd34457e15c31af548c25e59345c555fa8 SHA256 20e9d40f5cb94f7fb42920008746eaa32afb126790c3e22c742a1435ba389cf8
+DIST cudatoolkit_4.0.17_linux_32_ubuntu10.10.run 143474501 RMD160 283379cb6275d7a3af2dd4bdf2282be5728038d6 SHA1 436918310c2a08bf04c5486c7dbeabc971adbcd3 SHA256 e578f3e800f348005785ec17fef14fbc4c77fa975153aa4a7c89530b501ca8a3
+DIST cudatoolkit_4.0.17_linux_64_ubuntu10.10.run 211915750 RMD160 e5d0a95698b884101f1af342a328e12fc035a3d8 SHA1 f7a314159f8620ef0b152413decf5420e3eb4ead SHA256 613eccb8402bc9f9dc9a571c9c24a5fa2ab2d9a9e249ec62fd26c4c81a9bb1c1
 EBUILD nvidia-cuda-toolkit-2.2-r3.ebuild 2985 RMD160 bd6e466ceaa20d98475951a591de5bd022c43b3b SHA1 0af6985e8731b3f6da0f5bb6d9b479f5f258beec SHA256 7ef9b0c3dc58bc6cbdef115d0cca3b22660840e1338c0cc9dece7e6b0a46aaa5
 EBUILD nvidia-cuda-toolkit-2.3.ebuild 2918 RMD160 90e867dfc8bf37d2c7777b5eefe0564dbf9982e5 SHA1 7f6918a0583a3681196d9039d3dd34f3d56f1b8b SHA256 126d6077fa98b322831026cefb3390a0bb3b7618075458b9c65da0a93bfac01a
 EBUILD nvidia-cuda-toolkit-3.0.ebuild 3606 RMD160 6597013a862225a8c848f3671a3d03cb0ccc49c0 SHA1 b365e7893bac33c38d5a4b4198e63589290f92f2 SHA256 85fd0d911ddc55bb4657c7d4bf3cc7ccabd32edbf9ed43c04f4f326e9a394de8
 EBUILD nvidia-cuda-toolkit-3.1.ebuild 3431 RMD160 d684d309d9a3e46cc19d4da479265d864cdf71b8 SHA1 74c4f4d6186e477a1eb03c0e0f11670785411e0d SHA256 fe3cf9f91583ab7b5a1dda205e064b40aa191fa17ae53f688d4e9da912f087a8
 EBUILD nvidia-cuda-toolkit-3.2.ebuild 3652 RMD160 d39e0f4043c588a55af965a6837c76973e34c59b SHA1 2ac51e868c7054b1e4c7f49a1a2708fbefc0831e SHA256 88e39dd975db1f96722ff7eb92909fece7806c46bc55f29b5a372d04ce3451d7
-MISC ChangeLog 6574 RMD160 93bbb617947eb6a8eae6a1b4d0b7aab98463c93a SHA1 ae23727f890f4d5c369e3e52f82824ede64c330c SHA256 c2b94d65df3ed2eddcde3e3370d47d261ed2ed587540b9313edfb5e023a82168
+EBUILD nvidia-cuda-toolkit-4.0.ebuild 3645 RMD160 ed55de3d59376f812a1ea9940f07b5ad1404e1e1 SHA1 6623144e515e28f343f97384bbb2af4e6365b983 SHA256 607927d37d7d51094f50a8ccfeddfff758e86667d986da8e9755446748bfc401
+MISC ChangeLog 6743 RMD160 3e1609d0ed75502885499dd6f016a4f1369f6efa SHA1 d948537fbc2f75a24c1af27f8c561e1fc5106329 SHA256 8a52afcdafe4d2e1335f661be6fb5d9a1ee69cf3d448726a70406090eb54b0cd
 MISC metadata.xml 484 RMD160 a8b809639cfc4ab4e1133dfc97d37052752741c5 SHA1 4638605669859be01b2c2dc2a0192c7f765176cc SHA256 c5395eacda061252ecad00d6172b91dcc5100b2bec944712f90a6adb122b69f0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0mPqAACgkQchej4aZK9/cHuQCfSeeZN+WVflgD31ZSu5YIYwfW
-wg0An3eMOPjgZSA86TILhZisRRWu/WIv
-=LMLk
+iEYEARECAAYFAk3iq4wACgkQchej4aZK9/fSZQCfe7K6Ao2Tw1onaTvcYaV65jFV
+vPEAmQHs0vaRPyOyRCybxj+ft5LuqHz3
+=++HM
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.0.ebuild
new file mode 100644
index 000000000000..ef40180ddefa
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2011 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.0.ebuild,v 1.1 2011/05/29 20:24:29 spock Exp $
+
+EAPI=2
+
+inherit eutils multilib
+
+DESCRIPTION="NVIDIA CUDA Toolkit"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+RESTRICT="binchecks"
+
+CUDA_V=${PV//_/-}
+DIR_V=${CUDA_V//./_}
+DIR_V=${DIR_V//beta/Beta}
+
+BASE_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/toolkit"
+SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.17_linux_64_ubuntu10.10.run )
+	x86? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.17_linux_32_ubuntu10.10.run )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debugger doc profiler"
+
+DEPEND="!dev-util/nvidia-cuda-profiler"
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-2.20
+	sys-devel/gcc:4.4
+	profiler? ( x86? (
+		x11-libs/qt-gui
+		x11-libs/qt-core
+		x11-libs/qt-assistant
+		x11-libs/qt-sql[sqlite] )
+		media-libs/libpng:1.2
+	)
+	debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 )
+	!<=x11-drivers/nvidia-drivers-256.53"
+
+S="${WORKDIR}"
+
+#QA_DT_HASH_x86="opt/cuda/.*"
+#QA_DT_HASH_amd64="opt/cuda/.*"
+
+src_unpack() {
+	for f in ${A} ; do
+		if [ "${f//*.run/}" == "" ]; then
+			unpack_makeself ${f}
+		fi
+	done
+}
+
+src_install() {
+	local DEST=/opt/cuda
+
+	into ${DEST}
+	dobin bin/*
+	dolib $(get_libdir)/*
+
+	if ! use debugger; then
+		rm -f "${D}/${DEST}/bin/cuda-gdb"
+	fi
+
+	chmod a-x "${D}/${DEST}/bin/nvcc.profile"
+
+	# TODO: Manuals are missing from this release. Remove the following
+	# commented-out lines if they are not restored in the next releases.
+	# doman does not respect DESTTREE
+	#insinto ${DEST}/man/man1
+	#doins man/man1/*
+	#insinto ${DEST}/man/man3
+	#doins man/man3/*
+	#prepman ${DEST}
+
+	insinto ${DEST}/include
+	doins -r include/*
+
+	insinto ${DEST}/src
+	doins src/*
+
+	if use doc ; then
+		insinto ${DEST}/doc
+		doins -r doc/*
+	fi
+
+	cat > "${T}/env" << EOF
+PATH=${DEST}/bin
+ROOTPATH=${DEST}/bin
+LDPATH=${DEST}/$(get_libdir)
+MANPATH=${DEST}/man
+EOF
+	newenvd "${T}/env" 99cuda
+
+	if use profiler; then
+		local target="computeprof"
+
+		into ${DEST}/${target}
+		dobin ${target}/bin/${target}
+
+		cat > "${T}/env" << EOF
+PATH=${DEST}/${target}/bin
+ROOTPATH=${DEST}/${target}/bin
+EOF
+		if use x86 ; then
+			dosym /usr/bin/assistant ${DEST}/${target}/bin
+
+			insinto ${DEST}/${target}/bin
+			doins ${target}/bin/cudaapitrace.so
+		else
+			dobin ${target}/bin/assistant
+			insinto ${DEST}/${target}/bin
+			doins ${target}/bin/*.so*
+			insinto ${DEST}/${target}/bin/sqldrivers
+			doins ${target}/bin/sqldrivers/*
+
+			cat >> "${T}/env" << EOF
+LDPATH=${DEST}/${target}/bin
+EOF
+		fi
+
+		newenvd "${T}/env" 99${target}
+
+		if use doc; then
+			insinto ${DEST}/${target}
+			doins ${target}/*.txt
+			insinto ${DEST}/${target}/doc
+			doins ${target}/doc/*
+			insinto ${DEST}/${target}/projects
+			doins ${target}/projects/*
+		fi
+
+		make_desktop_entry /opt/cuda/computeprof/bin/computeprof "NVIDIA Compute Visual Profiler"
+	fi
+
+	export CONF_LIBDIR_OVERRIDE="lib"
+	# HACK: temporary workaround until CONF_LIBDIR_OVERRIDE is respected.
+	export LIBDIR_amd64="lib"
+
+	into ${DEST}/open64
+	dobin open64/bin/*
+	libopts -m0755
+	dolib open64/lib/*
+
+	# TODO: ideally, there would be multiple OpenCL implementations available in
+	# the tree and an eselect module would allow to switch between them.
+	into /
+	dosym /opt/cuda/include/CL usr/include/CL
+}
+
+pkg_postinst() {
+	env-update
+	elog "If you want to natively run the code generated by this version of the"
+	elog "CUDA toolkit, you will need >=x11-drivers/nvidia-drivers-260.19.21."
+	elog ""
+	elog "Run '. /etc/profile' before using the CUDA toolkit. "
+}