dev-util/nvidia-cuda-toolkit: Add profiler specific paths only with USE=profiler, #512160

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

3 files changed, 167 insertions, 16 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index f7352cf3a7c9..c50b522febd6 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.86 2014/06/16 20:30:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.87 2014/07/14 08:53:09 jlec Exp $
+
+*nvidia-cuda-toolkit-6.0.37-r4 (14 Jul 2014)
+
+  14 Jul 2014; Justin Lecher <jlec@gentoo.org>
+  +nvidia-cuda-toolkit-6.0.37-r4.ebuild:
+  Add profiler specific paths only with USE=profiler, #512160
 
 *nvidia-cuda-toolkit-6.0.37-r3 (16 Jun 2014)
 
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 47dee2a0f599..92c159170ec4 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -11,24 +11,25 @@ DIST cudatoolkit_4.2.9_linux_64_ubuntu11.04.run 282394341 SHA256 22d857db6b38316
 EBUILD nvidia-cuda-toolkit-4.2.9-r2.ebuild 3269 SHA256 4065c94589e937d15c8317d9abf250b3c98b35641df48a7171c02fb3259b9788 SHA512 b02351596b409dbbd8a6354791005484666c6c3574f10c869a81f8d6ddb600724e55db2cca04be3df77c1d77b6ffca259f206dc343e22eab0df9aa49553b69bc WHIRLPOOL 725b1a92d6df1ee846e680eb62325c27b544fcd5858b28abfbdf2b2e6ad8d807d791860c05f1230de357f670ad340f91a04b13d7be5fcde926ce60bdd31b4375
 EBUILD nvidia-cuda-toolkit-5.5.22.ebuild 3536 SHA256 2ed359ba1bf26f3e902818030c41bac4b2e4a217b5d48f73e4cb6d4250451227 SHA512 54d394a1aeaeb7ca69c981e77e56323a359b10ac295dad50e7f5e36b428768e0b81e1d78e32afe4c919dfa9715e3477728e5b485d87a49151a563823410ea071 WHIRLPOOL f5e0d1382adaf51fdf2556c84c55ff462572cc03051244ff724b98b160dab6e187b655c78966947a8e125c2fda592062b186df1e307d00791b1e4f317d9c9a6f
 EBUILD nvidia-cuda-toolkit-6.0.37-r3.ebuild 3534 SHA256 21fcc770d3138d2e95a53a662aa38a8f4bdbce2b1027a1ddc3de8a315942385c SHA512 c04964fb02a9cd93c72f76f5fde1b6dbe218579b4e9c66c8aff61f54ff0565b6bc14ed3db25eecc0ab429b0f28dfc2a45671a945396da3b81da162a69842169f WHIRLPOOL f2c0fc8e1f32164296dd53dfcd16fd850b32f048474b56ec15414db584148abcf1108ee0b283240d4d126439659388a5836ec49ad4e3c71b4cc5eb37095416ac
