dev-util/nvidia-cuda-toolkit: Correct postinst msg logic; fine grade deletion of files

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

4 files changed, 266 insertions, 6 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 2a9dd0001145..7a44dc834cd7 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,13 @@
 # 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.60 2013/01/17 12:01:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.61 2013/01/22 17:57:40 jlec Exp $
+
+*nvidia-cuda-toolkit-5.0.35-r2 (22 Jan 2013)
+*nvidia-cuda-toolkit-4.2.9-r2 (22 Jan 2013)
+
+  22 Jan 2013; Justin Lecher <jlec@gentoo.org>
+  +nvidia-cuda-toolkit-4.2.9-r2.ebuild, +nvidia-cuda-toolkit-5.0.35-r2.ebuild:
+  Correct postinst msg logic; fine grade deletion of files
 
   17 Jan 2013; Justin Lecher <jlec@gentoo.org>
   nvidia-cuda-toolkit-5.0.35.ebuild, nvidia-cuda-toolkit-5.0.35-r1.ebuild:
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index c3221b83fe7c..b32224a52c46 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.0.35_linux_32_fedora16-1.run 583244929 SHA256 11927b4c0fb23dbf98457b852914b8458ef41cc1b7ea67bce892f2cc6a77d34e SHA512 d1cda0d53fdc86ac6412c5c92a16efd761d3f15f08878e1aa1c17bdf3bad824a0cebb5c211ad89b8dd15a439eddd0f93efe82ed0850dc93adcd3dab529f6daca WHIRLPOOL 11bc905a4a63171009569d6655b40f0d49034f71c0a93a83e1b656e91a4250c813e0a16fdfda87e9fbe4d250a312beb0c9ad073bfb0420fb4e06fdd26faf3cc9
@@ -13,15 +13,17 @@ DIST cudatoolkit_4.2.9_linux_64_ubuntu11.04.run 282394341 SHA256 22d857db6b38316
 EBUILD nvidia-cuda-toolkit-4.0.ebuild 3413 SHA256 228640e8c1c99d8635ad6bbbcfb065b980dfe86d70b6a45098c733ab9c6d5dcd SHA512 8db03738b5c9cdbbcc87ecfdb55449fed7dc38c0abb088240d3120962fb5ec5d135a390d9ca94f59caefd22b213a358c4dad5d6c20767a2e61e969fbad390247 WHIRLPOOL 2cc220883514821836248f3233ea8eb14b14d6f1b5ba879bdf5f49d1064f4a187c3cbec846ba6f8b5064b7c27fda027cfc5ace63b5738528359aa1b06e6b4d4a
 EBUILD nvidia-cuda-toolkit-4.1.ebuild 2742 SHA256 7a7b5fec5729fe3e8c4e163f4f96de9e353c354a3731b5a58a0a9aa1ba88205b SHA512 8cb55df5d86f96aade1e2e9e36005b522438b4c369d0313726915e77fae89ae2d45bbb307b8079fe665f904633b4727235d8587a5610339398561b4f6594409c WHIRLPOOL 1a2902a369aad84ff52ee0cb86b352b6390d414795ef62cdfc268f92a31546b6443a988874237017802f7c8bcc41ec6351c53e450c15d3a47ad70d50aef3f704
 EBUILD nvidia-cuda-toolkit-4.2.9-r1.ebuild 2749 SHA256 dedb493fb62798d8b0e387d3847a982464410f6fc9169d85af4c0a91418c9060 SHA512 7b16002e7872d6b66585fdcce1cfe00c39b5e9fb8c60a13cd88e0924c254dc8a1ccb2d9bb5bad316c5a2c5cce712475de8f571b9fc987b0b524af52ec8cb4102 WHIRLPOOL 31be7ae7440b8766513379c699244e2f30e8c5bad52785bd19035df3e7046bf35bab11a9cd7ad1ac25062591af138af16d07e766ca3d1f53fcbc74a40cd782c5
