dev-util/nvidia-cuda-toolkit: Readd old version on user request

Package-Manager: portage-2.2.15/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 169 insertions, 16 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index fa7a486705b5..ab16507da643 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.99 2015/01/26 07:10:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.100 2015/02/08 09:53:32 jlec Exp $
+
+*nvidia-cuda-toolkit-5.5.22 (08 Feb 2015)
+
+  08 Feb 2015; Justin Lecher <jlec@gentoo.org>
+  +nvidia-cuda-toolkit-5.5.22.ebuild:
+  Readd old version on user request
 
   26 Jan 2015; Justin Lecher <jlec@gentoo.org>
   nvidia-cuda-toolkit-6.5.14.ebuild, nvidia-cuda-toolkit-6.5.19.ebuild:
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 305184dfff00..1b8a92c0e769 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -2,30 +2,33 @@
 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
 DIST cuda_6.5.14_linux_32.run 76788277 SHA256 63fa1fe5d013e9944d6c1a3a71768fa4dcb35d6a157c1b06765bb56198c205c5 SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc WHIRLPOOL c1094dd84883ef08d91c6eec3634a285496418db1e76b70f449f833dcb01069a620af504b6df7fe2752559688ed1f60f4adda8c97d849d648cba1be0f8196954
 DIST cuda_6.5.14_linux_64.run 972320904 SHA256 f3e527f34f317314fe8fcd8c85f10560729069298c0f73105ba89225db69da48 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e WHIRLPOOL 0b890771dcca352168fed1b1df9b29504b03f8c29da59cec29914c541283998edf65f5ca6a41362143a2d5d7359822b036894f563c56b39583b1ac4c64e35180
 DIST cuda_6.5.19_linux_32.run 81882112 SHA256 9f767f38b84f52c097bec81669f99e4a6c4c9c09b5da1bc09fe49e0f804bc7a6 SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e WHIRLPOOL ac94b4e7f29811b4240623fb69b3c54214e7f0c60a286d899944dbab9da7fd3c122760199a3357667e33879bd48fbf352d5d39029acca6021e7caf21785557ed
 DIST cuda_6.5.19_linux_64.run 982446238 SHA256 5279bc159b72b7445d8aae5f289d24bb4042c35422ef32da68049d8f666d3ff5 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797 WHIRLPOOL 6ae8e53719e12997de60ec3688167f3fe33b1145d01217182e39ac386c25b358c8ba6cee45ad6c80e33ef66fd9a511338dce4589f10a31635b8437b6e528fd7a
+EBUILD nvidia-cuda-toolkit-5.5.22.ebuild 3537 SHA256 ade9b0c70f83a7257a38c7d69e5caa254a5912905ad563a42edacb238bbd31ad SHA512 698c4af8e310cd2d6207b642aefaa1ef9f424903cb24eee09224df44a3e7994f9bb3cf19eaf70631a7408a4742543ab8425604db9a08ccf3875b3608bdd7d119 WHIRLPOOL fab7b5cee48d86e1678c56f84938ef5fc082a51a5ec1cb83be90f35a588748e9fed3c012e694e66d371c388ffdf1379010133351a3bb9288058be04ef7d1aeaa
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3935 SHA256 14d4639cdfd1b82dcd68b8692bc256ac6f46293f3180aacc8ba9fd9ea24d7199 SHA512 a414d5ad7a3f10b1d53807d208f4fc37116e1a1aa21604cb34b8a9641b9948d4f913d9d1d8df1b8cf0c09b2cbcccce00dd215ac71c86ee7a537bc888f5ddd556 WHIRLPOOL f768354e91b9d9b86aa6e9adbfd12a692644424cd4341e90d4df668429f9ebc709f620915e60ebfd44364ab3b83b5888b31213a241e3074b4c1e9762c5f32fa7
 EBUILD nvidia-cuda-toolkit-6.5.19.ebuild 3937 SHA256 16538f09a5d260c893f5d4fa47f0a7fe1bfa4f558163079fb8584d24e9f89bc4 SHA512 ffb14cfc554f417f4180f28cd7894acffd815bdf250399bd53a49c1fc1173d8b736363359f25e9eed3b16776ec1c19129f78d4fbe003e41607d73553383a911b WHIRLPOOL 3422b3ef5512c3eab3a20180da51f096b70a4770a5139e94d75e4307e5b649c28df8293e2c5de0d9b3b84ca2325dd934eda9bb1676d7771e1412d7fecde6a880
