aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/nvidia-cuda-gdk/ChangeLog3
-rw-r--r--dev-util/nvidia-cuda-gdk/Manifest4
-rw-r--r--dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild42
3 files changed, 28 insertions, 21 deletions
diff --git a/dev-util/nvidia-cuda-gdk/ChangeLog b/dev-util/nvidia-cuda-gdk/ChangeLog
index 58f897313..2526e367c 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 <jlec@gentoo.org> nvidia-cuda-gdk-340.29.ebuild:
+ Drop empty lines, clean variable names and quoting
+
19 Nov 2014; Marius Brehler <marbre@linux.sungazer.de>
nvidia-cuda-gdk-340.29.ebuild:
Add ~x86 keyword
diff --git a/dev-util/nvidia-cuda-gdk/Manifest b/dev-util/nvidia-cuda-gdk/Manifest
index 3599b5a9c..c2264b195 100644
--- a/dev-util/nvidia-cuda-gdk/Manifest
+++ b/dev-util/nvidia-cuda-gdk/Manifest
@@ -1,6 +1,2 @@
-AUX nvidia-healthmon 237 SHA256 75de390d7ce72e247c650c4820d7401e28a98cec7231de61794fce083c533f2b SHA512 5aa630b35f960757aa9b99ba01cb990610e904febbe9598ddce1e14e31013d3ad94aaa2f74e77d459aded32b6085ba8d3fc6725f67453f9fb7f835090d7eeebc WHIRLPOOL 12952daadccc1a73fb613e259766b2a13686d78c66b98fa060ff2487ac0be1d36eb25885bfed96b38ac5360ac356713937cb955508d6cf79dc60a7858c823395
DIST cuda_340_29_gdk_linux_32.run 2736726 SHA256 69dd21a556c04982ad720d8eed5ef90cd7c00d3ff4f1ac7087c9a98433a5795e SHA512 30e659fd337c455fd23a3120650565340d7963c77c6b5f46d5549b8f9b1d080659ae3dd6d12cfc4eaa7f9862fe4b2b511b19b023be5180e5e9937cd5d74938d7 WHIRLPOOL 569972d4281f71d450c88794e1b7efef4c6c24ce5a4717b203e0c961fb42a44e6b89d0be167c145705632de63da3d14c63335ba0eec24c34f99bf67b60a6a011
DIST cuda_340_29_gdk_linux_64.run 2752832 SHA256 c4dcc5294731bc7f01cd0eafe42a6784f897760e2ed44224db9865db6f7cd6fa SHA512 3310600ccddf0f79087aa48c61cf7c10bde2543f041571f1bf7c9721a5e41a993e6b231f6b01e37b22062e0b978da7135d89382b9a3a996b82b04283676469ff WHIRLPOOL 91b5c104140b9beb28fec6733f7fd71478993497bff7e9814777e3a8f2e4242c26bd383fcd3e3fbed94e221cdbecaecc53e98a4779d9f17ca4ee20362f36463d
-EBUILD nvidia-cuda-gdk-340.29.ebuild 3096 SHA256 930fb7b60defab499984f0a8b5aaafb7b37d40e206651a974d30f8f501b10852 SHA512 74c988746e31b9008c20e13e9b19d6aed06b78148b5b20b74471a22f4e8518f02ac462066beca57be2ab3e5d42c9d0fbf63fe92bf84558a22330dee5dced3a72 WHIRLPOOL 88ebbf570a395ab56fb571726a804e76cd912a043422a0ad135cfc88def8e6fcf95c67bff2f6ca4a70883a91f5baa351a574359fc90d1f87d5778c9b756034fa
-MISC ChangeLog 422 SHA256 61e4d9974a030513a305c5fcd83e3e2003104308f9951e3c1b603d3e826f7f36 SHA512 5a40272d86934fbd5b50d6537e422502e59f0e5d217cdd75935a9db8910ae3c8787f9e9fbed0c6251417f1d321ea510994bcb76435b924ba46b6d662f2c0eb03 WHIRLPOOL 527dfdc4b5842df46cdf8ec30542f00636fe34f4cbca9bcf36e9e645059e637e2ef972b270d0102ee7b2ec61342f0ac2d8ae2d70dfd8dfa777f87e649c17ba49
-MISC metadata.xml 423 SHA256 608f7cf727c24b9f103bca7bcd8afc9738fd56033b3275d35b025ffb3e83d4f7 SHA512 2134482cbdb2c39c0967eb286eb6f4fc2daf7d04affce6b409dfcc9d422107272d337727fe6a9f80e562b168b277789c7253a1199118544612a1f13505536810 WHIRLPOOL 60ca6885df28feeaaf0b5195233b022f2852c632938a9d01979c4ca21927e3c07f9f580e8cc8514cb009c365e095762c289210c559f253373a4a42963c0cb2e2
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 54ec87a01..99a47656b 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
-
}