+EBUILD nvidia-cuda-toolkit-4.2.9-r2.ebuild 3090 SHA256 675687951c4b6e6ef079c9865f0cad2c17caa6bc8dc5fd798c78faf3a2459228 SHA512 b2bc093982d1db4b14672cfebd04bcdba3e6b6bf5d91b700c902b07d68760aad71e4e1c3da3f046d49d4cf85e08c85ea8fd9adc855ef3a1725f6c2d19721a8db WHIRLPOOL 1ba7d2fd00fc753d78d307dd37515d341311157c37f8d60a7318b2a4b34e777a4eef2fc0af7db023c2126bbe74433bd3dda28a106fc8b4249910a2eb727de131
 EBUILD nvidia-cuda-toolkit-4.2.ebuild 2707 SHA256 1fe43633a2c00718a50e1e182d2d99fa45c3c8bebbba20c66ab327d56ccf7afe SHA512 293905497d5e78212a958de38225a2dfe78599d469a6ed6376fb6c99ce8aeb7edaf00ae37e830f92751a13b981ee04f886271450e6f4548ad436e27ccb8e81a5 WHIRLPOOL 4616ffdeaca7595f685ad18fee272e440133e6a26fffcd3847d6b21e57fcebca8585bf4dc31f1b2ab4d3fdca5c5e5847062a201cf87f361ef587413e9733e255
 EBUILD nvidia-cuda-toolkit-5.0.35-r1.ebuild 2742 SHA256 c547a1d9ea1f5d7f38345eb93db894f536fff9b2bedbdb75b8c572875ec104fc SHA512 9a922cd1956c83582fc1c572c981369e0ea2356cc9a00d49a5cf8bd2a6f1d8f70f090334362c6832f96f2a25dca61f6ae9e7f094da92099c9468e01d9dec4212 WHIRLPOOL 69d7f8be68fe0464c18542d378fd7941e03449f3602f07d21fd2839d8525b1733061866fa754c0f58a679cd9218d0618a1e0e331576f68d5259b5ecef114139c
+EBUILD nvidia-cuda-toolkit-5.0.35-r2.ebuild 3105 SHA256 473e9ed1caec8b6e278c641143febaa74992b7ec52fca436c309ed28d9f8aafe SHA512 d454b0c2326f3d6e0827b7ace3e6256745ebdabc6cd7909a53ffc9d084d40bd8b897959e088a517ed4ed0f815ed75ccee08ca3674387e7ccb4df37e2595b266a WHIRLPOOL 96965fe809c0842deb62cc837fec485becdcc0ceb1b81ab66293b7d2994f529cdb872bd5ccad1aac868874031da8083379d87fbc5d27dcabad385c087818e98f
 EBUILD nvidia-cuda-toolkit-5.0.35.ebuild 2739 SHA256 0e3cc805ef205bb27a48c0560ba7b3766a407bf5a0cc8939d65af73e0f150c63 SHA512 6cf960effe4d31279ed36a11f0c6340401d0ba3a5d95a1858b20194baf509eabcbd670631bf5cf72d39998e7493bc7bad766168acce2e682e1aa1526894b041b WHIRLPOOL 8757d5a7d8f2d8862887c0e8f01770f770404c548dc8dd61f9a4221a8fb89479ac4d3e013d49dcc9d33c1daf78e3c8943877fbbe8335755e9837fcb18c96ae01
