jlec        15/05/12 11:06:19

  Modified:             nvidia-cuda-toolkit-6.5.14.ebuild
                        nvidia-cuda-toolkit-6.5.19-r1.ebuild
                        nvidia-cuda-toolkit-6.5.19.ebuild ChangeLog
  Added:                nvidia-cuda-toolkit-7.0.28.ebuild
  Log:
  Version Bump; thanks Marius Brehler for the work 
https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/1119
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
E9402A79B03529A2!)

Revision  Changes    Path
1.10                 
dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild?rev=1.10&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild?rev=1.10&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild?r1=1.9&r2=1.10

Index: nvidia-cuda-toolkit-6.5.14.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nvidia-cuda-toolkit-6.5.14.ebuild   26 Jan 2015 07:10:26 -0000      1.9
+++ nvidia-cuda-toolkit-6.5.14.ebuild   12 May 2015 11:06:19 -0000      1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild,v
 1.9 2015/01/26 07:10:26 jlec Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild,v
 1.10 2015/05/12 11:06:19 jlec Exp $
 
 EAPI=5
 
@@ -59,7 +59,7 @@
 src_prepare() {
        local cuda_supported_gcc
 
-       cuda_supported_gcc="4.8"
+       cuda_supported_gcc="4.7 4.8"
 
        sed \
                -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \



1.2                  
dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild?r1=1.1&r2=1.2

Index: nvidia-cuda-toolkit-6.5.19-r1.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-cuda-toolkit-6.5.19-r1.ebuild        19 Feb 2015 07:22:26 -0000      
1.1
+++ nvidia-cuda-toolkit-6.5.19-r1.ebuild        12 May 2015 11:06:19 -0000      
1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild,v
 1.1 2015/02/19 07:22:26 jlec Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild,v
 1.2 2015/05/12 11:06:19 jlec Exp $
 
 EAPI=5
 
@@ -59,7 +59,7 @@
 src_prepare() {
        local cuda_supported_gcc
 
-       cuda_supported_gcc="4.8"
+       cuda_supported_gcc="4.7 4.8"
 
        sed \
                -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \



1.4                  
dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19.ebuild?rev=1.4&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19.ebuild?rev=1.4&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19.ebuild?r1=1.3&r2=1.4

Index: nvidia-cuda-toolkit-6.5.19.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nvidia-cuda-toolkit-6.5.19.ebuild   26 Jan 2015 07:10:26 -0000      1.3
+++ nvidia-cuda-toolkit-6.5.19.ebuild   12 May 2015 11:06:19 -0000      1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19.ebuild,v
 1.3 2015/01/26 07:10:26 jlec Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19.ebuild,v
 1.4 2015/05/12 11:06:19 jlec Exp $
 
 EAPI=5
 
@@ -59,7 +59,7 @@
 src_prepare() {
        local cuda_supported_gcc
 
-       cuda_supported_gcc="4.8"
+       cuda_supported_gcc="4.7 4.8"
 
        sed \
                -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \



1.103                dev-util/nvidia-cuda-toolkit/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog?rev=1.103&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog?rev=1.103&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog?r1=1.102&r2=1.103

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- ChangeLog   19 Feb 2015 07:22:26 -0000      1.102
+++ ChangeLog   12 May 2015 11:06:19 -0000      1.103
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/nvidia-cuda-toolkit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 
1.102 2015/02/19 07:22:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 
1.103 2015/05/12 11:06:19 jlec Exp $
+
+*nvidia-cuda-toolkit-7.0.28 (12 May 2015)
+
+  12 May 2015; Justin Lecher <[email protected]>
+  +nvidia-cuda-toolkit-7.0.28.ebuild, nvidia-cuda-toolkit-6.5.14.ebuild,
+  nvidia-cuda-toolkit-6.5.19-r1.ebuild, nvidia-cuda-toolkit-6.5.19.ebuild:
+  Version Bump; thanks Marius Brehler for the work https://github.com/gentoo
+  /gentoo-portage-rsync-mirror/pull/1119
 
 *nvidia-cuda-toolkit-6.5.19-r1 (19 Feb 2015)
 



1.1                  
dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild?rev=1.1&content-type=text/plain

Index: nvidia-cuda-toolkit-7.0.28.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.0.28.ebuild,v
 1.1 2015/05/12 11:06:19 jlec Exp $

EAPI=5

inherit check-reqs cuda unpacker versionator

MYD=$(get_version_component_range 1)_$(get_version_component_range 2)

DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
HOMEPAGE="http://developer.nvidia.com/cuda";
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
}




Reply via email to