dev-util/nvidia-cuda-toolkit: Fix various typos and logic errors, #456950 & #456956

Package-Manager: portage-2.2.0_alpha162/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

3 files changed, 146 insertions, 5 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index b51484218295..9e058a41d41f 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.66 2013/02/12 15:18:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.67 2013/02/13 22:02:07 jlec Exp $
+
+*nvidia-cuda-toolkit-5.0.35-r3 (13 Feb 2013)
+
+  13 Feb 2013; Justin Lecher <jlec@gentoo.org>
+  +nvidia-cuda-toolkit-5.0.35-r3.ebuild:
+  Fix various typos and logic errors, #456950 & #456956
 
   12 Feb 2013; Justin Lecher <jlec@gentoo.org>
   nvidia-cuda-toolkit-5.0.35-r2.ebuild:
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index fc9331b02e70..51db0e69a604 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -8,12 +8,13 @@ DIST cudatoolkit_4.2.9_linux_32_ubuntu11.04.run 209998124 SHA256 0c91d51e49c7cab
 DIST cudatoolkit_4.2.9_linux_64_ubuntu11.04.run 282394341 SHA256 22d857db6b3831670bc2ca7ed22ac257b6946f68f6e4b6f534ec98b69690ad38 SHA512 3a54c278f486cbc92a7e262f39183c7babca8ab6d04c5f85ff875d3b2bcdd699631049be375fde2a3ba2746bd5ea04ba0149616e245556257c470632b91b4b1c WHIRLPOOL eac55ac70ac986772b4cbd1b76940b41eaca20276ac68e59ccfb5a09eb41de7c023d78dc85392ebfb9e5d36ee7f29e31e0173aeca0b89a510e7c89c087b72f1f
 EBUILD nvidia-cuda-toolkit-4.2.9-r2.ebuild 3090 SHA256 006e5c4b30dac6cd6bda3f5351eaacfa291364a1fb5b851911585cf0429797f4 SHA512 32f0351223dd70adb1c91afca668ae593c664deb57627c21f235f0f196ccb089df03342ca58d3e87a1ac296131647a5504dc8d9cb00237da03b72412bb643c04 WHIRLPOOL 19642196e47993b3aea1ae21784a55dd90238e3c6ee56c1562e6d3782b46e21094ba281e116c4b8aa34473c3f894ecc688e57adc010d4047c3de19c0d50b80b5
 EBUILD nvidia-cuda-toolkit-5.0.35-r2.ebuild 3138 SHA256 1580a9d6d440fbad0eefc2f9f426199449d368acb912abde824a01f458755ea7 SHA512 df23cb5c03919405693dc4ea4baf182e55337682bb9e1a9074bf19319276916b1b491a96995fb0a6a9695e23d449af2259e4f823851860c413aaedf477f0811d WHIRLPOOL d49590cfdca81aa7c721b02d40cd604466801c1d0b5846065598b943084732dbd9a7eb7917a031d1c1b15ee910864f06bea355664484d172e96fb54da093e3cf
-MISC ChangeLog 12905 SHA256 101f56a1006a7ab836a1c8c8fc991e10f8e83565a293d6de5bd0fbfdeb0f6475 SHA512 afd18740c65a60dba6ff010e5a301e6c9c81859f4947ce71b4ed7464ce9770f77e57ad1846bae100676c2089632366a3865a66071714da4d23d8e9cc6456b40b WHIRLPOOL 06a7c5a67394fd8440fa82bd71fb4dd95d8aa862de5cd191059d137d37b3b1d286ed6f126c513b6a510b7073e33ae9f97dc17815053e1e1c25ddd611e338faed
+EBUILD nvidia-cuda-toolkit-5.0.35-r3.ebuild 3343 SHA256 09150e0cf214d2f0269d8fc60b33b6dcf8c41378571838ea7d20e052282de757 SHA512 4591460d92711a11816db551d135c308059d3d0f76dffa7664a6b3210ca8b4964414fb940a911353d637742e1a05b05c5eeae370ed2dd9164c06402b4525723f WHIRLPOOL fea044f24cd5a1b4aa0448569a5032b2856e3bdd53efe421f0c53add9aa6408bcfdf75a6a3fe062ea4fd372192c022f94fcf971b1c97f21ccda102c7fd912373
+MISC ChangeLog 13096 SHA256 c1f40e8395f477f7bc7be3985eb244914b49384cbe8a0dee4d7db25b407e2244 SHA512 bdf97cdb4d2bc6e85acd1d619f6469076c7f02c2a3210b74a21918a99a97c161e2551ad6a24296f3298205bbbac4908893597922652d42be2cb6251cefce298d WHIRLPOOL 71351985ff15a0377b7ebe079dddce7b01f2f8f1c50b60df37f44605cbf0709d523d79466fb41f5fd265de1bbc240c0e0f7d0fca39cd3469fadecaf861bb91a7
 MISC metadata.xml 610 SHA256 c0a091e69e21c8e98fdb7d7f75999802db0d70f3dd0741eca44fe6977c220afc SHA512 43dc3fd9c330271d551b31fabbbc68acfda31483ac6d80647d2b6bd4bdd3376753a93dd9ee55eef857e6d87aaf0aa970388c91a42a1e6f39484ac51662f1c836 WHIRLPOOL 0ed10da6c4097c61fb92de71ff930c463b4dc1d2022f3be3b1fb982227e126b10f7c932692387bc9fb26c75ba45b537c31d771294bee87f600afb710ca0e5a48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlEaXhwACgkQgAnW8HDreRba2wCfaGAcca8VoNJexANogt3J2b31
-D+UAnjLeA61GG2nqLkv3NpOrdmbqql9B
-=sBm+
+iEYEAREKAAYFAlEcDYUACgkQgAnW8HDreRaAlwCZAVBuEGGyD/NGmBOXNz1H7Vxp
+r2kAni45UNOikhTPoMLvdQRdMCE+2rYQ
+=sjw0
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r3.ebuild
new file mode 100644
index 000000000000..551081bb9de5
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r3.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2013 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-5.0.35-r3.ebuild,v 1.1 2013/02/13 22:02:07 jlec Exp $
+
+EAPI=5
+
+inherit cuda unpacker versionator
+
+MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
+DISTRO=fedora16-1
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel-update-1/installers/"
+SRC_URI="
+	amd64? ( ${CURI}/cuda_${PV}_linux_64_${DISTRO}.run )
+	x86? ( ${CURI}/cuda_${PV}_linux_32_${DISTRO}.run )"
+
+SLOT="0"
+LICENSE="NVIDIA"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	sys-devel/gcc:4.6[cxx]
+	!<=x11-drivers/nvidia-drivers-270.41
+	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/*"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	:
+}
+
+src_unpack() {
+	unpacker
+	unpacker run_files/cudatoolkit*run
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.6"
+
+	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
+
+	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:${ecudadir}/libnvvp
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
+	EOF
+	doenvd "${T}"/99cuda
+
+	make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
+
+	dobin "${T}"/cuda-config
+}
+
+pkg_postinst() {
+	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
+}