-MISC ChangeLog 1399 SHA256 beb4a63e0f777d55a89e158fe3f6915b3d06a2298e58ccae4d3e30f248b74d4b SHA512 1a2f3dc99e974b0237b7e368b119a2faff59325103d1f5250d7649df226ff68fcd3ee7531597a9bbb2a42e2d0383e9588a5b81c557ba1c151ca09366344d9acd WHIRLPOOL b500ff59c8f229c2f75683abd8eb2b91267f6b17a9875c9bdbd5fbce8497b2b5b090fa453ca36b6b101a2d755520b9163a976beddffe8639d227bc7afa35103b
+MISC ChangeLog 1565 SHA256 aa387ffcc08d8557fcf5740fb300976b94947ac0d9d890470c3123df24247bb3 SHA512 99e738ad13683cc5eaf469b1d8233b3c09fb1d01df83e9f9463f202bd5b2a8514e74fb421067a4677beb25c9f55dfaf1f6ebba134d025fd97b56e4c2250441d2 WHIRLPOOL 668a21d91b655a7b1d0d466e8c48a9c59e66741cdc1684ad77f2ae643ddad46c2d87660d84b0e7e66f5c38ce428ff8dc8ddcde20025231afe2bff873cb2a1fcc
 MISC metadata.xml 506 SHA256 16d98da28f74ec82ae271f04e456547db8da2a9c576bf262ad897f4a3259fb56 SHA512 c1be2bc00a75ee9db0339938964d80214648df5a6cc16f3d1250f80d3142a1e511750dba34b54794227457db0d1a0f5ca4f692f34b9566ac3f58fef43196626e WHIRLPOOL 02f0c08cb4ab40b543e23c51ae81a7f04e452f3949808bd29a2790c565c2739d131d4d19fc3d4d279381a5ed05ad0623ba560aba82f7a3b510e44f8cf35c6473
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUxehfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU1zMzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirR+cP/jiJchjmdoxuMjMglookJsZ8
-qLhDZ/oAZ5ypns0E38lHu+DWiyUiu39fejrdrQ3u9DME25n8PnQg/PL/b24/GUCt
-gq4IhL0wtcXePELGiLLgaZLH/M2Gjq/tjMN5yeemjrYPWBJgi1F+Z0PcvnqU+EOI
-DHFK5TEP+W5+nOaSNgqE3jsacr6gNqV39L99wHt8bnQIiMb05epGHhIt/j83dnWp
-CWj4svY9IEiDmPwwjbs48OVdsKrjWgmrHDU5hcYxG+BNmUANFXOOjLEK7J1YPGpC
-6cIJs1dfK7YI0hTgndHiVj0Hxw9a9vT3UiwhXR69r2GM6f+ur2pG4Ypaa6TdQd+d
-g1hivp6ChRWKWZeE5xTtVczS3AskBN1kgb9RK8VaZ/B3AVo4XEZZKsz8wI++mSde
-aSuhtbHyyKDghZaaIhqONtUFMMfwSM3on+0/0A1Nb0TWUwaP8LX+HbnACXnlTQmH
-rGI2mSnIGjhYGjGm3E+FyRKnbn0j6MAPV9RuJ+btYJVwCLvDXxw8sTfJyRH3v721
-Vg4o8qYL1VZ1EL2gGt/E+Li5st8QibjsP+eBpELK33A2kasbARCS5L4c2i476NSe
-wHCamZQCheqHLNePBrQRQA3FYCF3Nd5/swTfqYwZ5s7889EkSS+9DtljBfdu3AZ5
-jSswEgziGZIcQ9+cZ76g
-=dgfL
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirNu8P/1QwDulQnQZHGLovoo5CxcFd
+5kQ3WcJMUml3h7KGsyCJqij4GgjhkIlUkOjoN4fBCax5muQGDoWHV+L7qk885Uwx
+tvMtutieDA3ePKn1b8ig/hjgrWo4zrtMJCODAgJ7JhOIt8zDTcbAGFETSF065UYn
+BQI+Qw/GsNykGjnmIaa4MLh0YEmg8u+jTxGdbNJZU2+N0yiFxZA1TYDEmukes7Fk
+5BQojVdcLfUFT9lt1+ExXfjmz6JOc+JMsYL8Zilq9ed5sstgZHQYxYVis4hJTrYA
+fmWaZBuPHbUkNgTVkIBagOwAjfahg5ZoPFxCa0l4ng9xZPAA9DQJhVhQOG5ev5sb
+6OyBR07qAL0W1xj8IdVy3LLp+yS6gB1dzZqeJZS3XgoCh8+TOF++LBrSpbe1Zvf4
+RP2Lu3dlyNOrs2Ub/AgoMng50jkvoXk9wUmrsXWgWcLfiZyOc6rRD+05sbA6ssch
+PbpkAWuiCVsBvBF4ZlFuDtd5roYiDBFG8R603tp8XY1em3FpSN5a2jJLpdoTAEv4
+tbBbBDKkAOdVcsP+cvGiulz095E5FyWNnCdXq/E0yUnYcBQO5kbKklRqXgYL8k/7
+aXxaVCA3Z3iOylGlucJAhpbNLjbMP/4KYUdPyuWE/gtPqE2nUfsmjkTiAOWpZViQ
+C1lXtXLqTiqhpCwzchNB
+=WL1C
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
new file mode 100644
index 000000000000..4d0f2ce6626b
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2015 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.5.22.ebuild,v 1.12 2015/02/08 09:53:32 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.7[cxx]
+	!<=x11-drivers/nvidia-drivers-270.41
+	|| (
+		>=x11-drivers/nvidia-drivers-331[uvm]
+		<x11-drivers/nvidia-drivers-331
+	)
+	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
+
+	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
+}