-MISC ChangeLog 16507 SHA256 e1bb0b95b8c7098379ba055d6f7e706294d2a1beb36aa94516050bb51c7f497d SHA512 57bbd15a2258ce829f35f75b5da0522f8b2a738d11c16a011c6c145ecd3fa44c816bea5335e0c5222510dba98c935a52af2e93fefc760147613ec41ef1dc2d7e WHIRLPOOL 5054e811a587f2010f8cea9270dc8c0d51a934e4d788ecc8c4a3ffb9b18349b3b2e4988d0bde0d552afab874d4404c41956fe7e0e931cc416cd9f1e0d83c7d05
+EBUILD nvidia-cuda-toolkit-6.0.37-r4.ebuild 3580 SHA256 37c64256a8696999fa3dafb423fdf9f28cff30ca6081527ea28cd2f8852d9cb6 SHA512 0eea8cfb4a1bc9cf1cc130129a47fc0694a3121edec20ada4d4b09a394e5bc622d5397373aa0ce33899efd64721ce19eac39ac06c02005de429036d6dc14a8d3 WHIRLPOOL c544219700b1b20237b6722fa338c5f2c4f5399f3b9cfe3657a7e045e71328972e2059c755c29e5c62529c08f04782cdae45a77851e697af46f00b3f6d7108a0
+MISC ChangeLog 16704 SHA256 6929bed7cbc9b7786f597fb90cd410bb8a0407a82754743fad44ab2ad9b87000 SHA512 701bc8aace3c3b824d93f217d162ba1daa88750d5b1c2610046230023727c4abcc8603818ae96e125e42684445ddae7dfb9618b362c5c58944e5385783fe4c28 WHIRLPOOL 7eb42e41219357d62c8b0a0da174da36897e4a5dd2e358b50ff354a81acd7aa594aa9a6497ade39ab03a4455d5f7ccb69fe4b582fc62cd4331cfd139f4f97453
 MISC metadata.xml 506 SHA256 16d98da28f74ec82ae271f04e456547db8da2a9c576bf262ad897f4a3259fb56 SHA512 c1be2bc00a75ee9db0339938964d80214648df5a6cc16f3d1250f80d3142a1e511750dba34b54794227457db0d1a0f5ca4f692f34b9566ac3f58fef43196626e WHIRLPOOL 02f0c08cb4ab40b543e23c51ae81a7f04e452f3949808bd29a2790c565c2739d131d4d19fc3d4d279381a5ed05ad0623ba560aba82f7a3b510e44f8cf35c6473
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJTn1PmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTw5p1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirTLwP/36aJve5RksIozuiOSvkFF5j
-dC6SUFEcRC2SFgJA5diQVvUhQGsq9axO2+cOltiVWly+HDRSwKyFRs3m5/5X6FLw
-a6Sofxr+sMJUJScIQvyo3PLrBbLMV9gf9LjTl3UpsB88KRiKev91IK1q6fkW4ewj
-TjfOfRLhqy4V1GjpD5GqzyQZ/Y4+KnBbHAOqXUg4B1RoIJq/uR9jWKuYXo1cwgAQ
-J/OnfuB0umLJ0CAxCwpvE+2f4c87oTwLpKniRkqMqcTJYCfZoXGtCwOXylYqFuN8
-PnC89ma5mgwtCB4irhsU0CTOJIeKa2pRq4ftwxoFIxnkL/GqYpVUFGHPkGDi+Hoy
-4l7+yo+J4drifyS7+7i3qfz7GbG/D35T3GuSRlm6ZWfi20/BYWt+jeJp96p2VIPw
-VY0/m/Taa2lpS9gyc10wXLIF3LTVvXtbPz7Ptlyee40vaKOaPzM01CW4DLiv22US
-o+rD8PjZYkcfI3W4HbX8WR0Vd0CX0JIFqgHB8QnsKjkLb/vO9QaIbP6afagvMqR6
-Sd/nidPLVuj0mFD3tgqiCusXWPE5iDkY8Do3ZVVV84Ng4kuLdKq0PABXbBb6OH2m
-46KYTpps0TVfZetqs5eSLzJyLwg1KWNHebMlH5Gqk6u8kk+GS21h2zH91m6R0X8q
-VtE5WMkvbHIrLMUtHHl9
-=ykrD
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirwUcP/38bxqodoVzrPjkENotbsOVX
+6i6wQmSm6VeAkv0z9f9WwfBfLE6ryEkvsnPQVmTCIIuaCc+eacn9tuURKMvIAdDc
+31bFS2tEC8genwl8u0vVA2srDVN1RMBNB0W/pyn3PfwWuu0QxT85TWUP+g6MCFYQ
+JWbOl6Q40TL+PfA/0/2bSiRLnaUlhFYoTlbNAR5W26rosssvHLAggfu/KTHsvcbj
+pXcdrRZKhi+U/Sg44sQzGWduK6EqfrzgojEvDdZGXhzx3NPP4sbdZtBK1TudsUOr
+Wlg2Gbzu203AH/5/BAVYdnz7qoCc9dIohKNzcVUhSAkkJqCKKx1kTP8m7Eq3E6C1
+TF/0eu1Ul/k0gR2y1WgV26P5YG2zgKq1vsB7vmt5LxLHG6HDCgrshHsw/w8oiwbI
+h5n48K7BFmkeoXnD49nXqQTGzO4qBg8B7l0rjzyBres2gHNwm7oogfT8hygEB7l6
+lB7oXhvVy+VwmEewzTFKG/oBclif/8Wy/81a2jyotooeIBCqS5k+Qpf1rHkHQapa
+emZZ3Y/w6U0D0c7JRYLDSlqdPbTwN60LPH5R5OYUOArkL34+B/ml9dh+JIl5vauq
+bGSHSJWxUr7qpOYl3qW6JJb0OCinc3Q8upd3eu26D/12DascIy9CPOqgukdVuwcv
+XPD/xdY7ii5E7Ojt+gkz
+=Bn0g
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r4.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r4.ebuild
new file mode 100644
index 000000000000..3e701e38215f
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r4.ebuild
@@ -0,0 +1,144 @@
+# 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-toolkit/nvidia-cuda-toolkit-6.0.37-r4.ebuild,v 1.1 2014/07/14 08:53:09 jlec Exp $
+
+EAPI=5
+
+inherit check-reqs cuda unpacker versionator
+
+MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+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 )
+	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
+
+SLOT="0/${PV}"
+LICENSE="NVIDIA-CUDA"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	<sys-devel/gcc-4.9[cxx]
+	>=x11-drivers/nvidia-drivers-334.16-r7[uvm]
+	debugger? (
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses[tinfo]
+		)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="1500M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpacker
+	unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.8"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+}
+
+src_install() {
+	local i j
+	local remove="doc jre run_files install-linux.pl "
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}"${cudadir}
+
+	# dodoc doc/*txt
+	if use doc; then
+		dodoc doc/pdf/*
+		dohtml -r doc/html/*
+	fi
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+	( use profiler || use eclipse ) || remove+=" libnsight"
+	use amd64 || remove+=" cuda-installer.pl"
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for j in nvvp nsight; do
+			cat > bin/${j} <<- EOF
+				#!${EPREFIX}/bin/sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${j}/${j} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${j}
+		done
+	else
+		use eclipse || remove+=" libnvvp"
+		remove+=" extras/CUPTI"
+	fi
+
+	for i in ${remove}; do
+	ebegin "Cleaning ${i}..."
+		if [[ -e ${i} ]]; then
+			find ${i} -delete || die
+			eend
+		else
+			eend $1
+		fi
+	done
+
+	dodir ${cudadir}
+	mv * "${ED}"${cudadir}
+
+	cat > "${T}"/99cuda <<- EOF
+		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
+	EOF
+	doenvd "${T}"/99cuda
+
+	use profiler && \
+		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
+
+	dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(version_sort $(cuda-config -s))"; a=( $a )
+	# greatest supported version
+	b=${a[${#a[@]}-1]}
+
+	# if gcc and if not gcc-version is at least greatesst supported
+	if [[ $(tc-getCC) == *gcc* ]] && \
+		! version_is_at_least $(gcc-version) ${b}; then
+			echo
+			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			echo
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}