public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2012-07-03 17:30 Sebastien Fabbro
  0 siblings, 0 replies; 23+ messages in thread
From: Sebastien Fabbro @ 2012-07-03 17:30 UTC (permalink / raw
  To: gentoo-commits

commit:     50445b3ff89c67a59c974868f9eca0e125ce16e4
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Tue Jul  3 17:29:06 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 17:29:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=50445b3f

dev-util/nvidia-cuda-toolkit: import/clean/bump

---
 dev-util/nvidia-cuda-toolkit/ChangeLog             |  273 ++++++++++++++++++++
 dev-util/nvidia-cuda-toolkit/metadata.xml          |   17 ++
 .../nvidia-cuda-toolkit-4.2.ebuild                 |  111 ++++++++
 3 files changed, 401 insertions(+), 0 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
new file mode 100644
index 0000000..50d785e
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -0,0 +1,273 @@
+# ChangeLog for dev-util/nvidia-cuda-toolkit
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.50 2012/02/21 22:44:39 spock Exp $
+
+*nvidia-cuda-toolkit-4.2 (03 Jul 2012)
+
+  03 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +nvidia-cuda-toolkit-4.2.ebuild, +metadata.xml:
+  Version bumped. Switched to EAPI4, added prefix love, cleaned ebuild,
+  metadata love
+
+  21 Feb 2012; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-3.2.ebuild:
+  Restore 3.2, which is a dependency of dev-util/nvidia-cuda-npp-3.2.
+
+  21 Feb 2012; Michał Januszewski <spock@gentoo.org>
+  -nvidia-cuda-toolkit-2.2-r3.ebuild,
+  -files/nvidia-cuda-toolkit-2.2-enum_fix.patch,
+  -nvidia-cuda-toolkit-2.3.ebuild, -nvidia-cuda-toolkit-3.0.ebuild,
+  -files/nvidia-cuda-toolkit-3.0-enum_fix.patch,
+  -nvidia-cuda-toolkit-3.1.ebuild,
+  -files/nvidia-cuda-toolkit-3.1-enum_fix.patch,
+  -nvidia-cuda-toolkit-3.2.ebuild:
+  Remove old ebuilds.
+
+  21 Feb 2012; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild,
+  nvidia-cuda-toolkit-3.2.ebuild, nvidia-cuda-toolkit-4.0.ebuild,
+  nvidia-cuda-toolkit-4.1.ebuild:
+  Stop creating the /usr/include/CL symlink now that there is an eselect module
+  to switch between OpenCL implementations.
+
+  11 Feb 2012; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild,
+  nvidia-cuda-toolkit-3.2.ebuild, nvidia-cuda-toolkit-4.0.ebuild,
+  nvidia-cuda-toolkit-4.1.ebuild:
+  Do not call env-update in pkg_postinst.
+
+  05 Feb 2012; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-4.1.ebuild:
+  Add a dep on gcc-4.5+.
+
+  05 Feb 2012; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-4.1.ebuild:
+  Fix problems with the executable bit being unset on some .so files (bug
+  #401447).
+
+  05 Feb 2012; Mike Frysinger <vapier@gentoo.org>
+  nvidia-cuda-toolkit-2.2-r3.ebuild, nvidia-cuda-toolkit-2.3.ebuild,
+  nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild,
+  nvidia-cuda-toolkit-3.2.ebuild, nvidia-cuda-toolkit-4.0.ebuild,
+  nvidia-cuda-toolkit-4.1.ebuild:
+  Move to new unpacker eclass for unpack_makeself.
+
+*nvidia-cuda-toolkit-4.1 (29 Jan 2012)
+
+  29 Jan 2012; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-4.1.ebuild:
+  Version bump.
+
+  04 Sep 2011; Markus Meier <maekke@gentoo.org> nvidia-cuda-toolkit-4.0.ebuild:
+  x86 stable, bug #378545
+
+  27 Aug 2011; Tony Vroon <chainsaw@gentoo.org> nvidia-cuda-toolkit-4.0.ebuild:
+  Marked stable on AMD64 based on arch testing by Elijah El Lazkani & Tomáš
+  "Mepho" Pružina in bug #378545 filed by Agostino "ago" Sarubbo.
+
+  27 Aug 2011; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-4.0.ebuild:
+  Fix bug #380425.
+
+  23 Aug 2011; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-4.0.ebuild:
+  Fix bugs #375295, #375801.
+
+  23 Jul 2011; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-2.2-r3.ebuild, nvidia-cuda-toolkit-2.3.ebuild,
+  nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild,
+  nvidia-cuda-toolkit-3.2.ebuild, nvidia-cuda-toolkit-4.0.ebuild:
+  Remove block on nvidia-cuda-profiler (now removed from the tree).
+
+  12 Jun 2011; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-4.0.ebuild:
+  Update the nvidia-drivers dependency for CUDA 4.0 to req. at least 270.41+.
+
+*nvidia-cuda-toolkit-4.0 (29 May 2011)
+
+  29 May 2011; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-4.0.ebuild:
+  Add CUDA Toolkit v4.0 (bug #367529).
+
+  06 Jan 2011; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-3.2.ebuild:
+  Block old NVIDIA drivers to prevent collision in /usr/include/CL (bug
+  #348920).
+
+  12 Dec 2010; Michał Januszewski <spock@gentoo.org>
+  -nvidia-cuda-toolkit-3.0_beta1.ebuild:
+  Remove the ebuild for 3.0-beta1.
+
+  12 Dec 2010; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild,
+  nvidia-cuda-toolkit-3.2.ebuild:
+  Install a /usr/include/CL symlink for the NVIDIA OpenCL headers.
+
+*nvidia-cuda-toolkit-3.2 (01 Dec 2010)
+
+  01 Dec 2010; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-3.2.ebuild:
+  Version bump.
+
+  06 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+  nvidia-cuda-toolkit-3.1.ebuild:
+  Fix libpng SLOT depend wrt #339796 by "MaratIK".
+
+  23 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  nvidia-cuda-toolkit-2.2-r3.ebuild, nvidia-cuda-toolkit-2.3.ebuild,
+  nvidia-cuda-toolkit-3.0_beta1.ebuild, nvidia-cuda-toolkit-3.0.ebuild,
+  nvidia-cuda-toolkit-3.1.ebuild:
+  Remove wrong restrictions. Use the proper QA_* variables, not blanket
+  restrictions.
+
+  05 Jul 2010; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild:
+  Add env-update calls so that the CUDA libraries are picked up by other
+  ebuilds and apps (bug #320853).
+
+*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:
+  Add desktop entries for cudaprof and openclprof (no icons so far, as
+  NVIDIA does not provide any) (bug #323995).
+
+  24 Jun 2010; Michał Januszewski <spock@gentoo.org>
+  -nvidia-cuda-toolkit-2.0.ebuild, -nvidia-cuda-toolkit-2.1.ebuild,
+  -nvidia-cuda-toolkit-2.2-r2.ebuild:
+  Remove old ebuilds.
+
+  24 Jun 2010; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-3.0.ebuild:
+  Add a missing dependency on libpng-1.2 (bug #323985).
+
+  23 May 2010; Pacho Ramos <pacho@gentoo.org>
+  nvidia-cuda-toolkit-2.3.ebuild:
+  stable amd64, bug 313067
+
+  10 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  nvidia-cuda-toolkit-2.3.ebuild:
+  x86 stable wrt bug #313067
+
+  01 Apr 2010; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-3.0.ebuild,
+  +files/nvidia-cuda-toolkit-3.0-enum_fix.patch:
+  Add an enum fix for gcc pedantic mode (bug #311657), fix a typo in
+  src_install.
+
+  25 Mar 2010; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-3.0.ebuild:
+  Add a dep on >=sys-devel/binutils-2.20 (bug #279523).
+
+*nvidia-cuda-toolkit-3.0 (21 Mar 2010)
+
+  21 Mar 2010; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-3.0.ebuild, metadata.xml:
+  Version bump.
+
+  20 Jan 2010; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-3.0_beta1.ebuild:
+  Update the info about the required version of nvidia-drivers (bug
+  #301101).
+
+*nvidia-cuda-toolkit-3.0_beta1 (08 Jan 2010)
+
+  08 Jan 2010; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-3.0_beta1.ebuild:
+  Version bump (bug #298914).
+
+  01 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+  nvidia-cuda-toolkit-2.2-r2.ebuild:
+  stable x86, bug 293641
+
+  25 Sep 2009; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-2.1.ebuild:
+  Add a note that 2.1 should never become stable.
+
+*nvidia-cuda-toolkit-2.2-r3 (09 Aug 2009)
+
+  09 Aug 2009; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-2.2-r3.ebuild:
+  Use older binaries to maintain compatiblity with gcc3 (bug #279523).
+
+  09 Aug 2009; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-2.3.ebuild:
+  Add a dep on gcc4 (required for ABI compatibility).
+
+  07 Aug 2009; <chainsaw@gentoo.org> nvidia-cuda-toolkit-2.0.ebuild:
+  Marked stable as requested by Michal "Spock" Januszewski
+  <spock@gentoo.org> in bug #276538. Arch-tested by Víctor "VQuicksilver"
+  Enríquez using K3d & cuda-profiler.
+
+  29 Jul 2009; Michał Januszewski <spock@gentoo.org>
+  -nvidia-cuda-toolkit-2.2.ebuild, -nvidia-cuda-toolkit-2.2-r1.ebuild:
+  Remove old ebuilds.
+
+*nvidia-cuda-toolkit-2.3 (29 Jul 2009)
+
+  29 Jul 2009; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-2.3.ebuild:
+  Version bump.
+
+  19 Jul 2009; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-2.0.ebuild, nvidia-cuda-toolkit-2.1.ebuild,
+  nvidia-cuda-toolkit-2.2.ebuild, nvidia-cuda-toolkit-2.2-r1.ebuild,
+  nvidia-cuda-toolkit-2.2-r2.ebuild:
+  Add a warning about gcc-4.4 not being supported by the NVIDIA CUDA
+  compiler (bug #278210)
+
+  08 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+  nvidia-cuda-toolkit-2.0.ebuild:
+  stable x86, bug 276538
+
+*nvidia-cuda-toolkit-2.2-r2 (05 Jul 2009)
+
+  05 Jul 2009; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-2.2-r2.ebuild, metadata.xml:
+  Add support for the CUDA debugger (bug #274100).
+
+  05 Jul 2009; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-2.2-r1.ebuild:
+  Use system Qt4 libraries on x86. Restrict binchecks as this is a binary
+  package.
+
+*nvidia-cuda-toolkit-2.2-r1 (19 Jun 2009)
+
+  19 Jun 2009; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-2.2-r1.ebuild,
+  +files/nvidia-cuda-toolkit-2.2-enum_fix.patch, metadata.xml:
+  Add support for the CUDA visual profiler (bug #274095).
+
+*nvidia-cuda-toolkit-2.2 (16 May 2009)
+
+  16 May 2009; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-2.2.ebuild:
+  Version bump (bug #269894).
+
+  06 May 2009; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-2.1.ebuild:
+  Add a temporary workaround for bug #266069.
+
+  13 Apr 2009; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-2.1.ebuild:
+  Properly override the lib directory (bug #265722, patch by Georgi
+  Georgiev).
+
+*nvidia-cuda-toolkit-2.1 (21 Jan 2009)
+
+  21 Jan 2009; Michał Januszewski <spock@gentoo.org>
+  +nvidia-cuda-toolkit-2.1.ebuild:
+  Version bump (bug #255128).
+
+*nvidia-cuda-toolkit-2.0 (18 Oct 2008)
+
+  18 Oct 2008; Michał Januszewski <spock@gentoo.org> +metadata.xml,
+  +nvidia-cuda-toolkit-2.0.ebuild:
+  Initial commit. Thanks to everyone participating in bug #167685 for the
+  previous versions of the ebuild.
+

diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
new file mode 100644
index 0000000..49f0577
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<longdescription lang='en'>
+  The NVIDIA® CUDA® Toolkit provides a development environment for C
+  and C++ developers building GPU-accelerated applications. The CUDA
+  Toolkit includes a compiler for NVIDIA GPUs, math libraries, and
+  tools for debugging and optimizing the performance of applications.
+</longdescription>
+<use>
+  <flag name='profiler'>Installs the NVIDIA CUDA visual profiler</flag>
+  <flag name='debugger'>Installs the NVIDIA CUDA debugger</flag>
+  <flag name='opencl'>Installs OpenCL utilities</flag>
+</use>
+</pkgmetadata>
+

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
new file mode 100644
index 0000000..f06da0e
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils multilib unpacker versionator
+
+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}/rel/toolkit"
+SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.9_linux_64_ubuntu11.04.run )
+	x86? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.9_linux_32_ubuntu11.04.run )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debugger doc profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=sys-devel/binutils-2.20
+	>=sys-devel/gcc-4.5
+	debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 )
+	!<=x11-drivers/nvidia-drivers-270.41"
+
+S="${WORKDIR}"
+
+src_install() {
+	local cudadir=/opt/cuda
+
+	into ${cudadir}
+	dobin bin/*nvvm/*
+	dolib $(get_libdir)/*
+
+	if ! use debugger; then
+		rm -f "${ED}"/${cudadir}/bin/cuda-gdb
+	else
+		insinto ${cudadir}/extras
+		doins -r extras/Debugger
+	fi
+
+	if use profiler; then
+		# TODO: Use system JRE for the profiler?
+		insinto ${cudadir}
+		doins -r libnvvp
+		fperms a+x \
+			${cudadir}/libnvvp/nvvp \
+			${cudadir}/libnvvp/jre/bin/* \
+			${cudadir}/libnvvp/*.so
+
+		cat > "${T}"/nvv <<- EOF
+			#!/bin/sh
+			LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${EPREFIX}${cudadir}/lib:${EPREFIX}${cudadir}/lib64 "${EPREFIX}"${cudadir}/libnvvp/nvvp
+		EOF
+		dobin "${T}"/nvv
+		insinto ${cudadir}/extras
+		doins -r extras/CUPTI
+	fi
+
+	chmod a-x "${ED}"/${cudadir}/bin/{nvcc.profile,ci_include.h}
+
+	# TODO: Manuals are missing from this release. Remove the following
+	# commented-out lines if they are not restored in the next releases.
+	# doman does not respect cudadirTREE
+	#insinto ${cudadir}/man/man1
+	#doins man/man1/*
+	#insinto ${cudadir}/man/man3
+	#doins man/man3/*
+	#prepman ${cudadir}
+
+	insinto ${cudadir}/include
+	doins -r include/*
+
+	insinto ${cudadir}/src
+	doins src/*
+
+	if use doc; then
+		insinto ${cudadir}/doc
+		doins -r doc/*
+	fi
+
+	cat > "${T}"/99cuda <<- EOF
+		PATH=${cudadir}/bin:${cudadir}/libnvvp
+		ROOTPATH=${cudadir}/bin
+		LDPATH=${cudadir}/$(get_libdir)
+		MANPATH=${cudadir}/man
+	EOF
+	doenvd "${T}"/99cuda
+
+	export CONF_LIBDIR_OVERRIDE="lib"
+	# HACK: temporary workaround until CONF_LIBDIR_OVERRIDE is respected.
+	export LIBDIR_amd64="lib"
+
+	into ${cudadir}/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-260.19.21."
+	elog ""
+	elog "Run 'env-update && . ${EROOT}etc/profile' before using the CUDA toolkit. "
+}



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2012-07-03 18:23 Sebastien Fabbro
  0 siblings, 0 replies; 23+ messages in thread
From: Sebastien Fabbro @ 2012-07-03 18:23 UTC (permalink / raw
  To: gentoo-commits

commit:     7e04d0bd8ee319cb0c9b31ac966d39031b0294b3
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Tue Jul  3 18:22:39 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 18:22:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7e04d0bd

dev-util/nvidia-cuda-toolkit: more prefix fixes

---
 dev-util/nvidia-cuda-toolkit/ChangeLog             |    4 ++++
 .../nvidia-cuda-toolkit-4.2.ebuild                 |   10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 50d785e..fe4483b 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.50 2012/02/21 22:44:39 spock Exp $
 
+  03 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  nvidia-cuda-toolkit-4.2.ebuild:
+  More prefix fixes
+
 *nvidia-cuda-toolkit-4.2 (03 Jul 2012)
 
   03 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
index f06da0e..e8a3e4e 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
@@ -35,7 +35,7 @@ src_install() {
 	local cudadir=/opt/cuda
 
 	into ${cudadir}
-	dobin bin/*nvvm/*
+	dobin bin/* nvvm/*
 	dolib $(get_libdir)/*
 
 	if ! use debugger; then
@@ -86,10 +86,10 @@ src_install() {
 	fi
 
 	cat > "${T}"/99cuda <<- EOF
-		PATH=${cudadir}/bin:${cudadir}/libnvvp
-		ROOTPATH=${cudadir}/bin
-		LDPATH=${cudadir}/$(get_libdir)
-		MANPATH=${cudadir}/man
+		PATH=${EPREFIX}${cudadir}/bin:${EPREFIX}${cudadir}/libnvvp
+		ROOTPATH=${EPREFIX}${cudadir}/bin
+		LDPATH=${EPREFIX}${cudadir}/$(get_libdir)
+		MANPATH=${EPREFIX}${cudadir}/man
 	EOF
 	doenvd "${T}"/99cuda
 



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2012-07-03 19:34 Sebastien Fabbro
  0 siblings, 0 replies; 23+ messages in thread
From: Sebastien Fabbro @ 2012-07-03 19:34 UTC (permalink / raw
  To: gentoo-commits

commit:     728cb56e1a29349a502366392b0eda1371cae620
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Tue Jul  3 19:34:00 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 19:34:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=728cb56e

dev-util/nvidia-cuda-toolkit: fix for amd64-linux

---
 dev-util/nvidia-cuda-toolkit/ChangeLog |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index fe4483b..5f5bf41 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -4,6 +4,10 @@
 
   03 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
   nvidia-cuda-toolkit-4.2.ebuild:
+  Fix for amd64-linux prefix which uses lib instead of lib64
+
+  03 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  nvidia-cuda-toolkit-4.2.ebuild:
   More prefix fixes
 
 *nvidia-cuda-toolkit-4.2 (03 Jul 2012)



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2012-07-03 19:34 Sebastien Fabbro
  0 siblings, 0 replies; 23+ messages in thread
From: Sebastien Fabbro @ 2012-07-03 19:34 UTC (permalink / raw
  To: gentoo-commits

commit:     660b1ab05f06408e546303bc445402cba6011534
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Tue Jul  3 19:34:19 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 19:34:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=660b1ab0

dev-util/nvidia-cuda-toolkit: fix for amd64-linux

---
 .../nvidia-cuda-toolkit-4.2.ebuild                 |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
index e8a3e4e..67ffb48 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
@@ -36,7 +36,9 @@ src_install() {
 
 	into ${cudadir}
 	dobin bin/* nvvm/*
-	dolib $(get_libdir)/*
+	# use explicit lib64 because of amd64-linux prefix which uses lib
+	use amd64 && dolib lib64/*
+	use x86 && dolib lib/*
 
 	if ! use debugger; then
 		rm -f "${ED}"/${cudadir}/bin/cuda-gdb



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2012-07-04  7:43 Justin Lecher
  0 siblings, 0 replies; 23+ messages in thread
From: Justin Lecher @ 2012-07-04  7:43 UTC (permalink / raw
  To: gentoo-commits

commit:     cd00b2db98a3e0ec9013e1d3646e292213071270
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  4 07:37:35 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jul  4 07:37:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cd00b2db

dev-util/nvidia-cuda-toolkit: This package is prebuilt so we are using QA_PREBUILT for everything

(Portage version: 2.2.0_alpha115/git/Linux x86_64, unsigned Manifest commit)

---
 dev-util/nvidia-cuda-toolkit/ChangeLog             |    4 ++++
 dev-util/nvidia-cuda-toolkit/metadata.xml          |   15 +++++++--------
 .../nvidia-cuda-toolkit-4.2.ebuild                 |    6 +++++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 5f5bf41..1ffb9cf 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.50 2012/02/21 22:44:39 spock Exp $
 
+  04 Jul 2012; Justin Lecher <jlec@gentoo.org> nvidia-cuda-toolkit-4.2.ebuild,
+  metadata.xml:
+  This package is prebuilt so we are using QA_PREBUILT for everything
+
   03 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
   nvidia-cuda-toolkit-4.2.ebuild:
   Fix for amd64-linux prefix which uses lib instead of lib64

diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index 49f0577..7bd2e14 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang='en'>
+	<herd>sci</herd>
+	<longdescription lang="en">
   The NVIDIA® CUDA® Toolkit provides a development environment for C
   and C++ developers building GPU-accelerated applications. The CUDA
   Toolkit includes a compiler for NVIDIA GPUs, math libraries, and
   tools for debugging and optimizing the performance of applications.
 </longdescription>
-<use>
-  <flag name='profiler'>Installs the NVIDIA CUDA visual profiler</flag>
-  <flag name='debugger'>Installs the NVIDIA CUDA debugger</flag>
-  <flag name='opencl'>Installs OpenCL utilities</flag>
-</use>
+	<use>
+		<flag name="profiler">Installs the NVIDIA CUDA visual profiler</flag>
+		<flag name="debugger">Installs the NVIDIA CUDA debugger</flag>
+		<flag name="opencl">Installs OpenCL utilities</flag>
+	</use>
 </pkgmetadata>
-

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
index 67ffb48..e9406c4 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
@@ -14,7 +14,8 @@ DIR_V=${CUDA_V//./_}
 DIR_V=${DIR_V//beta/Beta}
 
 BASE_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/rel/toolkit"
-SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.9_linux_64_ubuntu11.04.run )
+SRC_URI="
+	amd64? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.9_linux_64_ubuntu11.04.run )
 	x86? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.9_linux_32_ubuntu11.04.run )"
 
 LICENSE="NVIDIA"
@@ -31,6 +32,9 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"
 
+QA_PREBUILT="
+	opt/cuda/*"
+
 src_install() {
 	local cudadir=/opt/cuda
 



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2012-07-04 18:37 Sebastien Fabbro
  0 siblings, 0 replies; 23+ messages in thread
From: Sebastien Fabbro @ 2012-07-04 18:37 UTC (permalink / raw
  To: gentoo-commits

commit:     70900e1408c00a20c3eeebf012d7b1e29335dccc
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Wed Jul  4 18:37:16 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jul  4 18:37:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=70900e14

dev-util/nvidia: rewrote ebuild

---
 dev-util/nvidia-cuda-toolkit/ChangeLog             |    8 ++
 dev-util/nvidia-cuda-toolkit/metadata.xml          |   13 +-
 .../nvidia-cuda-toolkit-4.2.9.ebuild               |   73 ++++++++++++
 .../nvidia-cuda-toolkit-4.2.ebuild                 |  117 --------------------
 4 files changed, 87 insertions(+), 124 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 1ffb9cf..0a7f125 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.50 2012/02/21 22:44:39 spock Exp $
 
+*nvidia-cuda-toolkit-4.2.9 (04 Jul 2012)
+
+  04 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -nvidia-cuda-toolkit-4.2.ebuild, +nvidia-cuda-toolkit-4.2.9.ebuild,
+  metadata.xml:
+  Rewrote ebuild. Use system JRE, try to complies with upstream installation,
+  simplified maintenance, add a warning for too new gcc versions
+
   04 Jul 2012; Justin Lecher <jlec@gentoo.org> nvidia-cuda-toolkit-4.2.ebuild,
   metadata.xml:
   This package is prebuilt so we are using QA_PREBUILT for everything

diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index 7bd2e14..7631a2c 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
   The NVIDIA® CUDA® Toolkit provides a development environment for C
   and C++ developers building GPU-accelerated applications. The CUDA
   Toolkit includes a compiler for NVIDIA GPUs, math libraries, and
   tools for debugging and optimizing the performance of applications.
 </longdescription>
-	<use>
-		<flag name="profiler">Installs the NVIDIA CUDA visual profiler</flag>
-		<flag name="debugger">Installs the NVIDIA CUDA debugger</flag>
-		<flag name="opencl">Installs OpenCL utilities</flag>
-	</use>
+<use>
+  <flag name="profiler">Installs the NVIDIA CUDA visual profiler</flag>
+  <flag name="debugger">Installs the NVIDIA CUDA debugger</flag>
+</use>
 </pkgmetadata>

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9.ebuild
new file mode 100644
index 0000000..56b9910
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils unpacker versionator toolchain-funcs
+
+DESCRIPTION="NVIDIA CUDA Toolkit"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+
+MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
+DISTRO=ubuntu11.04
+
+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 )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debugger doc profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	!<=x11-drivers/nvidia-drivers-270.41
+	debugger? ( sys-libs/libtermcap-compat )
+	profiler? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/cuda/*"
+
+src_install() {
+	local cudadir=/opt/cuda
+	local prefix="${EPREFIX}"${cudadir}
+	rm install-linux.pl
+	# use system jre
+	rm -r libnvvp/jre
+	use doc || rm -r doc
+	use debugger || rm -r 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}:${prefix}/lib:${prefix}/lib64 UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${prefix}/libnvvp/nvvp
+		EOF
+		chmod a+x bin/nvvp
+	else
+		rm -r extras/CUPTI libnvvp
+	fi
+
+	dodir ${cudadir}
+	mv * "${ED}"${cudadir}
+
+	cat > "${T}"/99cuda <<- EOF
+		PATH=${prefix}/bin:${prefix}/libnvvp
+		ROOTPATH=${prefix}/bin
+		LDPATH=${prefix}/lib$(use amd64 && echo "64:${prefix}/lib")
+		MANPATH=${prefix}/man
+	EOF
+	doenvd "${T}"/99cuda
+}
+
+pkg_postinst() {
+	if [[ $(tc-getCC) == *gcc* ]] && version_is_at_least 4.7 "$(gcc-version)"
+	then
+		ewarn "gcc >= 4.7 will not work with CUDA"
+		ewarn "Make sure you set an earlier version of gcc with gcc-config"
+	fi
+}

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
deleted file mode 100644
index e9406c4..0000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib unpacker versionator
-
-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}/rel/toolkit"
-SRC_URI="
-	amd64? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.9_linux_64_ubuntu11.04.run )
-	x86? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.9_linux_32_ubuntu11.04.run )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc profiler"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-2.20
-	>=sys-devel/gcc-4.5
-	debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 )
-	!<=x11-drivers/nvidia-drivers-270.41"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="
-	opt/cuda/*"
-
-src_install() {
-	local cudadir=/opt/cuda
-
-	into ${cudadir}
-	dobin bin/* nvvm/*
-	# use explicit lib64 because of amd64-linux prefix which uses lib
-	use amd64 && dolib lib64/*
-	use x86 && dolib lib/*
-
-	if ! use debugger; then
-		rm -f "${ED}"/${cudadir}/bin/cuda-gdb
-	else
-		insinto ${cudadir}/extras
-		doins -r extras/Debugger
-	fi
-
-	if use profiler; then
-		# TODO: Use system JRE for the profiler?
-		insinto ${cudadir}
-		doins -r libnvvp
-		fperms a+x \
-			${cudadir}/libnvvp/nvvp \
-			${cudadir}/libnvvp/jre/bin/* \
-			${cudadir}/libnvvp/*.so
-
-		cat > "${T}"/nvv <<- EOF
-			#!/bin/sh
-			LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${EPREFIX}${cudadir}/lib:${EPREFIX}${cudadir}/lib64 "${EPREFIX}"${cudadir}/libnvvp/nvvp
-		EOF
-		dobin "${T}"/nvv
-		insinto ${cudadir}/extras
-		doins -r extras/CUPTI
-	fi
-
-	chmod a-x "${ED}"/${cudadir}/bin/{nvcc.profile,ci_include.h}
-
-	# TODO: Manuals are missing from this release. Remove the following
-	# commented-out lines if they are not restored in the next releases.
-	# doman does not respect cudadirTREE
-	#insinto ${cudadir}/man/man1
-	#doins man/man1/*
-	#insinto ${cudadir}/man/man3
-	#doins man/man3/*
-	#prepman ${cudadir}
-
-	insinto ${cudadir}/include
-	doins -r include/*
-
-	insinto ${cudadir}/src
-	doins src/*
-
-	if use doc; then
-		insinto ${cudadir}/doc
-		doins -r doc/*
-	fi
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${EPREFIX}${cudadir}/bin:${EPREFIX}${cudadir}/libnvvp
-		ROOTPATH=${EPREFIX}${cudadir}/bin
-		LDPATH=${EPREFIX}${cudadir}/$(get_libdir)
-		MANPATH=${EPREFIX}${cudadir}/man
-	EOF
-	doenvd "${T}"/99cuda
-
-	export CONF_LIBDIR_OVERRIDE="lib"
-	# HACK: temporary workaround until CONF_LIBDIR_OVERRIDE is respected.
-	export LIBDIR_amd64="lib"
-
-	into ${cudadir}/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-260.19.21."
-	elog ""
-	elog "Run 'env-update && . ${EROOT}etc/profile' before using the CUDA toolkit. "
-}



^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2012-11-26 22:02 Justin Lecher
  0 siblings, 0 replies; 23+ messages in thread
From: Justin Lecher @ 2012-11-26 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     65e80d5203289856dc8319d862fecafa963d763f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 15 22:55:14 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 26 14:41:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=65e80d52

dev-util/nvidia-cuda-toolkit: Version Bump

Package-Manager: portage-2.2.0_alpha142

---
 dev-util/nvidia-cuda-toolkit/ChangeLog             |    5 +
 dev-util/nvidia-cuda-toolkit/metadata.xml          |    1 +
 .../nvidia-cuda-toolkit-5.0.35-r1.ebuild           |   87 --------------------
 .../nvidia-cuda-toolkit-5.0.35.ebuild              |   18 +++--
 4 files changed, 18 insertions(+), 93 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index e5a879d..fe4ddc0 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.50 2012/02/21 22:44:39 spock Exp $
 
+  15 Nov 2012; Justin Lecher <jlec@gentoo.org>
+  nvidia-cuda-toolkit-5.0.35.ebuild, -nvidia-cuda-toolkit-5.0.35-r1.ebuild,
+  metadata.xml:
+  Version Bump
+
 *nvidia-cuda-toolkit-4.2.9-r1 (15 Nov 2012)
 
   15 Nov 2012; Justin Lecher <jlec@gentoo.org>

diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index c88853f..6e47b66 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -11,5 +11,6 @@
 	<use>
 		<flag name="profiler">Installs the NVIDIA CUDA visual profiler</flag>
 		<flag name="debugger">Installs the NVIDIA CUDA debugger</flag>
+		<flag name="eclipse">Installs the Eclipse SDK plugin</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r1.ebuild
deleted file mode 100644
index a9a5424..0000000
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cuda unpacker
-
-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 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/*"
-
-src_prepare() {
-	local cuda_supported_gcc
-
-	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
-}
-
-src_install() {
-	local cudadir=/opt/cuda
-	local prefix="${EPREFIX}"${cudadir}
-	rm install-linux.pl
-	# use system jre
-	rm -r libnvvp/jre
-
-	if use doc; then
-		dodoc doc/*{txt,pdf}
-		dohtml -r doc/html/*
-	fi
-	find doc -delete || die
-
-	use debugger || rm -r 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}:${prefix}/lib:${prefix}/lib64 \
-				UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${prefix}/libnvvp/nvvp
-		EOF
-		chmod a+x bin/nvvp
-	else
-		rm -r extras/CUPTI libnvvp
-	fi
-
-	dodir ${cudadir}
-	mv * "${ED}"${cudadir}
-
-	cat > "${T}"/99cuda <<- EOF
-		PATH=${prefix}/bin:${prefix}/libnvvp
-		ROOTPATH=${prefix}/bin
-		LDPATH=${prefix}/lib$(use amd64 && echo "64:${prefix}/lib")
-	EOF
-	doenvd "${T}"/99cuda
-
-	dobin "${T}"/cuda-config
-}

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
index 135a253..1505870 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit cuda unpacker
 
 MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-DISTRO=ubuntu11.10-1
+DISTRO=fedora16-1
 
 DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
 HOMEPAGE="http://developer.nvidia.com/cuda"
@@ -19,7 +19,7 @@ SRC_URI="
 SLOT="0"
 LICENSE="NVIDIA"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc profiler"
+IUSE="debugger doc eclipse profiler"
 
 DEPEND=""
 RDEPEND="${DEPEND}
@@ -36,6 +36,11 @@ S="${WORKDIR}"
 
 QA_PREBUILT="opt/cuda/*"
 
+src_unpack() {
+	unpacker
+	unpacker run_files/cudatoolkit*run
+}
+
 src_prepare() {
 	local cuda_supported_gcc
 
@@ -44,22 +49,23 @@ src_prepare() {
 	sed \
 		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
 		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	find cuda-installer.pl install-linux.pl jre run_files -delete || die
 }
 
 src_install() {
 	local cudadir=/opt/cuda
 	local prefix="${EPREFIX}"${cudadir}
-	rm install-linux.pl
-	# use system jre
-	rm -r libnvvp/jre
 
 	if use doc; then
-		dodoc doc/*{txt,pdf}
+		dodoc doc/{*.txt,pdf/*}
 		dohtml -r doc/html/*
 	fi
+
 	find doc -delete || die
 
 	use debugger || rm -r bin/cuda-gdb extras/Debugger
+	use eclipse || find libnsight -delete
 
 	if use profiler; then
 		# hack found in install-linux.pl


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2012-11-26 22:02 Justin Lecher
  0 siblings, 0 replies; 23+ messages in thread
From: Justin Lecher @ 2012-11-26 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     0c1d859a2a667868824f9db85bb3e907ba5452be
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 23 18:25:18 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 26 14:41:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0c1d859a

do not call pkg_setup from cuda.eclass

---
 .../nvidia-cuda-toolkit-5.0.35.ebuild              |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
index 0bae2d3..3f7383e 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
@@ -36,6 +36,11 @@ S="${WORKDIR}"
 
 QA_PREBUILT="opt/cuda/*"
 
+pkg_setup() {
+    # We don't like to run cuda_pkg_setup
+    :
+}
+
 src_unpack() {
 	unpacker
 	unpacker run_files/cudatoolkit*run
@@ -55,7 +60,7 @@ src_prepare() {
 
 src_install() {
 	local cudadir=/opt/cuda
-	local prefix="${EPREFIX}"${cudadir}
+	local ecudadir="${EPREFIX}"${cudadir}
 
 	if use doc; then
 		dodoc doc/{*.txt,pdf/*}
@@ -71,8 +76,8 @@ src_install() {
 		# hack found in install-linux.pl
 		cat > bin/nvvp <<- EOF
 			#!${EPREFIX}bin/sh
-			LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${prefix}/lib:${prefix}/lib64 \
-				UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${prefix}/libnvvp/nvvp
+			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
@@ -83,9 +88,9 @@ src_install() {
 	mv * "${ED}"${cudadir}
 
 	cat > "${T}"/99cuda <<- EOF
-		PATH=${prefix}/bin:${prefix}/libnvvp
-		ROOTPATH=${prefix}/bin
-		LDPATH=${prefix}/lib$(use amd64 && echo "64:${prefix}/lib")
+		PATH=${ecudadir}/bin:${ecudadir}/libnvvp
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib")
 	EOF
 	doenvd "${T}"/99cuda
 


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2012-11-26 22:02 Justin Lecher
  0 siblings, 0 replies; 23+ messages in thread
From: Justin Lecher @ 2012-11-26 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     90b5a7ded88dec217127545fa52ecf27fa10fd2d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 23 18:28:03 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 26 14:41:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=90b5a7de

Be a little more informative.

---
 .../nvidia-cuda-toolkit-5.0.35.ebuild              |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
index 3f7383e..e3acc1b 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
@@ -37,7 +37,7 @@ S="${WORKDIR}"
 QA_PREBUILT="opt/cuda/*"
 
 pkg_setup() {
-    # We don't like to run cuda_pkg_setup
+    # We don't like to run cuda_pkg_setup as it depends on us
     :
 }
 


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2012-11-26 22:02 Justin Lecher
  0 siblings, 0 replies; 23+ messages in thread
From: Justin Lecher @ 2012-11-26 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     d60beb928c2b6018b7574224a07316f6434b0ff0
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 17:09:05 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 26 14:41:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d60beb92

dev-util/nvidia-cuda-toolkit: Merge change in both versions; fix whitespace error

Package-Manager: portage-2.2.0_alpha142

---
 dev-util/nvidia-cuda-toolkit/ChangeLog             |    4 ++
 .../nvidia-cuda-toolkit-4.2.9-r1.ebuild            |   39 +++++++++++++++-----
 .../nvidia-cuda-toolkit-5.0.35.ebuild              |   24 ++++++------
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 16f1d05..8bdd993 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.50 2012/02/21 22:44:39 spock Exp $
 
+  25 Nov 2012; Justin Lecher <jlec@gentoo.org>
+  nvidia-cuda-toolkit-4.2.9-r1.ebuild, nvidia-cuda-toolkit-5.0.35.ebuild:
+  Merge change in both versions; fix whitespace error
+
   16 Nov 2012; Justin Lecher <jlec@gentoo.org> files/cuda-config.in:
   Enhancing cuda-config
 

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild
index 6e71b8a..5c304e5 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 SLOT="0"
 LICENSE="NVIDIA"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debugger doc profiler"
+IUSE="debugger doc eclipse profiler"
 
 DEPEND=""
 RDEPEND="${DEPEND}
@@ -36,6 +36,11 @@ 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
 
@@ -44,29 +49,30 @@ src_prepare() {
 	sed \
 		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
 		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	find cuda-installer.pl install-linux.pl libnvvp/jre run_files -delete || die
 }
 
 src_install() {
 	local cudadir=/opt/cuda
-	local prefix="${EPREFIX}"${cudadir}
-	rm install-linux.pl
-	# use system jre
-	rm -r libnvvp/jre
+	local ecudadir="${EPREFIX}"${cudadir}
 
 	if use doc; then
 		dodoc doc/*{txt,pdf}
 		dohtml -r doc/html/*
 	fi
+
 	find doc -delete || die
 
 	use debugger || rm -r bin/cuda-gdb extras/Debugger
+	use eclipse || find libnsight -delete
 
 	if use profiler; then
 		# hack found in install-linux.pl
 		cat > bin/nvvp <<- EOF
 			#!${EPREFIX}bin/sh
-			LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${prefix}/lib:${prefix}/lib64 \
-				UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${prefix}/libnvvp/nvvp
+			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
@@ -77,11 +83,24 @@ src_install() {
 	mv * "${ED}"${cudadir}
 
 	cat > "${T}"/99cuda <<- EOF
-		PATH=${prefix}/bin:${prefix}/libnvvp
-		ROOTPATH=${prefix}/bin
-		LDPATH=${prefix}/lib$(use amd64 && echo "64:${prefix}/lib")
+		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
+	a="$(version_sort $(cuda-config -s))"; a=($a)
+	if [[ $(tc-getCC) == *gcc* ]] && \
+		version_is_at_least "$(gcc-version)" ${a[1]}; then
+			ewarn "gcc >= ${a[1]} 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 "${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${a[1]}"
+			ewarn "to the nvcc compiler flags"
+	fi
+}

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
index e3acc1b..a17f442 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild
@@ -37,8 +37,8 @@ S="${WORKDIR}"
 QA_PREBUILT="opt/cuda/*"
 
 pkg_setup() {
-    # We don't like to run cuda_pkg_setup as it depends on us
-    :
+	# We don't like to run cuda_pkg_setup as it depends on us
+	:
 }
 
 src_unpack() {
@@ -98,14 +98,14 @@ src_install() {
 }
 
 pkg_postinst() {
-    local a
-    a="$(version_sort $(cuda-config -s))"; a=($a)
-    if [[ $(tc-getCC) == *gcc* ]] && \
-        version_is_at_least "$(gcc-version)" ${a[1]}; then
-            ewarn "gcc >= ${a[1]} 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 "${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${a[1]}"
-            ewarn "to the nvcc compiler flags"
-    fi
+	local a
+	a="$(version_sort $(cuda-config -s))"; a=($a)
+	if [[ $(tc-getCC) == *gcc* ]] && \
+		version_is_at_least "$(gcc-version)" ${a[1]}; then
+			ewarn "gcc >= ${a[1]} 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 "${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${a[1]}"
+			ewarn "to the nvcc compiler flags"
+	fi
 }


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2013-06-05 14:54 Justin Lecher
  0 siblings, 0 replies; 23+ messages in thread
From: Justin Lecher @ 2013-06-05 14:54 UTC (permalink / raw
  To: gentoo-commits

commit:     790c673141e6fce700ccd10e2260110c9ed59d79
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 14:54:29 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 14:54:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=790c6731

Restrict fetch #472144

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

---
 dev-util/nvidia-cuda-toolkit/ChangeLog              |  6 +++++-
 dev-util/nvidia-cuda-toolkit/metadata.xml           | 21 ++++++++++-----------
 .../nvidia-cuda-toolkit-5.5.11.ebuild               |  2 ++
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 5dbb67d..aeeec79 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for dev-util/nvidia-cuda-toolkit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.35 2011/01/06 22:13:37 spock Exp $
 
+  31 May 2013; Justin Lecher <jlec@gentoo.org>
+  nvidia-cuda-toolkit-5.5.11.ebuild, metadata.xml:
+  Restrict fetch
+
   06 Jan 2011; Michał Januszewski <spock@gentoo.org>
   nvidia-cuda-toolkit-3.2.ebuild:
   Block old NVIDIA drivers to prevent collision in /usr/include/CL (bug

diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index 77d82a5..29dfa67 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
-	<maintainer>
-		<email>spock@gentoo.org</email>
-		<name>Michał Januszewski</name>
-	</maintainer>
-	<use>
-		<flag name='profiler'>
+  <herd>cluster</herd>
+  <maintainer>
+    <email>spock@gentoo.org</email>
+    <name>Michał Januszewski</name>
+  </maintainer>
+  <use>
+    <flag name="profiler">
 			Installs the NVIDIA CUDA visual profiler.
 		</flag>
-		<flag name="debugger">
+    <flag name="debugger">
 			Installs the CUDA debugger.
 		</flag>
-		<flag name="eclipse">Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag>
-	</use>
+    <flag name="eclipse">Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag>
+  </use>
 </pkgmetadata>
-

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild
index aab15a1..b648be6 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild
@@ -36,6 +36,8 @@ S="${WORKDIR}"
 
 QA_PREBUILT="opt/cuda/*"
 
+RESTRICT="fetch"
+
 pkg_nofetch() {
 	einfo "NVIDIA doesn't provide direct download links yet. If you're a"
 	einfo "registered developer, then please download ${ARCHIVE} from"


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2013-08-12 21:28 Sebastien Fabbro
  0 siblings, 0 replies; 23+ messages in thread
From: Sebastien Fabbro @ 2013-08-12 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     733013fca5b76126b447677f688958dd53423104
Author:     Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Mon Aug 12 08:41:26 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 08:41:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=733013fc

updated cuda toolkit to production release

---
 ...da-toolkit-5.5.11.ebuild => nvidia-cuda-toolkit-5.5.22.ebuild} | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
similarity index 96%
rename from dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild
rename to dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
index b648be6..093c2a8 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.11.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
@@ -10,11 +10,11 @@ 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-update-1/installers/"
+CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers/"
 SRC_URI=""
 SRC_URI="
-	amd64? ( ${CURI}/cuda-${PV}_linux_64.run )
-	x86? ( ${CURI}/cuda-${PV}-linux_32.run )"
+	amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
+	x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
 
 SLOT="0/${PV}"
 LICENSE="NVIDIA-r1"
@@ -36,8 +36,6 @@ S="${WORKDIR}"
 
 QA_PREBUILT="opt/cuda/*"
 
-RESTRICT="fetch"
-
 pkg_nofetch() {
 	einfo "NVIDIA doesn't provide direct download links yet. If you're a"
 	einfo "registered developer, then please download ${ARCHIVE} from"


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2013-08-12 21:28 Sebastien Fabbro
  0 siblings, 0 replies; 23+ messages in thread
From: Sebastien Fabbro @ 2013-08-12 21:28 UTC (permalink / raw
  To: gentoo-commits

commit:     c9c60997680596cb972fe225817ef1dca8dc5738
Author:     Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Mon Aug 12 11:30:16 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 11:30:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c9c60997

removed superfluous function

---
 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild | 6 ------
 1 file changed, 6 deletions(-)

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
index 093c2a8..7e261d5 100644
--- 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
@@ -36,12 +36,6 @@ S="${WORKDIR}"
 
 QA_PREBUILT="opt/cuda/*"
 
-pkg_nofetch() {
-	einfo "NVIDIA doesn't provide direct download links yet. If you're a"
-	einfo "registered developer, then please download ${ARCHIVE} from"
-	einfo "https://developer.nvidia.com/rdp/cuda-55-release-candidate-installers"
-}
-
 pkg_setup() {
 	# We don't like to run cuda_pkg_setup as it depends on us
 	:


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2014-08-21  8:32 Justin Lecher
  0 siblings, 0 replies; 23+ messages in thread
From: Justin Lecher @ 2014-08-21  8:32 UTC (permalink / raw
  To: gentoo-commits

commit:     80e48c087630a3bb5f9a3e64c33bc8c9baa4a464
Author:     Marius Brehler <marius.brehler <AT> tu-dortmund <DOT> de>
AuthorDate: Wed Aug 20 08:57:29 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Aug 20 08:57:29 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=80e48c08

dev-util/nvidia-cuda-toolkit: Version Bump

---
 dev-util/nvidia-cuda-toolkit/ChangeLog             |   6 +
 .../nvidia-cuda-toolkit-6.5.14.ebuild              | 144 +++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index d8307ea..f6508b9 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*nvidia-cuda-toolkit-6.5.14 (20 Aug 2014)
+
+  20 Aug 2014; Marius Brehler <marbre@linux.sungazer.de>
+  +nvidia-cuda-toolkit-6.5.14.ebuild:
+  Version Bump
+
 *nvidia-cuda-toolkit-6.5.11 (10 Jul 2014)
 
   10 Jul 2014; Marius Brehler <marbre@linux.sungazer.de> +files/cuda-config.in,

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
new file mode 100644
index 0000000..fc55fef
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-340.24[uvm]
+	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.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
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	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$(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
+}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2015-01-18  2:16 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2015-01-18  2:16 UTC (permalink / raw
  To: gentoo-commits

commit:     514d9f527396fde711a1dde03646a612ce2f21ae
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Jan 14 10:16:06 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 14 10:16:06 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=514d9f52

dev-util/nvidia-cuda-toolkit: Fix ChangeLog

---
 dev-util/nvidia-cuda-toolkit/ChangeLog | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index c46ecef..30a10bd 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  14 Jul 2014; Marius Brehler <marbre@linux.sungazer.de> +files/cuda-config.in,
+*nvidia-cuda-sdk-7.0.18 (14 Jan 2015)
+
+  14 Jan 2014; Marius Brehler <marbre@linux.sungazer.de> +files/cuda-config.in,
   +metadata.xml, +nvidia-cuda-toolkit-7.0.18.ebuild:
-  Add version 7.0.18 (release candidate)
\ No newline at end of file
+  Add version 7.0.18 (release candidate)
+  
\ No newline at end of file


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2015-01-18  2:16 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2015-01-18  2:16 UTC (permalink / raw
  To: gentoo-commits

commit:     173e943b98266f1b07cc3407bd8f12effcef2da6
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Jan 14 11:35:04 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 14 11:35:04 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=173e943b

dev-utils/nvidia-cuda-toolkit: Set supported gcc to 4.7

---
 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild
index 9fb34a3..83a076d 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild
@@ -56,7 +56,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
-	cuda_supported_gcc="4.9"
+	cuda_supported_gcc="4.7"
 
 	sed \
 		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2015-01-18  2:16 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2015-01-18  2:16 UTC (permalink / raw
  To: gentoo-commits

commit:     4dc8d456d1f85e456c8f9343c3db2f210064679a
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Wed Jan 14 10:04:54 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 14 10:04:54 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4dc8d456

dev-util/nvidia-cuda-toolkit: Update nvidia-driver RDEPEND; Use pkg_postinst to inform about possible driver problems.

---
 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild
index 2fbe00c..9fb34a3 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild
@@ -21,7 +21,7 @@ IUSE="debugger doc eclipse profiler"
 DEPEND=""
 RDEPEND="${DEPEND}
 	>=sys-devel/gcc-4.7[cxx]
-	>=x11-drivers/nvidia-drivers-340.32[uvm]
+	>=x11-drivers/nvidia-drivers-346.22[uvm]
 	debugger? (
 		sys-libs/libtermcap-compat
 		sys-libs/ncurses[tinfo]
@@ -149,4 +149,8 @@ pkg_postinst() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		pkg_postinst_check
 	fi
+	elog "The CUDA toolkit 7.0 release candidate bundels the"
+	elog " - nvidia-driver-346.29"
+	elog "This is not yet in portage, as a seperate download is not"
+	elog "available. Anyway driver 346.22 is already CUDA enabled."
 }


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2015-01-22 10:14 Justin Lecher
  0 siblings, 0 replies; 23+ messages in thread
From: Justin Lecher @ 2015-01-22 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     efbae8bde23bec47e8ab1777a30d7ad6b31844eb
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Thu Jan 22 09:51:54 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 22 09:51:54 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=efbae8bd

dev-util/nvidia-cuda-toolkit: Fix cuda_supported_gcc

---
 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild
index 5d3760f..2a2cd48 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild
@@ -56,7 +56,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
-	cuda_supported_gcc="4.7"
+	cuda_supported_gcc="4.7 4.8 4.9"
 
 	sed \
 		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2015-02-19  7:20 Justin Lecher
  0 siblings, 0 replies; 23+ messages in thread
From: Justin Lecher @ 2015-02-19  7:20 UTC (permalink / raw
  To: gentoo-commits

commit:     20a2a0c04bcf4f780df2476078d2c4b2333a5c6a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 19 07:20:38 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 07:20:38 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=20a2a0c0

dev-util/nvidia-cuda-toolkit: Create convinience symlink lib32 -> lib

Package-Manager: portage-2.2.17

---
 dev-util/nvidia-cuda-toolkit/ChangeLog                              | 6 ++++++
 ...a-toolkit-7.0.18.ebuild => nvidia-cuda-toolkit-7.0.18-r1.ebuild} | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 30a10bd..07be9bc 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*nvidia-cuda-toolkit-7.0.18-r1 (19 Feb 2015)
+
+  19 Feb 2015; Justin Lecher <jlec@gentoo.org>
+  +nvidia-cuda-toolkit-7.0.18-r1.ebuild, -nvidia-cuda-toolkit-7.0.18.ebuild:
+  dev-util/nvidia-cuda-toolkit: Create convinience symlink lib32 -> lib
+
 *nvidia-cuda-sdk-7.0.18 (14 Jan 2015)
 
   14 Jan 2014; Marius Brehler <marbre@linux.sungazer.de> +files/cuda-config.in,

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18-r1.ebuild
similarity index 99%
rename from dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild
rename to dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18-r1.ebuild
index 2a2cd48..69df15f 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.18-r1.ebuild
@@ -110,6 +110,8 @@ src_install() {
 		fi
 	done
 
+	ln -sf lib lib32 || die
+
 	dodir ${cudadir}
 	mv * "${ED}"${cudadir} || die
 


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2015-03-20  4:31 Christoph Junghans
  0 siblings, 0 replies; 23+ messages in thread
From: Christoph Junghans @ 2015-03-20  4:31 UTC (permalink / raw
  To: gentoo-commits

commit:     d0f4981ea796fc2aa053659bc7a0b45d9f652eb9
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Thu Mar 19 08:06:10 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Mar 19 08:06:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d0f4981e

dev-util/nvidia-cuda-toolkit: Version bump

Package-Manager: portage-2.2.14

 dev-util/nvidia-cuda-toolkit/ChangeLog             |   8 +-
 .../nvidia-cuda-toolkit-7.0.28.ebuild              | 143 +++++++++++++++++++++
 2 files changed, 150 insertions(+), 1 deletion(-)

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 07be9bc..c079b7e 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*nvidia-cuda-toolkit-7.0.28 (19 Mar 2015)
+
+  19 Mar 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +nvidia-cuda-toolkit-7.0.28.ebuild:
+  Version bump
+
 *nvidia-cuda-toolkit-7.0.18-r1 (19 Feb 2015)
 
   19 Feb 2015; Justin Lecher <jlec@gentoo.org>
@@ -12,4 +18,4 @@
   14 Jan 2014; Marius Brehler <marbre@linux.sungazer.de> +files/cuda-config.in,
   +metadata.xml, +nvidia-cuda-toolkit-7.0.18.ebuild:
   Add version 7.0.18 (release candidate)
-  
\ No newline at end of file
+  

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild
new file mode 100644
index 0000000..955d8a5
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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"
+SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run"
+
+SLOT="0/${PV}"
+LICENSE="NVIDIA-CUDA"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=sys-devel/gcc-4.7[cxx]
+	>=x11-drivers/nvidia-drivers-346.35[uvm]
+	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 4.8 4.9"
+
+	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
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+	( use profiler || use eclipse ) || remove+=" libnsight"
+	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}/lib64:${ecudadir}/lib
+	EOF
+	doenvd "${T}"/99cuda
+
+	use profiler && \
+		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib64:${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
+}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2015-09-09  8:11 Justin Lecher
  0 siblings, 0 replies; 23+ messages in thread
From: Justin Lecher @ 2015-09-09  8:11 UTC (permalink / raw
  To: gentoo-commits

commit:     f66c1529f92a8c1fdbf972609269e0a644478b37
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  9 07:47:48 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Sep  9 07:47:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=f66c1529

dev-util/nvidia-cuda-toolkit: Version Bump

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../nvidia-cuda-toolkit-7.5.18.ebuild              | 143 +++++++++++++++++++++
 1 file changed, 143 insertions(+)

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18.ebuild
new file mode 100644
index 0000000..0ffc597
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit check-reqs cuda unpacker versionator
+
+MYD=$(get_version_component_range 1-2)
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run"
+
+SLOT="0/${PV}"
+LICENSE="NVIDIA-CUDA"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=sys-devel/gcc-4.7[cxx]
+	>=x11-drivers/nvidia-drivers-352.39[uvm]
+	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 4.8 4.9"
+
+	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
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+	( use profiler || use eclipse ) || remove+=" libnsight"
+	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}/lib64:${ecudadir}/lib
+	EOF
+	doenvd "${T}"/99cuda
+
+	use profiler && \
+		make_wrapper nvprof "${EPREFIX}"${cudadir}/bin/nvprof "." ${ecudadir}/lib64:${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
+}


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2016-05-30  8:52 Marius Brehler
  0 siblings, 0 replies; 23+ messages in thread
From: Marius Brehler @ 2016-05-30  8:52 UTC (permalink / raw
  To: gentoo-commits

commit:     609326b839775331c1aa2527d75551ca25c08547
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Mon May 30 08:50:25 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Mon May 30 08:50:25 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=609326b8

dev-util/nvidia-cuda-toolkit: Only install gdb src if debugger is selected

Package-Manager: portage-2.2.28

 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.27.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.27.ebuild
index df53170..36cf247 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.27.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.27.ebuild
@@ -79,7 +79,7 @@ src_install() {
 	mv doc/man/man3/{,cuda-}deprecated.3 || die
 	doman doc/man/man*/*
 
-	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
+	use debugger || remove+=" bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz"
 	( use profiler || use eclipse ) || remove+=" libnsight"
 	remove+=" cuda-installer.pl"
 


^ permalink raw reply related	[flat|nested] 23+ messages in thread

* [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/
@ 2016-09-15 14:18 Marius Brehler
  0 siblings, 0 replies; 23+ messages in thread
From: Marius Brehler @ 2016-09-15 14:18 UTC (permalink / raw
  To: gentoo-commits

commit:     d84d156b637e82b98f0ca119344a74ad8584c92a
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Thu Sep 15 14:14:49 2016 +0000
Commit:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
CommitDate: Thu Sep 15 14:14:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d84d156b

dev-util/nvidia-cuda-toolkit: Correct nofetch message

Package-Manager: portage-2.2.28

 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.27.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.27.ebuild
index 36cf247..01bc627 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.27.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.27.ebuild
@@ -32,7 +32,7 @@ RESTRICT="fetch"
 
 pkg_nofetch() {
 	einfo "Please download the RHEL 7 \"runfile (local)\" installer"
-	einfo "  - cuda_${P}_rc_linux.run"
+	einfo "  - cuda_${P}_linux.run"
 	einfo "from ${CURI} and place it in ${DISTDIR}"
 }
 


^ permalink raw reply related	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2016-09-15 14:18 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-03 17:30 [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-toolkit/ Sebastien Fabbro
  -- strict thread matches above, loose matches on Subject: below --
2012-07-03 18:23 Sebastien Fabbro
2012-07-03 19:34 Sebastien Fabbro
2012-07-03 19:34 Sebastien Fabbro
2012-07-04  7:43 Justin Lecher
2012-07-04 18:37 Sebastien Fabbro
2012-11-26 22:02 Justin Lecher
2012-11-26 22:02 Justin Lecher
2012-11-26 22:02 Justin Lecher
2012-11-26 22:02 Justin Lecher
2013-06-05 14:54 Justin Lecher
2013-08-12 21:28 Sebastien Fabbro
2013-08-12 21:28 Sebastien Fabbro
2014-08-21  8:32 Justin Lecher
2015-01-18  2:16 Christoph Junghans
2015-01-18  2:16 Christoph Junghans
2015-01-18  2:16 Christoph Junghans
2015-01-22 10:14 Justin Lecher
2015-02-19  7:20 Justin Lecher
2015-03-20  4:31 Christoph Junghans
2015-09-09  8:11 Justin Lecher
2016-05-30  8:52 Marius Brehler
2016-09-15 14:18 Marius Brehler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox