dev-util/nvidia-cuda-toolkit: Test for presents of deprecated.3 before moving, #525226

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 33 insertions, 6 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 5c3c3e663497..020a52a6ddfe 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/nvidia-cuda-toolkit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.91 2014/11/04 05:37:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.92 2014/11/05 15:17:22 jlec Exp $
+
+  05 Nov 2014; Justin Lecher <jlec@gentoo.org>
+  nvidia-cuda-toolkit-6.5.14.ebuild:
+  Test for presents of deprecated.3 before moving, #525226
 
 *nvidia-cuda-toolkit-4.2.9-r2 (04 Nov 2014)
 
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 10e3d0190d10..82fe5b4075bd 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX cuda-config.in 406 SHA256 7271463891ff75dd83f4cb42bb3004d3204243d0e38f9cbd5b4ec4560865496a SHA512 df6d16bd2e800868bdf8401b6f82a387b701ea297ddf6e8feb0daf5222e62a33f156e5f45cf1ee4e1aa51559dfbd56b897c257dae1bb9568e839bf806bfebd5b WHIRLPOOL 4a26ee11d97676827cb01644891fdca495c3373585ddfbb5fab9f988186da384f27482c4be9e27d834036ffa87f7ee19f9ad7da2d8536babe874dda4ff991147
 DIST cuda_5.5.22_linux_32.run 686412076 SHA256 0e7aad303807bb0ede8f6f6e825cfcd0f9ddb677bc8cc898ec38990b8226778d SHA512 e2e4fbc78c2e6373b3f81778d8044b299429459e8e27632e86c0d97e6fe7f4db7cd5652044beb0ce7ee3c7abaa7dcec7d85639a2de4b9cc213ab52a2d204aa6b WHIRLPOOL e5df7de03aaec8488a7fa093e272d64b5d3adaedca1458c550d4ae9c6bf2a0ead71496c8a0c9aac966500aa01401e95cc57a951e3a2554e8d823b97c10336850
 DIST cuda_5.5.22_linux_64.run 849417929 SHA256 b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4 SHA512 25233b34a35fdb5ee3479a87c89484a00dcd760837436c263c3eb8731cbd24a9ed3fb57ce2d4e5bf7cd31abb9b0d990b45720a5f6a376b2488de4506a7c57c20 WHIRLPOOL 550594121a53feae4e74a4dc9ba40c4cd2ac91305f23397cd7ea421fcb801e3ce8fcf90f439c966accca44d586bc51d85ef3e211f35fd751dc9299dd07d65175
@@ -11,6 +14,25 @@ EBUILD nvidia-cuda-toolkit-4.2.9-r2.ebuild 3283 SHA256 a3452c87dd36602fb030ef76b
 EBUILD nvidia-cuda-toolkit-5.5.22.ebuild 3536 SHA256 2ed359ba1bf26f3e902818030c41bac4b2e4a217b5d48f73e4cb6d4250451227 SHA512 54d394a1aeaeb7ca69c981e77e56323a359b10ac295dad50e7f5e36b428768e0b81e1d78e32afe4c919dfa9715e3477728e5b485d87a49151a563823410ea071 WHIRLPOOL f5e0d1382adaf51fdf2556c84c55ff462572cc03051244ff724b98b160dab6e187b655c78966947a8e125c2fda592062b186df1e307d00791b1e4f317d9c9a6f
 EBUILD nvidia-cuda-toolkit-6.0.37-r3.ebuild 3534 SHA256 21fcc770d3138d2e95a53a662aa38a8f4bdbce2b1027a1ddc3de8a315942385c SHA512 c04964fb02a9cd93c72f76f5fde1b6dbe218579b4e9c66c8aff61f54ff0565b6bc14ed3db25eecc0ab429b0f28dfc2a45671a945396da3b81da162a69842169f WHIRLPOOL f2c0fc8e1f32164296dd53dfcd16fd850b32f048474b56ec15414db584148abcf1108ee0b283240d4d126439659388a5836ec49ad4e3c71b4cc5eb37095416ac
 EBUILD nvidia-cuda-toolkit-6.0.37-r4.ebuild 3580 SHA256 37c64256a8696999fa3dafb423fdf9f28cff30ca6081527ea28cd2f8852d9cb6 SHA512 0eea8cfb4a1bc9cf1cc130129a47fc0694a3121edec20ada4d4b09a394e5bc622d5397373aa0ce33899efd64721ce19eac39ac06c02005de429036d6dc14a8d3 WHIRLPOOL c544219700b1b20237b6722fa338c5f2c4f5399f3b9cfe3657a7e045e71328972e2059c755c29e5c62529c08f04782cdae45a77851e697af46f00b3f6d7108a0
-EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3574 SHA256 6b90c7c816ac8f3caac79e0ef446b5bd8c5c85df8a68471c71678d463e545939 SHA512 1e335ab1dfdeb57f4dd603690e5d8e5aa703768fb262c1bbd7f78b0068374fa3bb69970ba73e24c6eb03d297be7a1eb35777ff9dece027e46d5b8edd848650ea WHIRLPOOL cab2c428d514c22db4e73cad4768b194df3ebf5ef7646e14175e034a1bf04d65d8bced733020c020fb6edf54e8906b1dde14b8596b119dff9e669455d23ff531
-MISC ChangeLog 17388 SHA256 58789b31f58232807eac604939b76fd4db02c3646eca683d0f90edd138a1337d SHA512 63b665b065b058349356413624fdc31a3287400300c33e53b3cb3e490d3254625b125e4142011f9480bb4bf8ead17bbf8705288db80d79efef6f0d995e9fe138 WHIRLPOOL e7852e0bdce16318f321089d289d503f2693be33f861ea8fb557063e7aee5e61f286d8b5157d760f7fc957556ad59300dc33749d2a35a1d6575de2013d4669e8
+EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3621 SHA256 ac6b0a0a53f20646123b55aafea475ce0bb0d086642731f543c77e8cd66c8b4f SHA512 a2cf92281b3078d4df4886afa80e7f2e1fa53be22a12d12e916ab35cd26f0753c658579f4cf27283da551577e640e1e42fd38f4d95755b5cd0c6c0f17e5d9a64 WHIRLPOOL b3569f8c470f6563a8ad44555289a94a06a49a2ad9adac6f92afd7e42862d4c337bf51942e4fab40c5484ea7b0e23309a3912bcf977ee6130cb9dc2f7129eda5
+MISC ChangeLog 17529 SHA256 417d7844ac726d3e49f45eeff7ebccf0934044fd0c7964db77432badab92720f SHA512 7d25401168752418778030278129fe3bfcb2a75df71086b1cbca2f13b12b2ea5bd5799e0dc1a5bd031ac46dfad9012c384a0185f8d271b3d65063f09fe4080bf WHIRLPOOL df901c9d0cbccbebdc95b02bd7f7a7543777a63e702f49c6d21f612365937415eb297dac3f57514e1ecc617eb460dac75a5625477cbb0d1161fe6c123e97e078
 MISC metadata.xml 506 SHA256 16d98da28f74ec82ae271f04e456547db8da2a9c576bf262ad897f4a3259fb56 SHA512 c1be2bc00a75ee9db0339938964d80214648df5a6cc16f3d1250f80d3142a1e511750dba34b54794227457db0d1a0f5ca4f692f34b9566ac3f58fef43196626e WHIRLPOOL 02f0c08cb4ab40b543e23c51ae81a7f04e452f3949808bd29a2790c565c2739d131d4d19fc3d4d279381a5ed05ad0623ba560aba82f7a3b510e44f8cf35c6473
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJUWj+DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirVYMP/3wMsa/9CoT3W4/bzCUpEcne
+cZqHsrdi8pYBnjRvhK9197e2c3pFfiZVZpyok53aDGrPf7D0CHGvqGvk7HDE5TiO
+b0mXKr5keJVcN+/tQNmHM9OolHPg3Hpyc0a3ubvMK6OwKrSi1YoyT6DFWVIWGNHv
+raXqVOKfMNXwUWKGaXmb9UXrPtBIP1HsS0QcxjbfBc1rqII2JeUFZKf4LYWmpmRf
+9Y3yxekxXAfoSVqw/KAgeAXVGVyeEodfqKyASbzdjrqksyB0tAFk7BLotEsAYbiI
+gKyGuWtEYSxzTA6R8XlQrDGemrkEn2qrKcgK6MvoSAMO8Q/eF2sjUkkZaZ+zhNdV
+OcHqlEgqD7CZfLe2Kh75bTZwjCzRiRtgYrskLDnX4bRDMKq1Ar9ElUe9twEuVNKG
+PXpYH2Ymhy6Un06kaaqwdxAVWf1dIawBVnQR+RksL5+73rLNccbBVEpuVeT+s+Yv
+kk2BK20xuh4uZZfD5rYWImTsV653UTvNBzbaElQQv6ZQonJG7qz6VAOeL8tHZodm
+Xl1CGG04qTIL/eyIZOaxZn64oUuaq9L7peYiqYqks3cuSFUeQFMBMyeOoRm9eJyS
+lbnwrHg6ZaeapJJifYlDMXHnv6OlvNtoq/PJg5hNnV1YGDbYBkdkVXsbfTXnwwbr
+84BCv45B1gVXnng6HHFt
+=vsNJ
+-----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
index 2a974b306038..4a7cc38ed468 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild,v 1.2 2014/09/15 18:54:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild,v 1.3 2014/11/05 15:17:22 jlec Exp $
 
 EAPI=5
 
@@ -69,7 +69,8 @@ src_install() {
 		dohtml -r doc/html/*
 	fi
 
-	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	[[ -e doc/man/man3/deprecated.3 ]] &&
+		mv doc/man/man3/{,cuda-}deprecated.3 || die
 	doman doc/man/man*/*
 
 	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
@@ -103,7 +104,7 @@ src_install() {
 	done
 
 	dodir ${cudadir}
-	mv * "${ED}"${cudadir}
+	mv * "${ED}"${cudadir} || die
 
 	cat > "${T}"/99cuda <<- EOF
 		PATH=${ecudadir}/bin$(use profiler && echo ":${ecudadir}/libnvvp")