Add an enum fix for gcc pedantic mode (bug #311657), fix a typo in src_install.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index be47d8777139217ffde9b15b60ab845f6bb03420..21030f64a4257eeb98a75cd61eff5bbb3af939ec 100644 (file)
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/nvidia-cuda-toolkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.21 2010/03/25 21:33:47 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.22 2010/04/01 21:48:37 spock Exp $
+
+  01 Apr 2010; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-3.0.ebuild,
+  +files/nvidia-cuda-toolkit-3.0-enum_fix.patch:
+  Add an enum fix for gcc pedantic mode (bug #311657), fix a typo in
+  src_install.
 
   25 Mar 2010; Michał Januszewski <spock@gentoo.org>
   nvidia-cuda-toolkit-3.0.ebuild:

diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index a21c066f60864aea951a63f4924bd36734d1c8bb..8713c9f3e5705a5f200fee0ada46314b6093b1fb 100644 (file)
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX nvidia-cuda-toolkit-2.2-enum_fix.patch 1901 RMD160 74aadb45017c94404d6379a0f94b62db38d74656 SHA1 5b79051ddb2701c80331b64d376e6c106c38def6 SHA256 a1917977a94f0439ca3e28be0eb41b9e5c0ca9c03f3a22dc91d6bfdca253b258
+AUX nvidia-cuda-toolkit-3.0-enum_fix.patch 2460 RMD160 df4fa802d2f5b9bdb53bf321145894eba2669ce3 SHA1 daf02f05256674d17c43eccadf12859cf05f10e0 SHA256 7256247bd4def308b263a547b4c0f342c687f11cea17fad527859452417a4cc6
 DIST NVIDIA_CUDA_Toolkit_2.0_suse10.3_x86.run 18966963 RMD160 934922578b3320e2cacf4e08a3a51cdbea87be21 SHA1 2e783ed52c73e76655bba54fc83df8b55d6450ae SHA256 fbf3cddc6a7039b853b4c8eb89b2aeb5eb3430f44d95e2e1ae382f78ae90c07e
 DIST NVIDIA_CUDA_Toolkit_2.0_suse10.3_x86_64.run 20245140 RMD160 134b76adc0645568bd7484c085539dfb53e95d89 SHA1 60d8348366d547ad18e44119440d0582de6440d0 SHA256 7ff2685e32e54351a4556d65fc2a2e097e08901614b6763d14ac31824d975bb6
 DIST cudagdb_2.2_linux_32_rhel5.3.run 1181310 RMD160 44c69588df4dde25b93fb9115adccbf2a00a5371 SHA1 8628be1a53251237ec31639e9acd6d95831ea33e SHA256 72ab11691bf8feb5d5dbdab440467aaa61fae3a7ddcf5002dfb3ae75b58eaf3c
@@ -23,14 +24,14 @@ EBUILD nvidia-cuda-toolkit-2.1.ebuild 1930 RMD160 bc419c515575f2df73f2819b46b355
 EBUILD nvidia-cuda-toolkit-2.2-r2.ebuild 3009 RMD160 028ec35d0a23966fe6c231bd1e1cbdf1affcb300 SHA1 db4475b4fa53b44f7141c21d008656e6265051dc SHA256 90f2b4c2286c33a37108d17117493a6c498551e25f5a8e3f6130aa48df5e92a0
 EBUILD nvidia-cuda-toolkit-2.2-r3.ebuild 3008 RMD160 f821f04dd3d5469a0ec8006f8c8e51e91ff058eb SHA1 d5ae73dcc93afefa468d2e90541a6e71a24601a8 SHA256 822932868afc62902aa12655fb378e4a7d6eed9ebbbb6f6ea73a4d9975ea5baf
 EBUILD nvidia-cuda-toolkit-2.3.ebuild 2943 RMD160 d8f811203fd37e0590e8885bfed38c944f5f7258 SHA1 08850af0cbb3c56ce8f752f9d890114ceb8f1fd1 SHA256 f58bc164b9f0a7fb2ff99d3e454912d5e1d1ef52bb8b1de0cbaa4d23d03f9f5a
-EBUILD nvidia-cuda-toolkit-3.0.ebuild 3118 RMD160 2eb65a927d176a2c41fbf6ef4367035f283ebf5f SHA1 f7d31210da63b34daa26bf35d87e32c394ddd74c SHA256 d5da413784d21708ca030ee4415982e99a7ed597df8c2a533eb478e70f02efce
+EBUILD nvidia-cuda-toolkit-3.0.ebuild 3180 RMD160 0af79883b3b50c7e0b592fb8738747ceb902d763 SHA1 83f1dce2f687ff405ed5181a725e8f8c158b708a SHA256 da1fff4627069eaf1037d8d804820edc45f8fafd50c3656cec4101c108d79810
 EBUILD nvidia-cuda-toolkit-3.0_beta1.ebuild 3003 RMD160 38dedf40fe7266c62fec3b24af3cb87d0e5f357b SHA1 bbc31963f0b1fd651b51c11b63d1961995d64fe6 SHA256 1b6255c77aa2fa022987906b8e72b442257e898b3e57e889095efc3da742a210
-MISC ChangeLog 3975 RMD160 4703e94abe205e4dbb1b759bfaf0484fab5bba46 SHA1 4d1a6858d60350badeb7848e3d1da96716ecd9ce SHA256 b65e9ac5a031bf4e290a7532ad3e0103960f37829afd632f5e8fed40a9cbec66
+MISC ChangeLog 4197 RMD160 076a8244eeda3524bf00bd8fc18b7234581476ab SHA1 16ef6710a74f06882214e44d153fc0ee08cd31ba SHA256 009a923c08ef1b3e0cc157bf6be833244f9dc935a968e881649a566db2365ca9
 MISC metadata.xml 484 RMD160 a8b809639cfc4ab4e1133dfc97d37052752741c5 SHA1 4638605669859be01b2c2dc2a0192c7f765176cc SHA256 c5395eacda061252ecad00d6172b91dcc5100b2bec944712f90a6adb122b69f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkur1kgACgkQchej4aZK9/ejnwCdHO9p1cJ9XTpeDRbsDMDGGKij
-pWcAn1wFoDwk8/g7TLnAFbtxrBkSq6j3
-=nAvx
+iEYEARECAAYFAku1FLoACgkQchej4aZK9/fWxACff7FQVawNBmt7GsPl36vvfD2W
+hJAAn2LdST7Tf1BuYPFk6L4SJF6hZOn7
+=23PI
 -----END PGP SIGNATURE-----

diff --git a/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch
new file mode 100644 (file)
index 0000000..ce11b49
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/files/nvidia-cuda-toolkit-3.0-enum_fix.patch
@@ -0,0 +1,54 @@
+diff -Naur cuda.orig/include/cudaGL.h cuda/include/cudaGL.h
+--- cuda.orig/include/cudaGL.h 2010-03-21 13:19:57.000000000 +0100
++++ cuda/include/cudaGL.h      2010-03-21 13:46:29.000000000 +0100
+@@ -59,7 +59,7 @@
+ typedef enum CUGLmap_flags_enum {
+     CU_GL_MAP_RESOURCE_FLAGS_NONE          = 0x00,
+     CU_GL_MAP_RESOURCE_FLAGS_READ_ONLY     = 0x01,
+-    CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02,    
++    CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02
+ } CUGLmap_flags;
+ 
+ CUresult CUDAAPI cuGLInit(void);
+diff -Naur cuda.orig/include/cuda_gl_interop.h cuda/include/cuda_gl_interop.h
+--- cuda.orig/include/cuda_gl_interop.h        2010-03-21 13:19:57.000000000 +0100
++++ cuda/include/cuda_gl_interop.h     2010-03-21 13:28:07.000000000 +0100
+@@ -82,7 +82,7 @@
+ {
+   cudaGLMapFlagsNone         = 0,  ///< Default; Assume resource can be read/written
+   cudaGLMapFlagsReadOnly     = 1,  ///< CUDA kernels will not write to this resource
+-  cudaGLMapFlagsWriteDiscard = 2,  ///< CUDA kernels will only write to and will not read from this resource
++  cudaGLMapFlagsWriteDiscard = 2   ///< CUDA kernels will only write to and will not read from this resource
+ };
+ 
+ extern __host__ cudaError_t CUDARTAPI cudaGLRegisterBufferObject(GLuint bufObj);
+diff -Naur cuda.orig/include/driver_types.h cuda/include/driver_types.h
+--- cuda.orig/include/driver_types.h   2010-03-21 13:19:57.000000000 +0100
++++ cuda/include/driver_types.h        2010-03-21 13:26:09.000000000 +0100
+@@ -244,7 +244,7 @@
+ /*DEVICE_BUILTIN*/ 
+ enum cudaGraphicsRegisterFlags
+ {
+-  cudaGraphicsRegisterFlagsNone  = 0,  ///< Default
++  cudaGraphicsRegisterFlagsNone  = 0  ///< Default
+ };
+ 
+ /**
+@@ -255,7 +255,7 @@
+ {
+   cudaGraphicsMapFlagsNone         = 0,  ///< Default; Assume resource can be read/written
+   cudaGraphicsMapFlagsReadOnly     = 1,  ///< CUDA will not write to this resource
+-  cudaGraphicsMapFlagsWriteDiscard = 2,  ///< CUDA will only write to and will not read from this resource
++  cudaGraphicsMapFlagsWriteDiscard = 2   ///< CUDA will only write to and will not read from this resource
+ };
+ 
+ /**
+@@ -268,7 +268,7 @@
+   cudaGraphicsCubeFacePositiveY = 0x02, ///< Positive Y face of cubemap
+   cudaGraphicsCubeFaceNegativeY = 0x03, ///< Negative Y face of cubemap
+   cudaGraphicsCubeFacePositiveZ = 0x04, ///< Positive Z face of cubemap
+-  cudaGraphicsCubeFaceNegativeZ = 0x05, ///< Negative Z face of cubemap
++  cudaGraphicsCubeFaceNegativeZ = 0x05  ///< Negative Z face of cubemap
+ };
+ 
+ /**

diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.0.ebuild
index 04e560ae1d584d0f734d169752fdb27d59e6845f..46b7492315c8da85f913907e807560e35bd94d58 100644 (file)
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.0.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-3.0.ebuild,v 1.2 2010/03/25 21:33:47 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.0.ebuild,v 1.3 2010/04/01 21:48:37 spock Exp $
 
 EAPI=2
 
@@ -45,6 +45,10 @@ src_unpack() {
        done
 }
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-enum_fix.patch
+}
+
 src_install() {
        local DEST=/opt/cuda
 
@@ -92,7 +96,7 @@ EOF
 
                for target in ${targets}; do
                        into ${DEST}/${target}
-                       dobin ${taget}/bin/${target}
+                       dobin ${target}/bin/${target}
 
                        cat > "${T}/env" << EOF
 PATH=${DEST}/${target}/bin