bump to 4.2 with a few style improvements ;-)

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 130 insertions, 16 deletions

diff --git a/dev-util/nvidia-cuda-sdk/ChangeLog b/dev-util/nvidia-cuda-sdk/ChangeLog
index ace56d6f92a9..964d4aeab350 100644
--- a/dev-util/nvidia-cuda-sdk/ChangeLog
+++ b/dev-util/nvidia-cuda-sdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/nvidia-cuda-sdk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.30 2012/02/05 16:39:02 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.31 2012/07/31 07:37:19 zerochaos Exp $
+
+*nvidia-cuda-sdk-4.2 (31 Jul 2012)
+
+  31 Jul 2012; Rick Farina <zerochaos@gentoo.org> +nvidia-cuda-sdk-4.2.ebuild,
+  nvidia-cuda-sdk-2.02.0807.1535.ebuild:
+  bump to 4.2 with a few style improvements ;-)
 
   05 Feb 2012; Michał Januszewski <spock@gentoo.org>
   nvidia-cuda-sdk-4.1.ebuild:
@@ -168,4 +174,3 @@
   +files/nvidia-cuda-sdk-2.02.0807.1535-make_cpp_fix.patch, +metadata.xml,
   +nvidia-cuda-sdk-2.02.0807.1535.ebuild:
   Initial commit.
