Version bump.

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

3 files changed, 143 insertions, 9 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 91a27a78b24e..63680c38c73a 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.42 2011/09/04 10:08:12 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.43 2012/01/29 16:50:52 spock Exp $
+
+*nvidia-cuda-toolkit-4.1 (29 Jan 2012)
+
+  29 Jan 2012; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-4.1.ebuild:
+  Version bump.
 
   04 Sep 2011; Markus Meier <maekke@gentoo.org> nvidia-cuda-toolkit-4.0.ebuild:
   x86 stable, bug #378545
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 2c2806d7f607..cdfbe3440e56 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX nvidia-cuda-toolkit-2.2-enum_fix.patch 1901 RMD160 74aadb45017c94404d6379a0f94b62db38d74656 SHA1 5b79051ddb2701c80331b64d376e6c106c38def6 SHA256 a1917977a94f0439ca3e28be0eb41b9e5c0ca9c03f3a22dc91d6bfdca253b258
 AUX nvidia-cuda-toolkit-3.0-enum_fix.patch 2460 RMD160 df4fa802d2f5b9bdb53bf321145894eba2669ce3 SHA1 daf02f05256674d17c43eccadf12859cf05f10e0 SHA256 7256247bd4def308b263a547b4c0f342c687f11cea17fad527859452417a4cc6
@@ -18,20 +18,21 @@ DIST cudatoolkit_3.2.16_linux_32_ubuntu10.04.run 88078059 RMD160 5d3863e8edc5fe6
 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
+DIST cudatoolkit_4.1.28_linux_32_ubuntu11.04.run 198302412 RMD160 a45f5f21927af847808384cb9379d739910b55d4 SHA1 e18c03fab9c3fcdabec650908320782c9b995930 SHA256 30f8d7ddabccad7f80b01bcc3beb7590bb0f4e82944f757c21e849e9e411c309
+DIST cudatoolkit_4.1.28_linux_64_ubuntu11.04.run 259109551 RMD160 1ba04058f897564a0b8c3058415a679808500526 SHA1 03c77b0882d5efa813829f9286e4f06403dd6b51 SHA256 073864953c0cec206254e2ceccb8745a902dc8a95d4f2ef86f5231ae729070ad
 EBUILD nvidia-cuda-toolkit-2.2-r3.ebuild 2941 RMD160 696bff6076a1205567866ee5f784b5c87b3653a0 SHA1 3dcfa25993faebf56020bf544cd1edcefcc20cd9 SHA256 97ae4ad58eb39dc1237453372115426970fb564fff43f97c194ecf71fb16851a
 EBUILD nvidia-cuda-toolkit-2.3.ebuild 2874 RMD160 f33e64604bf2da565afe9208e1a8a7e57446da32 SHA1 443dcff6f956ce4c348cd00b1161d502e2841062 SHA256 62148550f99169bd9e276624018732c2c0903f3e84680a7e5fa8b1f76b2f3418
 EBUILD nvidia-cuda-toolkit-3.0.ebuild 3566 RMD160 54a7e90ff423ce8193255512f65e84b76bb0611f SHA1 a51c2622e5be1f3d11b7087bf940afee4e24908d SHA256 d8db38a297e6944ac2c460e1e73f3c3fcbec322d137da343dc981ec51237c182
 EBUILD nvidia-cuda-toolkit-3.1.ebuild 3391 RMD160 cb6ccb3f4b900c3ee0fb7311b61324dbe3b782b8 SHA1 1c6e414548b579f9129d3044f79a398c39804191 SHA256 7cebc20245b47bde90c03eec64b4d18195d40885cfd6d1204692564b0d853d4b
 EBUILD nvidia-cuda-toolkit-3.2.ebuild 3612 RMD160 d40ae64e97356459fcc688be7d7f1365a985a834 SHA1 f3db71f16f3e6d535988c43993f8a6fcb3d1a1bc SHA256 2f23451497f317e073b829cf52002b862af865cf42955954ea96cffd21ca6b94
 EBUILD nvidia-cuda-toolkit-4.0.ebuild 3704 RMD160 7f3507cb7fa2fe119dfda0ea7cd09f873af45932 SHA1 454b98f3a33acbb39b27cc0c774dc93cd1f66831 SHA256 bb5f9232640e7882c46396640f9681f1d62be676c92a7efecbf9be83764d03ae
