Fix nvidia-cuda-gdk

2 files changed, 40 insertions, 39 deletions

diff --git a/dev-util/nvidia-cuda-gdk/Manifest b/dev-util/nvidia-cuda-gdk/Manifest
index c2264b195..0c91925a1 100644
--- a/dev-util/nvidia-cuda-gdk/Manifest
+++ b/dev-util/nvidia-cuda-gdk/Manifest
@@ -1,2 +1,6 @@
+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 2988 SHA256 81a54bcc90bfd233cb25da85a70e883594cac7fafa6161b3160c0e4abfa0ab31 SHA512 5ec8f575b325334b7a84c7eea47b850f8f3e72f198b80606398c241c5e01aff426c6f3dcef7d8864f1e72ead18debd8e3c9aef52b32daac92c7d09d93f95eade WHIRLPOOL dd2c16fc684a9ceced68195da4e70bc7eceeb47824000fd94e133a8ac50664cdc65a98ed0df55dcba62367d0e33d0c0ac67b3120108d19ed839891da03634a23
+MISC ChangeLog 312 SHA256 9914be6544b11395fa48d0f10c3e3fdf1af94a94b801344d61cbc661c8947268 SHA512 f0ff9a5a50204b3f09b93a3b8a02e5220572437060791bcee7482daed4b931538f86e0ddb349f24cdfb5164ad3540223112edd8d6ddd5b4c78d3446af3165163 WHIRLPOOL 5a6549d7c20868078eba961f1d71ac8b64180fd4c6d0438e095331670d7b9527ef28bae5a48d59299e0d6a2b64db841e6098785bfd5fcea6c2ca763a76b04a5b
+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 f5f50f8da..080f8e908 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
 
 }