-
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index ab4df88bd649..9c35cba5b5d2 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -1,16 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
-DIST NVIDIA_CUDA_SDK_2.02.0807.1535_linux.run 41918865 RMD160 0ec9bda0e077660540a5a857ba63dbec78611c5e SHA1 5b2e316de5ce35178f6cac9b20e71a51c140f84a SHA256 5ceb6ac9d973b7d3544ed5ee3c52de40451ca234df587fb93bd3c5b73f5610c4
-DIST cuda-sdk-linux-2.10.1215.2015-3233425.run 46618139 RMD160 bfbadee2b669d72e038abf34cb200343a3826465 SHA1 3ef64ffd9d1bc0afe351c80f07d5c2a87e7e044a SHA256 5d9521f049312fc00fef9e9ed6fa2bd8475e0d309dab109da4b663461d9855bb
-DIST cudasdk_2.2_linux.run 55951278 RMD160 68c05b95b2a1f9230b9a076f1d9cf150d877d8b6 SHA1 72a6877c649a7444a853260d21387ed8a80b98c8 SHA256 1962a0a0795a8d2aef7c4e113319bd0bb376a7bb553405d94d731e594ef316fb
-DIST cudasdk_2.3_linux.run 66005555 RMD160 e6995f190663ec5826f986420f2c02920a484444 SHA1 6411d962d251cede1fac0eb6eaee001e00c053f4 SHA256 26ec80755b124a8484c93a6481a3c19f4fa7fdae96b087fd889346981c463873
-DIST gpucomputingsdk_3.0-beta1_linux.run 108531376 RMD160 f474240b59f3f14924b12134e7c3a75754ade330 SHA1 27a77b8304198814f5ea3c4a158108e3e5d0b0cc SHA256 43b1ffe2a069f5e509efcd476d47a2595bad0db8a6967d91375e706445b9b016
-DIST gpucomputingsdk_3.0_linux.run 100306703 RMD160 5850ac6e4c80d5b8f01dfb1f4b34500bc3264650 SHA1 5e1e32a8d27249ea1a427256eaffee7c1f885d21 SHA256 7a3afdd52023cfa49bc67182729ce498cc85fa370dcd4bd33c299fb75945ec5e
-DIST gpucomputingsdk_3.1_linux.run 222010279 RMD160 5ae82967b821dfaa8a0b90fbbf2a20c4fd8ef892 SHA1 8b78733e909e52b4e14bdfd8be986bb420268320 SHA256 57d71cf889df7bbbc8b18ba5e74b2dd9e5a64951867c007d63577c2e07afd7ce
-DIST gpucomputingsdk_3.2.16_linux.run 127914287 RMD160 56bde63eb2c0ea5c6ca0844f202154eb1186243d SHA1 8d98df6ea831d268259eefaf33340e619c5a9e21 SHA256 e815d80e183f4a77ddd5e3d5611432c387102c786d12a57c983b69ad74ce3e45
-DIST gpucomputingsdk_4.0.17_linux.run 129498736 RMD160 c5b80e9d58589733f228b90a8598f779f3af78a7 SHA1 8b1bc9bb0279cd842af98253eafedfa0b47068fb SHA256 d62baf4963ca58d7db711e0366439e2c63bc84ce6c513c8a9dfa82a0fc51f102
-DIST gpucomputingsdk_4.1.28_linux.run 155378846 RMD160 e2ddaec1f75d6620013ad8f076436f171d25df45 SHA1 3f533bf68fd72dd915c0f7cb115992a4dca67eb1 SHA256 1d6c6b6b25ae70d7a725cb89a06644b7101a63c1508bce69daacd32b32b0f6f9
-EBUILD nvidia-cuda-sdk-2.02.0807.1535.ebuild 1696 SHA256 184c1a6f0525790afe0c18e3f9b1c2f8619e3d7ead83d36e1a1543c8cef9f865 SHA512 f02283450e0e8c4764648bd920937579d3f6dddcb441693b2e4ff9792324c86cc94c50d52e882165c7058826824d2d807ade47ad8374ba3b20e05358f3daa9a6 WHIRLPOOL a1ff0855fa12163b43538610f30036fde5ffc8d06aabecad105d7a13c2452773bbc7dc4165db1351b43a3fb881d4aeca57fa461ab265e796b2e2c0e6cfac6e7d
+DIST NVIDIA_CUDA_SDK_2.02.0807.1535_linux.run 41918865 SHA256 5ceb6ac9d973b7d3544ed5ee3c52de40451ca234df587fb93bd3c5b73f5610c4
+DIST cuda-sdk-linux-2.10.1215.2015-3233425.run 46618139 SHA256 5d9521f049312fc00fef9e9ed6fa2bd8475e0d309dab109da4b663461d9855bb
+DIST cudasdk_2.2_linux.run 55951278 SHA256 1962a0a0795a8d2aef7c4e113319bd0bb376a7bb553405d94d731e594ef316fb
+DIST cudasdk_2.3_linux.run 66005555 SHA256 26ec80755b124a8484c93a6481a3c19f4fa7fdae96b087fd889346981c463873
+DIST gpucomputingsdk_3.0-beta1_linux.run 108531376 SHA256 43b1ffe2a069f5e509efcd476d47a2595bad0db8a6967d91375e706445b9b016
+DIST gpucomputingsdk_3.0_linux.run 100306703 SHA256 7a3afdd52023cfa49bc67182729ce498cc85fa370dcd4bd33c299fb75945ec5e
+DIST gpucomputingsdk_3.1_linux.run 222010279 SHA256 57d71cf889df7bbbc8b18ba5e74b2dd9e5a64951867c007d63577c2e07afd7ce
+DIST gpucomputingsdk_3.2.16_linux.run 127914287 SHA256 e815d80e183f4a77ddd5e3d5611432c387102c786d12a57c983b69ad74ce3e45
+DIST gpucomputingsdk_4.0.17_linux.run 129498736 SHA256 d62baf4963ca58d7db711e0366439e2c63bc84ce6c513c8a9dfa82a0fc51f102
+DIST gpucomputingsdk_4.1.28_linux.run 155378846 SHA256 1d6c6b6b25ae70d7a725cb89a06644b7101a63c1508bce69daacd32b32b0f6f9
+DIST gpucomputingsdk_4.2.9_linux.run 152436489 SHA256 b6a53afcf8f8422b5075aa37cec6730b0b9896d50867ee9105da05d62e95b8bb SHA512 1975f005ebd1520005d0a45ac680c8b49806705b8ed64738366b7166f384a304de3d655a05900b6da1088441024b149a1e963296ef78041c524ecbb1bb5e5315 WHIRLPOOL b8ce1f1f6a54b2d52f2531cfbb46f2a48e0b37f0c1dd898ff6222483afed7ac26c6bc57da31cafb0c30b3636b780ace3e3c679f25c6c4eaa26b0e39da00dcb8f
+EBUILD nvidia-cuda-sdk-2.02.0807.1535.ebuild 1699 SHA256 49edb1f4fb13ee4832ca93b941f98fd2a2437dc3a98bda7a6c72442eae47cefe SHA512 f25d32f029e910bff6400cf9b36416200c266fc937676062dbbb883b63eddf5e43735d72ef77e5d13a37f7833a1ea439753477b8e80d07aaf86fe92632c44245 WHIRLPOOL 74d5f4cc23ad3bef82e36a85daf42bbcac99c56cabcf22d355f7202bff4938580867dfd7154e07e819f7d75c89e40693c36710d1c82bb6f57552fdf229fd4cf7
 EBUILD nvidia-cuda-sdk-2.1.1215.2015.ebuild 1806 SHA256 6c4fe593a744c7d90b109c6e0ef5ef8f11258fd159cbe8fe5d7b9a0280419e69 SHA512 7923c0013fc0817405a5b4670b59a378c2ff5165ec0c85248152923de244181d40e7a35a8b0837d6a0a06cb0952b29d9bc30cf9107001045aba19ca583f35c6c WHIRLPOOL 01253bb50afb6f5389666b0491f5f6823dcaef92dadb3279056ef26417539feef171259d046c289bf159fe33cbf3d6f3e2ade03dd07a6b38021ab486f2bf366e
 EBUILD nvidia-cuda-sdk-2.2-r1.ebuild 1866 SHA256 b3e111c683d897c596a5206c053bd9dab3afea9d761d9103959a039cdc673d8f SHA512 64c34e65a08145f379000a0f520aedcd748fccc31334ed33f9cfeece95af1a6749ddcefb622ed8c72c7f7358d8e18b7f156d8eb0a02553133a87d52cdae8a4cf WHIRLPOOL 93b151295b17c6229af29023482fa1732b76e3f6b61b0e53aed1398a514430e43ffd295476d242effb4d2bdba2b63e9ad92fdbd5002eb7bd32654b72ff7cedb0
 EBUILD nvidia-cuda-sdk-2.2.ebuild 1692 SHA256 22b50c9e6987cb6103cd8a135ff3b9d7a5452f642582649c378df77079324a31 SHA512 9285db84ec8f0878de657cd71461133499f315a2e7ba60b128156076438dc9df619609f0222890170d9e0ae9ecc53aa2b622a99bc8210b0903fe2ea808e0d9b2 WHIRLPOOL 3f6e11b724fcba95b911e4ca2f1132fa8e66924aaaf1c3dacce50b29fa99f52c46110e2b569d8ece48955e84888fb6f2a89d1888a03d05bdb0995d3d56345c67
