dev-util/nvidia-cuda-toolkit: Raise gcc version requirement, #513218

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

4 files changed, 155 insertions, 27 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 00bec1005d43..a2e69cd26fa5 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.83 2014/04/30 14:37:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.84 2014/06/15 07:34:01 jlec Exp $
+
+*nvidia-cuda-toolkit-6.0.37-r2 (15 Jun 2014)
+
+  15 Jun 2014; Justin Lecher <jlec@gentoo.org>
+  nvidia-cuda-toolkit-6.0.37-r1.ebuild, +nvidia-cuda-toolkit-6.0.37-r2.ebuild:
+  Raise gcc version requirement, #513218
 
 *nvidia-cuda-toolkit-6.0.37-r1 (30 Apr 2014)
 
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index cd1ba82e4cab..bb23b5588470 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX cuda-config.in 406 SHA256 7271463891ff75dd83f4cb42bb3004d3204243d0e38f9cbd5b4ec4560865496a SHA512 df6d16bd2e800868bdf8401b6f82a387b701ea297ddf6e8feb0daf5222e62a33f156e5f45cf1ee4e1aa51559dfbd56b897c257dae1bb9568e839bf806bfebd5b WHIRLPOOL 4a26ee11d97676827cb01644891fdca495c3373585ddfbb5fab9f988186da384f27482c4be9e27d834036ffa87f7ee19f9ad7da2d8536babe874dda4ff991147
 DIST cuda_5.5.22_linux_32.run 686412076 SHA256 0e7aad303807bb0ede8f6f6e825cfcd0f9ddb677bc8cc898ec38990b8226778d SHA512 e2e4fbc78c2e6373b3f81778d8044b299429459e8e27632e86c0d97e6fe7f4db7cd5652044beb0ce7ee3c7abaa7dcec7d85639a2de4b9cc213ab52a2d204aa6b WHIRLPOOL e5df7de03aaec8488a7fa093e272d64b5d3adaedca1458c550d4ae9c6bf2a0ead71496c8a0c9aac966500aa01401e95cc57a951e3a2554e8d823b97c10336850
 DIST cuda_5.5.22_linux_64.run 849417929 SHA256 b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4 SHA512 25233b34a35fdb5ee3479a87c89484a00dcd760837436c263c3eb8731cbd24a9ed3fb57ce2d4e5bf7cd31abb9b0d990b45720a5f6a376b2488de4506a7c57c20 WHIRLPOOL 550594121a53feae4e74a4dc9ba40c4cd2ac91305f23397cd7ea421fcb801e3ce8fcf90f439c966accca44d586bc51d85ef3e211f35fd751dc9299dd07d65175
@@ -10,26 +7,8 @@ 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 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-r1.ebuild 3533 SHA256 550d7d52a791e2e3926172bcd64fc6511a0134d1c4dad416f6d5358e40a6425b SHA512 ba3bb97a19553a702f2d73ef72d387d7e4365828c6dfcdcb26eeb53348cec1ef8da8dd2bd78b1d4bfff1fe2388503a56326be716a7e1cc62f1ff2cfa607f068f WHIRLPOOL 6e13b0b468a450be96c14fbee4a02b1caa35277fed38c020613cc95cb9735344d6e2e1b7d25440b197c731ff4b270c9c88c297ff20f734b5d6e79cc7407c93f4
+EBUILD nvidia-cuda-toolkit-6.0.37-r1.ebuild 3533 SHA256 c8f2125a5825f525c30d7bed7e332fac36c224342b8a7a86438ec32c97809383 SHA512 676a103ddfaa167307b10cc1e01b26fd03c23ce7a3198006de3f9d0009ebea396285cd4e1ed8598b4d2f1c0fbc020b206f736b0bb644e0523f195a02f2403f22 WHIRLPOOL 96b0905039d421f7e37c09a516ab13a02118057f3d86ab746675a0241247779e68a87144f3ef8e454257d4894fc6d0756df06e47d0cbff89100e9911c29e38cf
+EBUILD nvidia-cuda-toolkit-6.0.37-r2.ebuild 3533 SHA256 cbe66e8a7081f3105481a193240e647945206b96aacb53dfd639f89434a897ff SHA512 0c2fbebd3f165ae60b5f7449859159305831ae38d4cbf501645641291d39b2f2b58a10a1d508ad0c83e8d12aefefb5ade92d22a91f3c840918fe6e5953a5ad44 WHIRLPOOL 1e3a942c85feee377b891b2515984b9dc324b92e349ffc713324304a6b8c05e95fd0aecf1ffa9f7ed431382d68209a25d58ba4151b41978d48ea1a304f4e9f96
 EBUILD nvidia-cuda-toolkit-6.0.37.ebuild 3485 SHA256 74318877133e9190c5ff9198f1a0123b058f68174de801ec8bbee64bdfffd029 SHA512 1b9155af584dfb598539078c87a4a66a60031d1a7df5216e0327cb170341f7e81555b3e88c8d1c14372bc483cf4bdff9008dc787b1bf226f5756cb70e6015033 WHIRLPOOL ade9280137c0dd1de6a997f09ed71052f23855f7c395efd4a48c0787fc56612b07cd1c0b4d175053fe4486816f8069d6d10683ac9d33d652f987aba5aeabd185