-MISC ChangeLog 7794 RMD160 6291bdd55121d83d8c91df9d0f0383092b214b4f SHA1 e308f3abee349db5f0cb99142b84774858bc4f70 SHA256 c99828a310d97b5f193eef90cf7d1459cede7f83dc204db7198dc2c409083090
+EBUILD nvidia-cuda-toolkit-4.1.ebuild 2998 RMD160 e7fad707bd69382d3b9dea21f7ac33915bf166e3 SHA1 7505f01cdeae64ee554aa0e04194c33375b50721 SHA256 bac5435409a3f77169876626528f2679eba1b0dee5edf2322a0614b0fa79bda5
+MISC ChangeLog 7939 RMD160 e8d17e0c6f8d1801968ec11a7f186c6bf23c1c2c SHA1 523ee7610ed2dbef0d9679ff451d20172bdfcd2b SHA256 8884608fd69672468de8fcd8ce54ed90ee54a631305a5b8da50d69852ff8010d
 MISC metadata.xml 462 RMD160 f1584dbb8fbdfd170cdc74827f7edb1ce41ce4c1 SHA1 1a793b6507c9c207b54d02ebb0b8cf9199912b31 SHA256 9b61c1cb31d86a60ed81be112681c9642f53000b332748e24a8eb002585db530
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59m4UACgkQfXuS5UK5QB3XLQP/ZbGHhnTHEx5GV9/4Ik+vBZCQ
-ETMWBe+I1sZpwTqzNem0qmHrSNf2IBJfRH4xovd7XrP7rVaOne1cTekLDayiJCw2
-L4I1AvEeDzv/x7919N7Zma3WTAYjm+LgU20tGBR5FGwJjHKpFXczTcmbUFeJKqw6
-/EP6VF6+7DdTZb/QI0c=
-=kDdK
+iEYEARECAAYFAk8leRgACgkQchej4aZK9/eruACfaEPkbif79vDwId67/JNTfWGK
+sfEAnAhBaS4cePkyY/1dD02UFrp9WSw7
+=pCb/
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.1.ebuild
new file mode 100644
index 000000000000..77e2bca94dd1
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2012 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.1.ebuild,v 1.1 2012/01/29 16:50:52 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}/rel/toolkit"
+SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.28_linux_64_ubuntu11.04.run )
+	x86? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.28_linux_32_ubuntu11.04.run )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debugger doc profiler"
+
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-2.20
+	debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 )
+	!<=x11-drivers/nvidia-drivers-270.41"
+
+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/*
+	dobin nvvm/*
+	dolib $(get_libdir)/*
+
+	if ! use debugger; then
+		rm -f "${D}/${DEST}/bin/cuda-gdb"
+	else
+		insinto ${DEST}/extras
+		doins -r extras/Debugger
+	fi
+
+	if use profiler; then
+		# TODO: Use system JRE for the profiler?
+		insinto ${DEST}
+		doins -r libnvvp
+		fperms a+x ${DEST}/libnvvp/nvvp ${DEST}/libnvvp/jre/bin/*
+
+		cat > "${T}/nvv" << EOF
+#!/bin/sh
+LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${DEST}/lib:${DEST}/lib64 ${DEST}/libnvvp/nvvp
+EOF
+		dobin ${T}/nvv
+		insinto ${DEST}/extras
+		doins -r extras/CUPTI
+	fi
+
+	chmod a-x "${D}/${DEST}/bin/nvcc.profile"
+	chmod a-x "${D}/${DEST}/bin/ci_include.h"
+
+	# 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
+
+
+	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. "
+}