Version bump (bug #325831). Thanks to Clemens Rabe for the updated ebuild.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 180 insertions, 1 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index bfd09382cf1f..05844cfe611d 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.27 2010/06/24 11:02:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.28 2010/07/03 22:54:09 spock Exp $
+
+*nvidia-cuda-toolkit-3.1 (03 Jul 2010)
+
+  03 Jul 2010; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-3.1.ebuild,
+  +files/nvidia-cuda-toolkit-3.1-enum_fix.patch:
+  Version bump (bug #325831). Thanks to Clemens Rabe for the updated ebuild.
 
   24 Jun 2010; Michał Januszewski <spock@gentoo.org>
   nvidia-cuda-toolkit-3.0.ebuild:
diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.1-enum_fix.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.1-enum_fix.patch
new file mode 100644
index 000000000000..698d2c7b56e0
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.1-enum_fix.patch
@@ -0,0 +1,24 @@
+diff -Naur include.orig/cudaGL.h include/cudaGL.h
+--- include.orig/cudaGL.h	2010-04-28 09:31:16.000000000 +0200
++++ include/cudaGL.h	2010-05-21 00:04:47.000000000 +0200
+@@ -59,7 +59,7 @@
+ typedef enum CUGLmap_flags_enum {
+     CU_GL_MAP_RESOURCE_FLAGS_NONE          = 0x00,
+     CU_GL_MAP_RESOURCE_FLAGS_READ_ONLY     = 0x01,
+-    CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02,    
++    CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02
+ } CUGLmap_flags;
+ 
+ CUresult CUDAAPI cuGLInit(void);
+diff -Naur include.orig/cuda_gl_interop.h include/cuda_gl_interop.h
+--- include.orig/cuda_gl_interop.h	2010-04-28 09:30:46.000000000 +0200
++++ include/cuda_gl_interop.h	2010-05-21 00:05:08.000000000 +0200
+@@ -83,7 +83,7 @@
+ {
+   cudaGLMapFlagsNone         = 0,  ///< Default; Assume resource can be read/written
+   cudaGLMapFlagsReadOnly     = 1,  ///< CUDA kernels will not write to this resource
+-  cudaGLMapFlagsWriteDiscard = 2,  ///< CUDA kernels will only write to and will not read from this resource
++  cudaGLMapFlagsWriteDiscard = 2   ///< CUDA kernels will only write to and will not read from this resource
+ };
+ 
+ extern __host__ cudaError_t CUDARTAPI cudaGLRegisterBufferObject(GLuint bufObj);
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild
new file mode 100644
index 000000000000..83accd86d920
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2010 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-3.1.ebuild,v 1.1 2010/07/03 22:54:09 spock Exp $
+
+EAPI=2
+
+inherit eutils multilib
+
+DESCRIPTION="NVIDIA CUDA Toolkit"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+
+CUDA_V=${PV//_/-}
+DIR_V=${CUDA_V//./_}
+DIR_V=${DIR_V//beta/Beta}
+
+BASE_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/toolkit"
+SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${CUDA_V}_linux_64_ubuntu9.10.run )
+	x86? ( ${BASE_URI}/cudatoolkit_${CUDA_V}_linux_32_ubuntu9.10.run )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debugger doc profiler"
+
+DEPEND="!dev-util/nvidia-cuda-profiler"
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-2.20
+	>=sys-devel/gcc-4.0
+	profiler? ( x86? (
+		x11-libs/qt-gui
+		x11-libs/qt-core
+		x11-libs/qt-assistant
+		x11-libs/qt-sql[sqlite] )
+		>=media-libs/libpng-1.2.43-r2
+	)
+	debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 )"
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	for f in ${A} ; do
+		if [ "${f//*.run/}" == "" ]; then
+			unpack_makeself ${f}
+		fi
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-enum_fix.patch
+}
+
+src_install() {
+	local DEST=/opt/cuda
+
+	into ${DEST}
+	dobin bin/*
+	dolib $(get_libdir)/*
+
+	if ! use debugger; then
+		rm -f "${D}/${DEST}/bin/cuda-gdb"
+	fi
+
+	chmod a-x "${D}/${DEST}/bin/nvcc.profile"
+
+	# doman does not respect DESTTREE
+	insinto ${DEST}/man/man1
+	doins man/man1/*
+	insinto ${DEST}/man/man3
+	doins man/man3/*
+	prepman ${DEST}
+
+	insinto ${DEST}/include
+	doins -r include/*
+
+	insinto ${DEST}/src
+	doins src/*
+
+	if use doc ; then
+		insinto ${DEST}/doc
+		doins -r doc/*
+	fi
+
+	cat > "${T}/env" << EOF
+PATH=${DEST}/bin
+ROOTPATH=${DEST}/bin
+LDPATH=${DEST}/$(get_libdir)
+MANPATH=${DEST}/man
+EOF
+	newenvd "${T}/env" 99cuda
+
+	if use profiler; then
+		local target="computeprof"
+
+		into ${DEST}/${target}
+		dobin ${target}/bin/${target}
+
+		cat > "${T}/env" << EOF
+PATH=${DEST}/${target}/bin
+ROOTPATH=${DEST}/${target}/bin
+EOF
+		if use x86 ; then
+			dosym /usr/bin/assistant ${DEST}/${target}/bin
+
+			insinto ${DEST}/${target}/bin
+			doins ${target}/bin/cudaapitrace.so
+		else
+			dobin ${target}/bin/assistant
+			insinto ${DEST}/${target}/bin
+			doins ${target}/bin/*.so*
+			insinto ${DEST}/${target}/bin/sqldrivers
+			doins ${target}/bin/sqldrivers/*
+
+			cat >> "${T}/env" << EOF
+LDPATH=${DEST}/${target}/bin
+EOF
+		fi
+
+		newenvd "${T}/env" 99${target}
+
+		if use doc; then
+			insinto ${DEST}/${target}
+			doins ${target}/*.txt
+			insinto ${DEST}/${target}/doc
+			doins ${target}/doc/*
+			insinto ${DEST}/${target}/projects
+			doins ${target}/projects/*
+		fi
+
+		make_desktop_entry /opt/cuda/computeprof/bin/computeprof "NVIDIA Compute Visual Profiler"
+	fi
+
+	export CONF_LIBDIR_OVERRIDE="lib"
+	# HACK: temporary workaround until CONF_LIBDIR_OVERRIDE is respected.
+	export LIBDIR_amd64="lib"
+
+	into ${DEST}/open64
+	dobin open64/bin/*
+	libopts -m0755
+	dolib open64/lib/*
+}
+
+pkg_postinst() {
+	elog "If you want to natively run the code generated by this version of the"
+	elog "CUDA toolkit, you will need >=x11-drivers/nvidia-drivers-256.22."
+	elog ""
+	elog "Run '. /etc/profile' before using the CUDA toolkit. "
+}