-MISC ChangeLog 15895 SHA256 3506db761c70ed3d1bf93c4b642b547259a8eac1c052dd4882ae9776db88d3c9 SHA512 53a638555297188cb913a484525bcf8f969fdc142cf6d46a8bd40ab63c7845757ca9ad50754ae4d5395714ec6882263e22f7486764f9848353bbee145da04074 WHIRLPOOL 16049bec6c5a05c602d0325ff2a92a86880dfc01b88360ac610281b38db004d48c480805099e424841c720eb405afc0c6bb5f942d799c61e84bf41ffb66c128e
+MISC ChangeLog 16109 SHA256 91ffade7e901dff01813aaa165d94a8432a3741087575f08a5bfbdecfa488337 SHA512 5fa8946400aed2817f3b9ec09723d6a4fe4aec80f55fcc6dafd13272bec21dd27522d263a18337d4b35fe5134c99ab3011e3c1d5b17e82bfc241a590e9d3d5d7 WHIRLPOOL a170f4e5b0110d18d369c32bd745900cb549ef173d063e765a75425162691dac90681413c23ab869e6f31152496f068e447722b0fdd32b303c779e47ea3150f4
 MISC metadata.xml 506 SHA256 16d98da28f74ec82ae271f04e456547db8da2a9c576bf262ad897f4a3259fb56 SHA512 c1be2bc00a75ee9db0339938964d80214648df5a6cc16f3d1250f80d3142a1e511750dba34b54794227457db0d1a0f5ca4f692f34b9566ac3f58fef43196626e WHIRLPOOL 02f0c08cb4ab40b543e23c51ae81a7f04e452f3949808bd29a2790c565c2739d131d4d19fc3d4d279381a5ed05ad0623ba560aba82f7a3b510e44f8cf35c6473
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQJ8BAEBCgBmBQJTYQrBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirdr4P+wcHrSWVO+CNwSHU2mqJBTUz
-ljiiB/i1C/y+OFj2Zfeoj5E8afczkxhL0lhWBrP/WEC7cS0TsG6GtBSSCTqIgdJb
-hiGVB9IJopuOc6qyp0tHLXpB5Yl+yyNV1ga2MCZO9atvnoYoRTqzRZNKIdwI5C+N
-AxcNbY+mB7ueWXHzxqYKurE7v11WtkqfsA94oDuyLD/+qdjvbZc7u9B5dE2mO/jo
-HYlxWmCkYZGV2Zt1JrRdq7ln9ZmJzSe71lctLD9/b/WAkUl78D71wKenRvoziOo8
-eVOdRkEoRRLBsOn/+ly3BlXVWL3mBsI3tFK9HbLDRQrn+GWd8m79GkA3GVLXS900
-4zP6A/0n4JLmPh5Ep6CuJArQ9ckRVcsWCeQhJM+KXBlicpm5D0V2JlW2UzpBURnz
-CeqPeELVU71rCcJbu8HQRfQexAQUMuP0kJ1pMBmmzaO8+kYkFYIC76Mvu/mdRT3H
-DWz90jc19ujwD8gNzRrzz/CoeUpcUzlwM04iH0OjasH3NKMzoopYx6Q43dv+IBmW
-eDOgf5b0kqp4ROT50HgiRgBHUTMQXvQn6VMkdlzzO0YghRfjGlLroCVBptGBbYgZ
-R2eGR1sz051NOy3dMr33doGhdtheNX8+RyMUdGZiO2UBWXKtpsv27phHb34vJFJc
-vGsbmCJtDbrpg3qxPE7O
-=JcoA
------END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r1.ebuild
index 0bdfaab885f2..727091d7c86f 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2014/04/30 14:37:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r1.ebuild,v 1.2 2014/06/15 07:34:01 jlec Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ IUSE="debugger doc eclipse profiler"
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	sys-devel/gcc:4.7[cxx]
+	sys-devel/gcc:4.8[cxx]
 	>=x11-drivers/nvidia-drivers-334.16-r7[uvm]
 	debugger? (
 		sys-libs/libtermcap-compat
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r2.ebuild
new file mode 100644
index 000000000000..116a8c234130
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.0.37-r2.ebuild
@@ -0,0 +1,143 @@
+# 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-r2.ebuild,v 1.1 2014/06/15 07:34:01 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.8[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.7"
+
+	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:${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_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
+}