adding new revs for subslot dependancies, as well as fixing license

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

6 files changed, 274 insertions, 7 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 9e058a41d41f..4d15d0870eee 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,15 @@
 # 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.67 2013/02/13 22:02:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.68 2013/04/20 15:04:03 zerochaos Exp $
+
+*nvidia-cuda-toolkit-5.0.35-r4 (20 Apr 2013)
+*nvidia-cuda-toolkit-4.2.9-r3 (20 Apr 2013)
+
+  20 Apr 2013; Rick Farina <zerochaos@gentoo.org>
+  +nvidia-cuda-toolkit-4.2.9-r3.ebuild, +nvidia-cuda-toolkit-5.0.35-r4.ebuild,
+  nvidia-cuda-toolkit-4.2.9-r2.ebuild, nvidia-cuda-toolkit-5.0.35-r2.ebuild,
+  nvidia-cuda-toolkit-5.0.35-r3.ebuild:
+  adding new revs for subslot dependancies, as well as fixing license
 
 *nvidia-cuda-toolkit-5.0.35-r3 (13 Feb 2013)
 
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
index 0d24eb91892c..5e778bc919a0 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.4 2013/02/08 11:10:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild,v 1.5 2013/04/20 15:04:03 zerochaos Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="
 	x86? ( ${CURI}/cudatoolkit_${PV}_linux_32_${DISTRO}.run )"
 
 SLOT="0"
-LICENSE="NVIDIA"
+LICENSE="NVIDIA-r1"
 KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="debugger doc eclipse profiler"
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r3.ebuild
new file mode 100644
index 000000000000..b3ea6ca3c0cb
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r3.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-r3.ebuild,v 1.1 2013/04/20 15:04:03 zerochaos 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/${PV}"
+LICENSE="NVIDIA-r1"
+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
index 5d8e852a8e33..6dfb0fc08931 100644
--- 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
@@ -1,6 +1,6 @@
 # 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.3 2013/02/12 15:18:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r2.ebuild,v 1.4 2013/04/20 15:04:03 zerochaos Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="
 	x86? ( ${CURI}/cuda_${PV}_linux_32_${DISTRO}.run )"
 
 SLOT="0"
-LICENSE="NVIDIA"
+LICENSE="NVIDIA-r1"
 KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debugger doc eclipse profiler"
 
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
index 551081bb9de5..fe326112062a 100644
--- 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
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r3.ebuild,v 1.2 2013/04/20 15:04:03 zerochaos Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="
 	x86? ( ${CURI}/cuda_${PV}_linux_32_${DISTRO}.run )"
 
 SLOT="0"
-LICENSE="NVIDIA"
+LICENSE="NVIDIA-r1"
 KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debugger doc eclipse profiler"
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r4.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r4.ebuild
new file mode 100644
index 000000000000..45f3c33cd23b
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r4.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-r4.ebuild,v 1.1 2013/04/20 15:04:03 zerochaos 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/${PV}"
+LICENSE="NVIDIA-r1"
+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
+}