dev-util/nvidia-cuda-sdk: Be more sensitive for presents of files when cleaning, #452944

Package-Manager: portage-2.2.0_alpha158/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 19 insertions, 14 deletions

diff --git a/dev-util/nvidia-cuda-sdk/ChangeLog b/dev-util/nvidia-cuda-sdk/ChangeLog
index c2fd4c826300..4c5660c2dc72 100644
--- a/dev-util/nvidia-cuda-sdk/ChangeLog
+++ b/dev-util/nvidia-cuda-sdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/nvidia-cuda-sdk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.35 2013/01/16 13:03:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.36 2013/01/21 13:30:08 jlec Exp $
+
+  21 Jan 2013; Justin Lecher <jlec@gentoo.org> nvidia-cuda-sdk-5.0.35.ebuild,
+  metadata.xml:
+  Be more sensitive for presents of files when cleaning, #452944
 
   16 Jan 2013; Justin Lecher <jlec@gentoo.org> nvidia-cuda-sdk-5.0.35.ebuild:
   Add missing dep on virtual/mpi with USE=examples, #452040
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index f3e552a67493..ae1ac7a91d9c 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX nvidia-cuda-sdk-2.02.0807.1535-make_cpp_fix.patch 3398 SHA256 1b8038fe9ceef35e29e34a30514d16c0e27066311fd7d16e8953b5deaa01da6c SHA512 240108b83f212a06ad34dca5e7d6dfb0bca957df4f75517d253478b79bf5d43a0605f17581b3830670fdc2e61eab582bdcb16a422ac706728a7979de53c91b5c WHIRLPOOL 092d7c96938cfc091a19c36bddb5147e376781f7bc2c310aeb695b4b8e505e2e4448575b31d9a51f2db5161cb3f19eb6ad769f9ece10f2f80651bd3ce08a40a9
 AUX nvidia-cuda-sdk-2.10.1215.2015-vararg_inline_fix.patch 785 SHA256 b685cd8915e45494c0c8c458f607c46d4716deae26442bf62ea9bf8bc3e2e942 SHA512 e877a1dba1c66f5ac881cb2986d70fb03c610f93310b65a09fc582b8baea1715e63266dfbaae91c6cf2c909d9d725032f76604afe3a7634e80c0a63dc451339e WHIRLPOOL 72c3bb42ecff9f5723c5491bd115f29327b5e9ad4119be289c9a914436470fb7b9e0149221623227d00bc0d7e15454672e8f4ff1d86b3aa4a59b8d53fee05907
@@ -14,13 +14,13 @@ EBUILD nvidia-cuda-sdk-2.02.0807.1535.ebuild 1699 SHA256 49edb1f4fb13ee4832ca93b
 EBUILD nvidia-cuda-sdk-2.2-r1.ebuild 1866 SHA256 b3e111c683d897c596a5206c053bd9dab3afea9d761d9103959a039cdc673d8f SHA512 64c34e65a08145f379000a0f520aedcd748fccc31334ed33f9cfeece95af1a6749ddcefb622ed8c72c7f7358d8e18b7f156d8eb0a02553133a87d52cdae8a4cf WHIRLPOOL 93b151295b17c6229af29023482fa1732b76e3f6b61b0e53aed1398a514430e43ffd295476d242effb4d2bdba2b63e9ad92fdbd5002eb7bd32654b72ff7cedb0
 EBUILD nvidia-cuda-sdk-4.2.9-r1.ebuild 2694 SHA256 0d687414fceee695fb4280afccd274c47d92e8f14e1f2c8cf2e548b45b37cb48 SHA512 b1a1a4970c832dd585648d61f89944e3a2188e791f76e71cf51fde470a7057b570dafbb604ccba56538d7c1c65d9e6fb6fb060a8121d662f99c320044eca7628 WHIRLPOOL 677abbbbeb4fdd6c7a7ccc376a26982291cbf093583c71bd66b4b3e392f3ebdd45142ff362a46fdfe7142faecead57b44677c7b50f7854ff6de2017a0b5a86e7
 EBUILD nvidia-cuda-sdk-4.2.ebuild 2162 SHA256 c83500a984fcb07aac12e1dfd37ab5867ceeb7887385f21052f4e92a63870440 SHA512 f6e80b7d74e5b0af66622e00ccccc3e99aa97052f78664fd7bed8232c6d8325e0b84dcad3d1f3bbdab2af948fbd2451d00e9fad086ddc30325fecd600a040a9e WHIRLPOOL a7b4f1ba9e268cecb3221edf2012b07a90587c4b082506db00fbf32a5e6a0477c394db2057ef548a2841670bf2ce0a4e825b51abcf0b3e346f031eb661a5963a
