Create convinience symlink lib32 -> lib

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

3 files changed, 183 insertions, 17 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index eea137497e90..4f0b9daa1617 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.101 2015/02/15 06:50:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.102 2015/02/19 07:22:26 jlec Exp $
+
+*nvidia-cuda-toolkit-6.5.19-r1 (19 Feb 2015)
+
+  19 Feb 2015; Justin Lecher <jlec@gentoo.org>
+  +nvidia-cuda-toolkit-6.5.19-r1.ebuild:
+  Create convinience symlink lib32 -> lib
 
   15 Feb 2015; Mike Frysinger <vapier@gentoo.org>
   nvidia-cuda-toolkit-5.5.22.ebuild:
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 6ba206a2ad09..bcd2e9e5a915 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: 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
@@ -10,23 +10,26 @@ DIST cuda_6.5.19_linux_32.run 81882112 SHA256 9f767f38b84f52c097bec81669f99e4a6c
 DIST cuda_6.5.19_linux_64.run 982446238 SHA256 5279bc159b72b7445d8aae5f289d24bb4042c35422ef32da68049d8f666d3ff5 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797 WHIRLPOOL 6ae8e53719e12997de60ec3688167f3fe33b1145d01217182e39ac386c25b358c8ba6cee45ad6c80e33ef66fd9a511338dce4589f10a31635b8437b6e528fd7a
 EBUILD nvidia-cuda-toolkit-5.5.22.ebuild 3541 SHA256 db53c8b6b0f2a272df8b96edc3dbe47e98316381675dfe6632f15843c435f58e SHA512 693bb16101f8d928bd17e8ea46aa85503cb906140b1f14492205a377534653388dfbd901b26c7e88641c10976dc98fbca674679be5315766989f7bd663b006cd WHIRLPOOL fe9a76280ce28464e24c951b28bfd9162817c1a795f5cad1017865ec107bd60c662202db54fc104cc94a0afc799ac83a0f92e142a28ddca41bbb391014178a34
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3935 SHA256 14d4639cdfd1b82dcd68b8692bc256ac6f46293f3180aacc8ba9fd9ea24d7199 SHA512 a414d5ad7a3f10b1d53807d208f4fc37116e1a1aa21604cb34b8a9641b9948d4f913d9d1d8df1b8cf0c09b2cbcccce00dd215ac71c86ee7a537bc888f5ddd556 WHIRLPOOL f768354e91b9d9b86aa6e9adbfd12a692644424cd4341e90d4df668429f9ebc709f620915e60ebfd44364ab3b83b5888b31213a241e3074b4c1e9762c5f32fa7
+EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3966 SHA256 64855e90ab169ae479e6119a91cb45d33c1bb4d57d10c8a61323c85eedf6ceb8 SHA512 779b0bd9a9921dede1abe0a88775ae968b0f992d2787fad18e83b633d0e0876c886856a860d931fd0da85246dbb67e88f0618159600d55fd83bff1d7e397e3e0 WHIRLPOOL c1339e3038ad2286dce613255ee1d354342471944b38fbd790c2926665c660404bf14da5f9cf30d39f88863a7ccc79438ba92fc5e7395f3a9e7f080887f3801d
 EBUILD nvidia-cuda-toolkit-6.5.19.ebuild 3937 SHA256 16538f09a5d260c893f5d4fa47f0a7fe1bfa4f558163079fb8584d24e9f89bc4 SHA512 ffb14cfc554f417f4180f28cd7894acffd815bdf250399bd53a49c1fc1173d8b736363359f25e9eed3b16776ec1c19129f78d4fbe003e41607d73553383a911b WHIRLPOOL 3422b3ef5512c3eab3a20180da51f096b70a4770a5139e94d75e4307e5b649c28df8293e2c5de0d9b3b84ca2325dd934eda9bb1676d7771e1412d7fecde6a880
