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 7530F138AD0 for ; Wed, 19 Nov 2014 08:30:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E1DDE08B0; Wed, 19 Nov 2014 08:30:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A44CBE08A8 for ; Wed, 19 Nov 2014 08:30:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6231D340494 for ; Wed, 19 Nov 2014 08:30:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08325A72D for ; Wed, 19 Nov 2014 08:30:49 +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: <1416318062.8800be09d1a4420ae05a79b41ce66eacb20b0d53.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-util/nvidia-cuda-gdk/ X-VCS-Repository: proj/sci X-VCS-Files: dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild X-VCS-Directories: dev-util/nvidia-cuda-gdk/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 8800be09d1a4420ae05a79b41ce66eacb20b0d53 X-VCS-Branch: master Date: Wed, 19 Nov 2014 08:30:49 +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: 66ba8605-8cfe-4d6b-b307-7c8c460e3de1 X-Archives-Hash: 85f3a3e541e450fc465a0e928216c3e5 commit: 8800be09d1a4420ae05a79b41ce66eacb20b0d53 Author: Marius Brehler linux sungazer de> AuthorDate: Tue Nov 18 13:41:02 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Nov 18 13:41:02 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8800be09 Fix nvidia-cuda-gdk --- .../nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild | 75 +++++++++++----------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild b/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild index f5f50f8..080f8e9 100644 --- a/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild +++ b/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils toolchain-funcs portability unpacker versionator +inherit eutils portability toolchain-funcs unpacker versionator MYD=$(get_version_component_range 1)_$(get_version_component_range 2) @@ -21,10 +21,9 @@ KEYWORDS="~amd64" IUSE="+healthmon +nvml +doc examples" RDEPEND=" ->=dev-util/nvidia-cuda-toolkit-6.5 -examples? ( >=x11-drivers/nvidia-drivers-340.32[uvm] ) -media-libs/freeglut -" + >=dev-util/nvidia-cuda-toolkit-6.5 + examples? ( >=x11-drivers/nvidia-drivers-340.32[uvm] ) + media-libs/freeglut" DEPEND="${RDEPEND}" S="${WORKDIR}/payload" @@ -37,13 +36,11 @@ src_unpack() { src_compile() { use examples || return - cd "${S}"/nvml/example + cd "${S}"/nvml/example || die emake || die } src_install() { - cd "${S}/" - local i j f t if use doc; then @@ -60,10 +57,10 @@ src_install() { if use healthmon ; then ebegin "Installing nvml docs..." doman nvml/doc/man/man3/*.3 - cd "${S}/nvml/" + cd "${S}/nvml/" || die treecopy $(find -type f \( -name README.txt -name COPYRIGHT.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/nvml/ docompress -x $(find "${ED}"/usr/share/doc/${PF}/nvml/ -type f -name readme.txt | sed -e "s:${ED}::") - cd "${S}/" + cd "${S}/" || die eend fi fi @@ -74,40 +71,40 @@ src_install() { if use healthmon; then ebegin "Installing nvidia-healthmon" - exeinto "/opt/cuda/gdk/nvidia-healthmon/nvidia-healthmon-tests/" - doexe "nvidia-healthmon/nvidia-healthmon-amd64-${PV}/bin"/gpu_rdma_bw - doexe "nvidia-healthmon/nvidia-healthmon-amd64-${PV}/bin"/ibv_rdma_bw - doexe "nvidia-healthmon/nvidia-healthmon-amd64-${PV}/bin"/rdma_test.sh - exeinto "/opt/cuda/gdk/nvidia-healthmon/" - doexe "nvidia-healthmon/nvidia-healthmon-amd64-${PV}"/nvidia-healthmon - insinto "/etc/nvidia-healthmon/" - doins "nvidia-healthmon/nvidia-healthmon-amd64-${PV}"/nvidia-healthmon.conf - - # install launch script - exeinto /opt/bin - doexe "${FILESDIR}"/nvidia-healthmon + exeinto "/opt/cuda/gdk/nvidia-healthmon/nvidia-healthmon-tests/" + doexe "nvidia-healthmon/nvidia-healthmon-amd64-${PV}/bin"/{*,*.*} + exeinto "/opt/cuda/gdk/nvidia-healthmon/" + doexe "nvidia-healthmon/nvidia-healthmon-amd64-${PV}"/nvidia-healthmon + insinto "/etc/nvidia-healthmon/" + doins "nvidia-healthmon/nvidia-healthmon-amd64-${PV}"/nvidia-healthmon.conf + + # install launch script + exeinto /opt/bin + doexe "${FILESDIR}"/nvidia-healthmon + eend fi if use nvml; then ebegin "Installing nvml" - cd "${S}/nvml" - for f in $(find .); do - local t="$(dirname ${f})" - if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then - continue - fi - - if [[ ! -d "${f}" ]]; then - if [[ -x "${f}" ]]; then - exeinto "/opt/cuda/gdk/nvml/${t}" - doexe "${f}" - else - insinto "/opt/cuda/gdk/nvml/${t}" - doins "${f}" + cd "${S}/nvml" || die + for f in $(find .); do + local t="$(dirname ${f})" + if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then + continue + fi + + if [[ ! -d "${f}" ]]; then + if [[ -x "${f}" ]]; then + exeinto "/opt/cuda/gdk/nvml/${t}" + doexe "${f}" + else + insinto "/opt/cuda/gdk/nvml/${t}" + doins "${f}" + fi fi - fi - done - cd "${S}/" + done + cd "${S}/" || die + eend fi }