commit: 08f9bfec4dccc655933a27ea07bd52879352b200 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Mon Dec 1 09:25:29 2014 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Mon Dec 1 09:25:29 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=08f9bfec
dev-util/nvidia-cuda-gdk: Drop empty lines, clean variable names and quoting Package-Manager: portage-2.2.14 --- dev-util/nvidia-cuda-gdk/ChangeLog | 3 ++ .../nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild | 42 +++++++++++++--------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/dev-util/nvidia-cuda-gdk/ChangeLog b/dev-util/nvidia-cuda-gdk/ChangeLog index 58f8973..2526e36 100644 --- a/dev-util/nvidia-cuda-gdk/ChangeLog +++ b/dev-util/nvidia-cuda-gdk/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 01 Dec 2014; Justin Lecher <[email protected]> nvidia-cuda-gdk-340.29.ebuild: + Drop empty lines, clean variable names and quoting + 19 Nov 2014; Marius Brehler <[email protected]> nvidia-cuda-gdk-340.29.ebuild: Add ~x86 keyword 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 54ec87a..99a4765 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 @@ -22,8 +22,9 @@ IUSE="+healthmon +nvml +doc examples" RDEPEND=" >=dev-util/nvidia-cuda-toolkit-6.5 + media-libs/freeglut examples? ( >=x11-drivers/nvidia-drivers-340.32[uvm] ) - media-libs/freeglut" + " DEPEND="${RDEPEND}" S="${WORKDIR}/payload" @@ -41,11 +42,11 @@ src_compile() { } src_install() { - local i j f t ARCH + local i j f t _arch if use amd64; then - ARCH=amd64; + _arch=amd64; elif use x86; then - ARCH=x86; + _arch=x86; else die; fi @@ -54,9 +55,12 @@ src_install() { if use healthmon ; then ebegin "Installing healthmon docs..." doman nvidia-healthmon/docs/man/man8/nvidia-healthmon.8 - cd "${S}/nvidia-healthmon/nvidia-healthmon-${ARCH}-${PV}" || die - treecopy $(find -type f \( -name README.txt -name COPYING.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/nvidia-healthmon/ - docompress -x $(find "${ED}"/usr/share/doc/${PF}/nvidia-healthmon/ -type f -name readme.txt | sed -e "s:${ED}::") + cd "${S}/nvidia-healthmon/nvidia-healthmon-${_arch}-${PV}" || die + treecopy \ + $(find -type f \( -name README.txt -name COPYING.txt -o -name "*.pdf" \)) \ + "${ED}"/usr/share/doc/${PF}/nvidia-healthmon/ + docompress -x \ + $(find "${ED}"/usr/share/doc/${PF}/nvidia-healthmon/ -type f -name readme.txt | sed -e "s:${ED}::") cd "${S}/" || die eend fi @@ -65,25 +69,30 @@ src_install() { ebegin "Installing nvml docs..." doman nvml/doc/man/man3/*.3 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}::") + 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}/" || die eend fi fi ebegin "Cleaning before installation..." - find -type f \( -name "*.o" -o -name "*.pdf" -o -name "*.txt" -o -name "*.3" \) -delete || die + find -type f \ + \( -name "*.o" -o -name "*.pdf" -o -name "*.txt" -o -name "*.3" \) -delete \ + || die eend if use healthmon; then ebegin "Installing nvidia-healthmon" - exeinto "/opt/cuda/gdk/nvidia-healthmon/nvidia-healthmon-tests/" - doexe "nvidia-healthmon/nvidia-healthmon-${ARCH}-${PV}/bin"/{*,*.*} - exeinto "/opt/cuda/gdk/nvidia-healthmon/" - doexe "nvidia-healthmon/nvidia-healthmon-${ARCH}-${PV}"/nvidia-healthmon - insinto "/etc/nvidia-healthmon/" - doins "nvidia-healthmon/nvidia-healthmon-${ARCH}-${PV}"/nvidia-healthmon.conf + exeinto /opt/cuda/gdk/nvidia-healthmon/nvidia-healthmon-tests/ + doexe "nvidia-healthmon/nvidia-healthmon-${_arch}-${PV}/bin"/{*,*.*} + exeinto /opt/cuda/gdk/nvidia-healthmon/ + doexe "nvidia-healthmon/nvidia-healthmon-${_arch}-${PV}"/nvidia-healthmon + insinto /etc/nvidia-healthmon/ + doins "nvidia-healthmon/nvidia-healthmon-${_arch}-${PV}"/nvidia-healthmon.conf # install launch script exeinto /opt/bin @@ -113,5 +122,4 @@ src_install() { cd "${S}/" || die eend fi - }
