From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1208C1381F3 for ; Thu, 15 Nov 2012 22:57:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC94921C026; Thu, 15 Nov 2012 22:57:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ED26D21C026 for ; Thu, 15 Nov 2012 22:57:20 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A2E2D33C2E1 for ; Thu, 15 Nov 2012 22:57:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2CF93E5436 for ; Thu, 15 Nov 2012 22:57:18 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1353020114.644373042ae2c70e9a7d87d32f2db484149d050b.jlec@gentoo> Subject: [gentoo-commits] proj/sci:cuda commit in: dev-util/nvidia-cuda-toolkit/ X-VCS-Repository: proj/sci X-VCS-Files: dev-util/nvidia-cuda-toolkit/ChangeLog dev-util/nvidia-cuda-toolkit/metadata.xml dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r1.ebuild dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild X-VCS-Directories: dev-util/nvidia-cuda-toolkit/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 644373042ae2c70e9a7d87d32f2db484149d050b X-VCS-Branch: cuda Date: Thu, 15 Nov 2012 22:57:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 34dd571f-5888-40bb-9a3d-82ba5ffb12c3 X-Archives-Hash: 19b246731f020fe6e92b4de31d2fddf2 commit: 644373042ae2c70e9a7d87d32f2db484149d050b Author: Justin Lecher gentoo org> AuthorDate: Thu Nov 15 22:55:14 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Nov 15 22:55:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=64437304 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 + 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 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 @@ Installs the NVIDIA CUDA visual profiler Installs the NVIDIA CUDA debugger + Installs the Eclipse SDK plugin 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