-MISC ChangeLog 1732 SHA256 de375e151556f0d5f94ecf74f020bf70522b9054522c0022f6fbccf609795c15 SHA512 b6004b812455b602503ae4be20ab50563ccbdaf0524c48b0683455a88b38db724edbbf4e7cbc725d97f823fe1a5cd29e5ebbf16e27564318f00f5ba746960366 WHIRLPOOL 9c3cbbd91266b630f15735672c72d754439376ee78052adea66ee2d6ccb577233b7afd72c5eb155c769cdd814645cc5452159ba7defd1d106db746b4c793899d
+MISC ChangeLog 1907 SHA256 d3e697f05c0d9b4ab7299086ad4b824259c69a625e3891d25dfd3c23b9cbfb10 SHA512 7b17d0ed9a6658c2d4b9c74ae20dcebbf26991f1a0880878955db74ad32374c713c59f732975a9ee2dc027b3d0de80209e01b5e4c19daf1866209e9c4e56ab30 WHIRLPOOL e2479c1bce649d34fbe1d08b839afa7f76d76c230c5b631934f7b3000f9ff6f7c34eeae35ee469220100dd9b25e7f6200a9953d87ca38996c5f2cdde2514869d
 MISC metadata.xml 506 SHA256 16d98da28f74ec82ae271f04e456547db8da2a9c576bf262ad897f4a3259fb56 SHA512 c1be2bc00a75ee9db0339938964d80214648df5a6cc16f3d1250f80d3142a1e511750dba34b54794227457db0d1a0f5ca4f692f34b9566ac3f58fef43196626e WHIRLPOOL 02f0c08cb4ab40b543e23c51ae81a7f04e452f3949808bd29a2790c565c2739d131d4d19fc3d4d279381a5ed05ad0623ba560aba82f7a3b510e44f8cf35c6473
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU4EG+AAoJEPGu1DbS6WIArkEP/RsJ2DNJV3c1Cqk2Y11kA3Ot
-ZoP+FcJ1GM6FOrLV4tY/4x225MTLTLsiiAYsegqfDLRbqXC/ZOKqOfTXq9bn4FkP
-A0xS51To5AeAtBTksthJ94WDtQ8sYj2/We/Kz9H2I6Ak5pdbSIhuZlMQUUOC4mq1
-eQO6/pZCvjxpQDCdugn9nhtA72PnyqyPHPKYtTtGXDmxDpv2v5b5bXhrgmLIOSeP
-mKKU0NaDcVDL4rqWO91beel9jbtCrFBUdl/OZuTPPfwN0IW5hRjpKZeGGNSBoZ6o
-yM8uwMcUzu0p22/ebPZjqzAbAJpCG982kr3+SWI0m086oBUDbF6iahDkPFBx9PCX
-5G9P6Cabqs5bzqlD/4ORRpJMOLPf3N1hfO4l6k1XnR9WHllGDTMtvvdnQLO0Qlu8
-CXTOdf/DTZ/pLDQGcDwKQAFt7HCIVoiLFZXF5p3yFeG+PDqV9/hjdAs6j8jFX349
-vPK5V0hhnmQ3z0z6aSP/vmgnr+tpfDZEfVCEj+GzZp+Nvt2b4udlHXerIRjtXCIL
-apLj1sFB/m74eZ/0kOeZiCoY+9+yENyJegyFc5evWzaxfRb3QmomSIBWUYqOU5hg
-yD+nv91kBzlyYe8qQDMN2FAO1v6TkcWKATFtjIX7jGFZHNrv+Bax7J2QfumtRSmR
-1bZ0/2Bf9iDEH0gLTjQ2
-=Dt4y
+iQJ8BAEBCgBmBQJU5Y80XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirHokQAJfkxBwb4eVRGkZeBHuFby6z
+uxh3z5N1K8M93g+xUYSBx4pVeG3/VUUTbdnl/C7cnRf+dJRwGpNe7rXcnzTBL52P
+6C9DmPTNQljCBoGqNhyfbTtPM5DqSMa1jVuwTfmQTI3j8lp254ohALjgC/d75Ac2
+8TLl/t3/9RdvojhSH+4wpD9zzNBiQ7FYvSYgm89Vq5dkuVbpjFBocPiMORhtiv4t
+twpyFLMQtJa9ewWH8DpdaPhNtzzqhwSUmSofGyJb6JftqmEytZDPfsG5LAne4EV2
+da/9Kl28ZIhuly6Ff471sr6uVSAbJ3xqzm8OEZkOYK8tvSdg65bfrUdbmDk8MFBg
+h6sqdl86paZ45vEbW/Wj3g6jxPH3ss1yUgqHvw4W+eNDQKjDuMl2dCXXoBTM6gxq
++/5eHVo51sZ1mzPxuFumZiXIDz+KXe/Dj4XoucjN5Y9x/SqVWhDdsOiU35xbCYCM
+WNOI6wdlPeR258yJmmoSsCVwg56U7CpQBs85jrBpopm7cWG4yevu2BWODhFq8aH7
+JX6jetC/59pFerhSWcDXWxLvloPee51R5omY7rnqhLlTJZ/ADvHGTKhU3oHPpKzy
+JRzmLTa6bJYlEUItV1PgHsDem1noRlGhDuhQBG/zq48TQhBFXdDgTI6ot8CIkc9A
+wlWJK7gVQuEhbl8j5xoN
+=TVwu
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
new file mode 100644
index 000000000000..04ee379ddca5
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
@@ -0,0 +1,157 @@
+# 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-6.5.19-r1.ebuild,v 1.1 2015/02/19 07:22:26 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-343.22[uvm]
+	debugger? (
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses[tinfo]
+		)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )
+	x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
+	"
+
+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
+
+	if use x86; then
+		ewarn "Starting with version 6.5 NVIDIA dropped more and more"
+		ewarn "the support for 32bit linux."
+		ewarn "Be aware that bugfixes and new features may not be available."
+		ewarn "http://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf"
+	fi
+}
+
+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
+
+	if use amd64; then
+		mv doc/man/man3/{,cuda-}deprecated.3 || die
+		doman doc/man/man*/*
+	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
+
+	ln -sf lib lib32 || die
+
+	dodir ${cudadir}
+	mv * "${ED}"${cudadir} || die
+
+	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
+}