@@ -21,5 +25,23 @@ EBUILD nvidia-cuda-sdk-3.1.ebuild 1590 SHA256 350a1e2edecc8f6a69997a69d372eed373
 EBUILD nvidia-cuda-sdk-3.2.ebuild 1906 SHA256 745a05d7c1f14c043faa188f42a2d3652cef018e6d0f026a243f591cadbacf2e SHA512 8d098fd0eb94698605bada7699d10dc373176c901029e23603d406e1e2afb109af6fb3453127db55b272904fa93fd235d6d6b1aa78103092e7b19b8d8cef7149 WHIRLPOOL 139ed58ccb0527a6b074d0524b387bb55ee174e554ba0da8147deaab41878160802e123486233c4d7625fb6ccc818a6a533cef8189fa5239c74f781c71973ad0
 EBUILD nvidia-cuda-sdk-4.0.ebuild 1901 SHA256 78fe86cee014224c074a4b0fbe554f3f7a1fc81dfcf0d7e69fd369f34d35a3d3 SHA512 bcbdc902debe75dbdc9cbf4f77a35981bc0a0fdbb6b3d1bff257a7a981db79302053c1b3051ca54f370eb2f3b4df5f85f6475385f44939ab4f8fb08766443d8e WHIRLPOOL 4607638a2fb92c3264a3970580800df7fb7e1d5a26e809bcfa9a3043f4837c0055831049c6f8a945d4af016689af777af17d9677c2927f1e11664c26dcdd39b6
 EBUILD nvidia-cuda-sdk-4.1.ebuild 1949 SHA256 94ceafffe0f6faef50166987d6ff8b5c333eb0ee86a1efa779ba09203d74e944 SHA512 6bd39bb7f264e8f46b70c88c6973c4c63095fb8becf57819062545c0336cc7d41ad1e2767630692344d20e0f265b8c0e43dd88e35e6af69036815ceca78d1fe5 WHIRLPOOL da96496074c24b640daee672074a68071f9e8bf192a6a99b0c711eabdb28b9be3d4edf4aec9b4b38833d26dc73bf0418ed3e54dec95db5279118fea00eb5b0b5