-MISC ChangeLog 11756 SHA256 4801ab1146ecbdd302c7726d2844965a0bdb69817832b58fe2e15e6e3009e464 SHA512 d6781ef994675062f9bcc7a5309cbb8e2c88612a0c0e28f9f85805f3cae9795db9ca59b1b248c3ae749244cbb3dbb7f904d19252120c441c6d084fcfa368b753 WHIRLPOOL 750c66ef4e33aa016c6c0a3f07c389f68782025339e64587cbdcdf039f9363fb31c005ddd3b28c1a4be0dd870e69c83249180bd4b23830c0dc0fc42fdd55531b
+MISC ChangeLog 12032 SHA256 e48d3d8e84b864d8f0a9d4fe926d4722c617549411c6644a8096f21f1fde85c1 SHA512 f714df7c5c3fee82aed957f8ec0a8b4b3770072bbf63af1fc104df7818e5642a8633b0fc3dffbdd43c9360d6277e22299cbef3a5b9bd491dcb1f55b2f14f57e5 WHIRLPOOL efa8d1f450bf74a90f9d4685d62a14b59a015604f717c463fbd8025fe70cbcd68d47cf51234adb28b6ec83ac408632d55de69dd251beca6f5db5529feb23fa7c
 MISC metadata.xml 610 SHA256 c0a091e69e21c8e98fdb7d7f75999802db0d70f3dd0741eca44fe6977c220afc SHA512 43dc3fd9c330271d551b31fabbbc68acfda31483ac6d80647d2b6bd4bdd3376753a93dd9ee55eef857e6d87aaf0aa970388c91a42a1e6f39484ac51662f1c836 WHIRLPOOL 0ed10da6c4097c61fb92de71ff930c463b4dc1d2022f3be3b1fb982227e126b10f7c932692387bc9fb26c75ba45b537c31d771294bee87f600afb710ca0e5a48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlD36DgACgkQgAnW8HDreRbNvgCeOln6xeG2L8/3SqrSm2wWALzn
-nbEAoIxf/PIIOvD9gdpfipMradPqWhxp
-=Y2m7
+iEYEAREKAAYFAlD+0xUACgkQgAnW8HDreRY1LwCghBpkx00yJ1L+xmYqpolg3R9q
+TtAAn3hRFoAMtdiY2ybXYboGy5UZ8+cR
+=S3xz
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild
new file mode 100644
index 000000000000..0d4c8b464de1
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild
@@ -0,0 +1,124 @@
+# 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-4.2.9-r2.ebuild,v 1.1 2013/01/22 17:57:40 jlec Exp $
+
+EAPI=5
+
+inherit cuda unpacker versionator
+
+MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
+DISTRO=ubuntu11.04
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/toolkit"
+SRC_URI="
+	amd64? ( ${CURI}/cudatoolkit_${PV}_linux_64_${DISTRO}.run )
+	x86? ( ${CURI}/cudatoolkit_${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.4
+		sys-devel/gcc:4.5
+		sys-devel/gcc:4.6
+		)
+	!<=x11-drivers/nvidia-drivers-270.41
+	debugger? ( sys-libs/libtermcap-compat )
+	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_prepare() {
+	local cuda_supported_gcc dfiles files
+
+	cuda_supported_gcc="4.4 4.5 4.6"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	dfiles="install-linux.pl libnvvp/jre run_files"
+	use amd64 && dfiles+=" cuda-installer.pl"
+	for files in ${dfiles}; do
+		if [[ -e ${files} ]]; then
+			find ${files} -delete || die
+		fi
+	done
+}
+
+src_install() {
+	local i
+	local remove="doc"
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}"${cudadir}
+
+	if use doc; then
+		dodoc doc/*{txt,pdf}
+		dohtml -r doc/{*.html,html}
+	fi
+
+	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		cat > bin/nvvp <<- EOF
+			#!${EPREFIX}bin/sh
+			LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+				UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${ecudadir}/libnvvp/nvvp
+		EOF
+		chmod a+x bin/nvvp
+	else
+		use eclipse || remove+=" libnvvp"
+		remove+=" extras/CUPTI"
+	fi
+
+	for i in ${remove}; do
+		if [[ -e ${i} ]]; then
+			find ${i} -delete || die
+		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
+
+	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
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r2.ebuild
new file mode 100644
index 000000000000..020409e3cf72
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r2.ebuild
@@ -0,0 +1,127 @@
+# 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-r2.ebuild,v 1.1 2013/01/22 17:57:40 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 )
+	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 eclipse || remove+=" libnsight"
+	use amd64 || remove+=" cuda-installer.pl"
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for j in nvpp nsight; do
+			cat > bin/${i} <<- EOF
+				#!${EPREFIX}bin/sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${ecudadir}/libnvvp/${i}
+			EOF
+			chmod a+x bin/${i}
+		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
+
+	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
+}