Conditionally install CUDA support if it was found in the package. Apparently 173.14.27 drops CUDA. fixes bug #328681

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

3 files changed, 10 insertions, 15 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 71a084128fb3..e50016be40e7 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.240 2010/07/17 10:11:19 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.241 2010/07/20 21:39:14 cardoe Exp $
+
+  20 Jul 2010; Doug Goldstein <cardoe@gentoo.org>
+  nvidia-drivers-173.14.27.ebuild:
+  Conditionally install CUDA support if it was found in the package.
+  Apparently 173.14.27 drops CUDA. fixes bug #328681
 
   17 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
   nvidia-drivers-173.14.25.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 25357566ae20..4cab8253951b 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39
 AUX 195.30-unified-arch.patch 1525 RMD160 9872c270b4bb3d3010af3f2b83798631562c8d8f SHA1 06330376e9a25e3317a4bfe12f74af17e56f3448 SHA256 b6224e213820c698315a8645204d992b779f31e8c45c025e740bc189dc1f9bae
 AUX 256.35-unified-arch.patch 1498 RMD160 63285585705b880f4e745e1f6ffad493ea876d05 SHA1 a2537442b2d896cd8b6e8897b345fee3bfcf5222 SHA256 7861431595e425c5df8acffb8bf536befa7a13618d6f66456aef6dac4db5c314
@@ -54,7 +51,7 @@ DIST NVIDIA-Linux-x86_64-96.43.16-pkg2.run 12337604 RMD160 fd7c586b53ff0b19034f8
 DIST NVIDIA-Linux-x86_64-96.43.18-pkg2.run 12338886 RMD160 38cf91827e3011a35b00c064747bf98e965097a1 SHA1 b7811f14d86d4ed00c780351765580ec3d353968 SHA256 4644b1b3a78e651af079f85c8cf55b3666cca9ae466a43135d5857be31fa1ac8
 EBUILD nvidia-drivers-173.14.22.ebuild 15354 RMD160 43cf7e88d864d308e4d44163bb5c8cc0cc9d5d6c SHA1 5d9d8b3c898f4b2e04042380327fcbcd453088bf SHA256 d4d57421d0d162260bb309c3d3842c6ce8464d2dc1083249ade79af5a86de258
 EBUILD nvidia-drivers-173.14.25.ebuild 15354 RMD160 e8d0f717d2da3151e713f449d4a19b1c0f15dd96 SHA1 4209f67504e12ba900db8a19e910aef1ccbac70f SHA256 245f4516737b4252510a0586b06d264c816532b13d3554166dbf409641ab6595
-EBUILD nvidia-drivers-173.14.27.ebuild 15357 RMD160 932863af73cb560b6c9e953a118ce593f2248220 SHA1 32f63960d0bddd155f240d88fb4b712d82cd3633 SHA256 0f65c55c3d4f6207a0e927e7ea0990198f5f313e49edccd8049f6ba765a2e78e
+EBUILD nvidia-drivers-173.14.27.ebuild 15391 RMD160 f9fa39768833258ab67c0966531484a45bb60333 SHA1 93caffa42ba4a762293fbeb65c459d146768743f SHA256 ebcb5658fd09a8ced0513f49587c2de9327b0e6b1e4ebb08cf657e9caaf6fc99
 EBUILD nvidia-drivers-185.18.36-r1.ebuild 16264 RMD160 8f76a7545d9ec9d70c13ae618a1b6d12d35c9cb2 SHA1 7c6d3b9cbc88134e03cfec9275dc4dfe47043eb0 SHA256 4233c2c33d25bd5b520829a8e30515ceef975c2c7c5828049c4f94cf9adfa2b0
 EBUILD nvidia-drivers-190.53-r1.ebuild 15479 RMD160 7f761296c196d4e4775dc67662d1845c81439e1a SHA1 73bfc73a92a7b053917359507276128bfc8efceb SHA256 2ac46e8e0ed83858b17ca93a2e9bae382b5c219e7c0179359e7077c90287841e
 EBUILD nvidia-drivers-195.36.15.ebuild 16149 RMD160 0e82b294567c5f16628f4152199b654e29d97fdf SHA1 e4ce7197812e1c0cf0ae80b07a62cce5c44091f3 SHA256 4692121483572b555b504de360c484845b4d3f3217219783d9046bb841474aab
@@ -65,12 +62,5 @@ EBUILD nvidia-drivers-71.86.11.ebuild 14141 RMD160 e1ca921a6dc2381be5acf05afa393
 EBUILD nvidia-drivers-96.43.14.ebuild 15370 RMD160 b14c286fc0eba4066ac78f3603223f404d3c293f SHA1 9526821a410c553c26e41f610502297b12bcd330 SHA256 05f4a3bab44153cef7c0eb09e8dbdcaca73c3391eb7c18a2a47ccd798cbd8255
 EBUILD nvidia-drivers-96.43.16.ebuild 15373 RMD160 4fb04e74e17d09cb9e33d700722ecdc762bdeda9 SHA1 b7b1daf3a65eedf7173d181e7e9ff28e676eb20f SHA256 6fa391b1d74e39b8e930c149636184ef340500643278e969d0487adbbd3a028b
 EBUILD nvidia-drivers-96.43.18.ebuild 15373 RMD160 a601ca0efb002b0b0efd34e5924358cf619fdb63 SHA1 6249f569cc1b9b15957322d96390fd3c3f71b6cc SHA256 3cc773faf5e35fda210d6a10062f66e038403f5e1780be99a20e947365fa0c29
-MISC ChangeLog 52434 RMD160 42ae3b15e0372cc1660a56684c76af2cf14f5a05 SHA1 5a5881788dc754a432fd6789e7531e666f94eb1d SHA256 70976228f516ab2de8a1defdae6159a076541505b54e533a45d93185ec381ce6
+MISC ChangeLog 52643 RMD160 03601ee60a3a2317accb566df441c6fb993a9a80 SHA1 72c7ef592c56e6c221864661ed999046f6423bd3 SHA256 a1ae813c845f75ee6dd351c8f70402882c9f28f40e85445217aa05a37be04c65
 MISC metadata.xml 546 RMD160 91ee180beb1b4acd8742b4ede2a528413c27d904 SHA1 6cb54af78a52760767088a1817a6f6bff19f2e08 SHA256 2e76e319e9b7db64d581d065d396c0b3ee942253d7470a9ac75d8e9131edb4eb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxBgkIACgkQNQqtfCuFneP3kgCgm84eQdKLStyMd9wLTZ/dTnez
-v2IAn2g4jVVkeCPZukp8b5Dqi75LqdPl
-=igNa
------END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.27.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.27.ebuild
index 161a35855bc0..148ecde4e78c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.27.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.27.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/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.27.ebuild,v 1.1 2010/07/16 20:28:53 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.27.ebuild,v 1.2 2010/07/20 21:39:14 cardoe Exp $
 
 EAPI="2"
 
@@ -327,7 +327,7 @@ src_install() {
 		die "failed to create libXvMCNVIDIA.so symlink"
 
 	# CUDA headers (driver to come)
-	if use kernel_linux; then
+	if use kernel_linux && [[ -d ${S}/usr/include/cuda ]]; then
 		dodir /usr/include/cuda
 		insinto /usr/include/cuda
 		doins usr/include/cuda/*.h || die "failed to install cuda headers"