-EBUILD nvidia-cuda-sdk-5.0.35.ebuild 3728 SHA256 f1616071850fbb891bbf9130f8ada9291147f1d830c0ac87fa8db053ed0764ed SHA512 a2eae624b84ba65bbee7e8fbff614ce6a90a33567e489bd24f46bc2a75a8222a24d31df6e3011635e032a01cf48a51d0fdb6966b67f1f0dfd887bc77fdbd6b86 WHIRLPOOL 08995500bcd0eedbb542b0917fb9bf2526b09a130fd6a75b41b21f5bff2e98e9cca4b88aeb9976f3f71e07eb67a9ca9e88ac90a149c0beffe394d66b19c38cb1
-MISC ChangeLog 7384 SHA256 44eac9fa44700f607fe35b8e4342d0d2d6a69ed2f1a2a4ffc8b7f5e52581ebb2 SHA512 19baa4a806fe939947dd02c1cf2eda48fd9f54972f2399cb01129c4b2fc2edfec90cc2e9b6b7907cffd98acdf7158e271d7a4b0cf4943891b911c3c4f4e4450e WHIRLPOOL 3208bb34271cfe60fc9bb4a71dc0a04ae4400346cab7f91a799a543d901da7636edb6cb7b02cbb6d735efd7e00a42c4f4885c6693a1329b0f646ecc9a9d38271
-MISC metadata.xml 517 SHA256 1aede748d6dc118133164709ea3608bdf3b444849567233b8de006220101aa54 SHA512 59cb3baffc3906eca065e196afad29f073eaa8baea5c18aa942c585822d3a5ab2abd2523141df4108c3fd39103d5c0b8fbbc6227a1908a494a5ec58c8c084caf WHIRLPOOL b8a4057436706876f511ff6b5267781e7140cc2f9c70a1609fd7b852ed9ee3a15d26b0bb41672a811f1efc081edc2a10b0aef6a660a1025aac541c2a75929f73
+EBUILD nvidia-cuda-sdk-5.0.35.ebuild 3733 SHA256 ab0d09927eb1ee3b4625b0f28da116dcd2fddabf4583d2cd370f9ad3338276e8 SHA512 ce29864ed027dd54a502003636b3a2076a7d4575bde94fd55158feddb3cb343f1b175ccfbad9e7389b12b848cf12b4c159a0964e8af80fd828429d88a45de1ad WHIRLPOOL d6b3048fd430aab767b8b833fe87110e2005c72c218764a4066ca7e3d5f57e881cb9f07b3dc0cc18a7ee3b90628825f5c68381a57fa5ac5a9b6d4d3fa1d0865d
+MISC ChangeLog 7544 SHA256 8c131a72e13138f0bb98d2c3a9075edf79125f16108e6592d0dd419b772f3742 SHA512 cc154e8d332ff8402bced230e8520386df78648e6fdccad6fd8e616789a355fc509523224c30582193debb9b0e590ba70bbf5db96f3a38e41edebcac6bd35b9b WHIRLPOOL 60b2c1803bacdc2eca79b12bcd1c354fb88a39f2ab8ed537f592afd1bf27f2418afa0a307fc24266d9cca0a00a4b23fdfaf314c838e35e39e10e5fc8969e24d0
+MISC metadata.xml 536 SHA256 3da647c87e8de0cfc06fc065a9ada0e3ad174269ab4b03d70813e75f5b768639 SHA512 f15baad2d36378791b0a256812becb55dec29b98ce2aecf4f7e54148d09a9dda1461d12dc652e3be7a8fed61e4d844c18c6d7ea80e924c77b76fb5f185e40568 WHIRLPOOL 51ede006137c1a3037934f33c00b1bfa45846b3bd60d9d61081a89b89215c0ffbfeb8d0725e62504d22e50699ddc8b6eb917ea220c00afa05fcd9c98167cc5ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlD2pTUACgkQgAnW8HDreRYWvACfY2sOIfyvlTZlBO2oTcSLuHdt
-Ls8An0Oz091ZnUKCY6GxN20eXXrtPaNv
-=YWTN
+iEYEAREKAAYFAlD9QuEACgkQgAnW8HDreRbcnwCgv2WNq73klveHaUIJIw+WI+eV
+O08An1iR5AKIqSEV0zxrz7asj7nlBdot
+=tNlX
 -----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml
index 986ba17d5545..71cb6af96a3a 100644
--- a/dev-util/nvidia-cuda-sdk/metadata.xml
+++ b/dev-util/nvidia-cuda-sdk/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <herd>sci</herd>
   <maintainer>
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild
index de83a07077c1..f9dc7a7f3ca9 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild,v 1.2 2013/01/16 13:03:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild,v 1.3 2013/01/21 13:30:08 jlec Exp $
 
 EAPI=4
 
@@ -108,12 +108,12 @@ src_install() {
 
 	crap+=" *.txt doc Samples.htm* releaseNotesData"
 
-	if ! use examples; then
-		crap+=" */bin */tools"
-	fi
-
 	ebegin "Cleaning before installation..."
-	find ${crap} -delete || die
+	for i in ${crap}; do
+		if [[ -e ${i} ]]; then
+			find ${crap} -delete || die
+		fi
+	done
 	find . \( -name Makefile -o -name "*.mk" \) -delete || die
 	eend