-MISC ChangeLog 6276 SHA256 5a7d91e713471772c61ac3420ae03b7f97ab374e864115eb6f1058f25e59db29 SHA512 0f332bc6d855e43861fdff7fe6236c12ed87091c4e17c1f9160b88731af9da145744527751db15c54b6a74962730e66e1ad25cfc9707464797c9c879ec3489b8 WHIRLPOOL 72a4a75ab808eaeeb0a18ef4184829a55db4679a5680164fdf17ee0c7dc3b1f504083b97414ad907ac6a37ea2f818020f098b9be26c2c86cd0719d9ab81e1a3d
+EBUILD nvidia-cuda-sdk-4.2.ebuild 2162 SHA256 d12a8937df93c668aa65e58a5e08a59f33b6fa10834b6576d41e4831ff001202 SHA512 d0b34f5f8ee1675b229eaa2a2a570253eb358f2ec74dff4a2b97f5eb09d353093fa952d612e613aab6936863ba0199548bfa63bb30303000885da221a3dd1fba WHIRLPOOL 0fc93b566c492fff7422f0780bf7ee82a3445deebcee03924b1cd3b9f0b3341d1bb5766483caef6e8e0c1dece6cfd5838565ade5bfd215bf61f4a5d36bc1df0c
+MISC ChangeLog 6484 SHA256 de16c39a0e3d283d433e790483bbb9d47722be3911d7440ecf9530dc6059c9ce SHA512 2a66e6f7dd6026deabdb5da59981acd88546b5201bfb609fbe3ea828c6b3f2a3d79dfe238231823c264c62718cfe61a4ebad926cef2b419cb6c080c2f5ce83be WHIRLPOOL d9c17ee2bf37cd89188b5a4b2d26bf0caa16832fb02ff46f0ece468f1991deb9eb22d867f80d5b883a9435df2d5eff3048c7202453d1aa9619c4804b6b8d316a
 MISC metadata.xml 511 SHA256 ab7e95980637caff4f08e6ffbe8101e6ec99b7b04f1501d39a604ff7c7125862 SHA512 206bad84251109ac1c43704a8a1177dcfd783c4c92bf9b93502b454a4f967978b07d9d9ab7b7700882504de65cad0fc5163a7a550bdbb76a4d7b36bfead9ee1a WHIRLPOOL 856440c3058706839f4fd698f322f3e6ab54e5843709167a068e512d7e5004e4780e0cb63ca688d524ebdb402218d722f711c7af9a5b88c8c0d6fd6dca461c40
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJQF4vQAAoJEKXdFCfdEflKC00P/3lkHwwiNrax+FVQDydke5iB
+LzWDj2voEVng1aF2DjOUSfkR1ie01gUw29h5Uhxp4tLsYrincSpV6y3iZUwdV1CT
+T+5y3g9o9QYsGFCJCfXTyFlcmxWs3vbB0BObq82Kvt3oy1bK6nLSf5YshLnObLAv
+MVmXXLV1EKM5d7g0j4gViKGbr4v081gRDof4YPtHVXMNw1v3iasSER0Y4IBaUti0
+K3OZqSacCm5ir/GneC9ue2xjOZ5S8VQ2pebJfexlWWIMoM6ua+TQpDvoo1YTjnAV
+kJrtj7yRwZoFuC5dqdkJno7y6Mph0CFRpetoIasHs8iE4cXpXJOYpW4oWXKmfWjg
+4on2RVoX3MXJh5UG7fgAB4hkYposZ2G8PuZc+CK550xRZTUea250hVdq8pxIpsk4
+7FBhbV8ofJqMg7uFgqK1MHGHgjcbV6M2kui5MUvImdfrrJyI+EbxrICs3IGSQHQq
+yD/G3sjZtNr0bw7hvJ9svV46Z8iA/Wg1pC6HxxkH/ZEunQxDwEIopDO958ZApdnj
+ztKx+ee5s4N4E/6iBcrEAmaK9LDobMNzUAn9wY5LbsCzeRfr20vUM/NJNQVep76V
+PzOIqluuxZxwSmvWiePq6kF9xynJRj/uSgU49PwG5RhVfZKQ7rbsqi5tixD4FHlk
+HPq7MU32xU7aCpT7IVNq
+=QyrU
+-----END PGP SIGNATURE-----
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.02.0807.1535.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.02.0807.1535.ebuild
index bc7fb56968bb..796654fd746d 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.02.0807.1535.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.02.0807.1535.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 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-2.02.0807.1535.ebuild,v 1.11 2012/02/05 06:27:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.02.0807.1535.ebuild,v 1.12 2012/07/31 07:37:19 zerochaos Exp $
 
 inherit eutils unpacker toolchain-funcs
 
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.ebuild
new file mode 100644
index 000000000000..bb2ed9da440c
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 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-4.2.ebuild,v 1.1 2012/07/31 07:37:19 zerochaos Exp $
+
+EAPI=2
+
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="NVIDIA CUDA Software Development Kit"
+HOMEPAGE="http://developer.nvidia.com/cuda"
+
+CUDA_V=${PV//_/-}
+DIR_V=${CUDA_V//./_}
+DIR_V=${DIR_V//beta/Beta}
+
+SRC_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/rel/sdk/gpucomputingsdk_${CUDA_V}.9_linux.run"
+LICENSE="CUDPP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +doc +examples opencl +cuda"
+
+RDEPEND=">=dev-util/nvidia-cuda-toolkit-${PV}
+	examples? ( >=x11-drivers/nvidia-drivers-260.19.21 )
+	media-libs/freeglut"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+QA_EXECSTACK="opt/cuda/sdk/C/common/lib/linux/libGLEW.a:glew.o
+		opt/cuda/sdk/shared/lib/linux/libGLEW.a:glew.o
+		opt/cuda/sdk/CUDALibraries/common/lib/linux/libGLEW.a:glew.o"
+QA_FLAGS_IGNORED="opt/cuda/sdk/C/bin/linux/release/.*
+		opt/cuda/sdk/OpenCL/bin/linux/release/.*"
+
+pkg_setup() {
+	if use cuda || use opencl && [ $(gcc-major-version) -lt 4 -o $(gcc-minor-version) -lt 5 ]; then
+		eerror "This package requires >=sys-devel/gcc-4.5 to build sucessfully."
+		eerror "Please use gcc-config to switch to a compatible GCC version."
+		die ">=sys-devel/gcc-4.4 required"
+	fi
+	echo $(gcc-major-version) $(gcc-minor-version)
+}
+
+src_compile() {
+	if ! use examples; then
+		return
+	fi
+	local myopts=""
+
+	if use debug; then
+		myopts="${myopts} dbg=1"
+	fi
+
+	cd "${S}/sdk"
+
+	use cuda && emake -C C cuda-install=/opt/cuda ${myopts} || die
+	use opencl && emake -C OpenCL || die
+}
+
+src_install() {
+	cd "${S}/sdk"
+
+	if ! use doc; then
+		rm -rf *.txt doc */doc */Samples.htm */releaseNotesData
+	fi
+
+	if ! use examples; then
+		rm -rf bin */bin */tools
+	fi
+
+	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/sdk/${t}"
+				doexe "${f}"
+			else
+				insinto "/opt/cuda/sdk/${t}"
+				doins "${f}"
+			fi
+		fi
+	done
+}