Run eselect opencl during pkg_postinst wrt bug 402407 by Benjamin Schindler <bschindler@student.ethz.ch> Add missing files to QA_* though some warnigs still slip through

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

3 files changed, 36 insertions, 27 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index c09e9325624e..035ce39b2d5a 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.317 2012/02/05 07:42:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.318 2012/02/07 10:14:00 xarthisius Exp $
+
+  07 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  nvidia-drivers-290.10-r1.ebuild:
+  Run eselect opencl during pkg_postinst wrt bug 402407 by Benjamin Schindler
+  <bschindler@student.ethz.ch> Add missing files to QA_* though some warnigs
+  still slip through
 
   05 Feb 2012; Mike Frysinger <vapier@gentoo.org>
   nvidia-drivers-96.43.20.ebuild, nvidia-drivers-173.14.31.ebuild,
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 72cfefb0d0b0..ead93ae26a5a 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39
 AUX 195.30-unified-arch.patch 1525 RMD160 9872c270b4bb3d3010af3f2b83798631562c8d8f SHA1 06330376e9a25e3317a4bfe12f74af17e56f3448 SHA256 b6224e213820c698315a8645204d992b779f31e8c45c025e740bc189dc1f9bae
@@ -46,25 +46,25 @@ EBUILD nvidia-drivers-275.28.ebuild 16600 RMD160 6d94a53a24a7fa0ec5abe8a3c7c51d1
 EBUILD nvidia-drivers-275.36.ebuild 17128 RMD160 8053571397562ae2bb51f5b6f3d79d19466788c0 SHA1 8303c4b9b1052de7ac0f69cd626be026ef6ea31a SHA256 229cf0628a84d7128754d98e0b3ca25da31dcdfcbf984d1b35b8cb12d603a923
 EBUILD nvidia-drivers-285.05.09-r1.ebuild 17348 RMD160 62ca8371c947acf5b5d64e83b16ad99caaea2b56 SHA1 4f2415601478e8189a2530b9426b1d68519433b3 SHA256 cb77bcda1e46a1280bfc655848ae1ffc61f7438b1bb6e91038ab89b3bb1ccec2
 EBUILD nvidia-drivers-290.06.ebuild 17116 RMD160 e54c612ac48e0e0c99138c8928bce3fcf0b8c938 SHA1 cbb1c52ac678d36305e8ffa8967988c460c91683 SHA256 35810b9c45f7ae8788e865b0bb55f6ea7f3805c91474d345bcdb14aa51b7afd9
-EBUILD nvidia-drivers-290.10-r1.ebuild 17709 RMD160 cecb73df1c94f72eb9e9dbb2c464bc9cfabaa156 SHA1 ef24e80741279f92458efc3a3a423d60a18a698b SHA256 15c8b38ede65da2d7c3e9159418e539116d75f1b07dfa2dd6fdc7a5391810650
+EBUILD nvidia-drivers-290.10-r1.ebuild 17961 RMD160 44a079c146373511e4b9417b47b99718e0fd5e7c SHA1 9ad78f1edc2a456c12b49b9a67e2c52cbd5c4997 SHA256 a7b170fc0a785ead8550eddab3ded1283b7df156942e7d31877daab037c3cfd2
 EBUILD nvidia-drivers-290.10.ebuild 17126 RMD160 fb0ec889be40c7d3ff58e2c7b4a766aaf63a88f9 SHA1 b60e00df8938acb1ea77bc035d274f9f5b6ea184 SHA256 c768c98da5878b3ee17c84f1b7d2fe999b042d39e6388c28e9cca31c50b50b23
 EBUILD nvidia-drivers-96.43.20.ebuild 15606 RMD160 021845276b0cdec4989351d430ce9dfb5034f3e4 SHA1 f9cd2e84e9ae4a9afffa439a1db1366058792e75 SHA256 7343d4e7ec6b4354efabe420ba6413e5e369fe6897eee51cbb3ae49b39d31b13
-MISC ChangeLog 68054 RMD160 a4ab6ffa96c159b39ec3f5cf3c8bd092eb918d7e SHA1 80fe46f73308a305596a93cf3e707c2c6f993e66 SHA256 69c6c47f1f0cee69c33cb29a244e6c299cc7d04e1bdd5391b9eabd51a4984dc8
+MISC ChangeLog 68324 RMD160 a8a1cbdca80e7f5d61daae6eeb6fb9d64230194a SHA1 0f7a2bc28d67957265677ccca31f7849738c0d10 SHA256 81ab81120fa669a8d4dbadb1a8f4b82788ed51eb419fbf185707d36c73621af7
 MISC metadata.xml 653 RMD160 29f9c8662d2c08a9c33921ef606bf7059a30752b SHA1 8653d3a29f241f09b6b377c74f3d6a50bad69bbb SHA256 0e645c5ff2f1726137be71aaabd6c2a661602aa3526ef0500892dbfd63f5c31b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPLjLrAAoJELEHsLL7fEFW7M8P/j+HNocDQl+ijPi1qsXGR7Uf
-CbOuV5G2/W5bClZziIEvf4MP8O5FH1pqhp1hzf3wb8Rm6lk4yi33wj3n3Cr+Fy5y
-UW1iMJlzwZNMer4gfjErNi1jvlgPjuXLHyIa9LV254m78Oha+yK/F+dJLD1Lc5Gm
-czqQyJGqDcLglS0eBohYKxvlmPfp7NG49pzhrjLQNb016KRr2t7CKzap6wkPws27
-kfpS7ppPHUtH0MVePecLjc3n55r/nttReewL9qykLm2XSkd+2KlEf97fYcB6RhKL
-rwi5Lh4T0h/A/EVjQULcw5vmhjxDuvLSanHf77C6lLYGtdLB5ExNgR19MQDyWfMi
-oH0k7H2ckKetZ7CAaRtkAw2hZGplqj3SdahP9knTXhp5V7yMN2wHOwCWx0YXI3qW
-+PfY1Npe8P8+pWv8lEahjaNpeqL1+n3du17BGImsP0CIbSIjwVy4BwUmlCF+uzrn
-htN3QlT3vNOaVzJvnD5x1lqsPDRxAsSjC4APwI2NfeNs1bhRfvosCkRka7cEUc2C
-PPCgY3A8MLGvdZZIgaQH/MmMBeCjY3lwemvq+YIV0YER/mDdzNUTznYgutk/v0/y
-xYDyuUBqDEk4IbKrBe+6Ec7isJ9Uq9YU+KJPbFDY2Wv6YUeKhwLvDQNB9dHT+J4R
-xUDIRHKDev4l8gG5s8GN
-=TGjx
+iQIcBAEBCAAGBQJPMPmGAAoJEF0huFKJUZL5yp0QAKChbR5aJsc8wj/PIikLxGYv
+WJdMydsPif426RHWUMchrdFfI+rFXTwdRSjlGjinCjS6WAaBNATd3gmu7qdkDxBV
+IkMkVpybdAiV0TuyZNd7MltvzQ6lY/wb+Y0HRzzo6AGxD0jMKO64ztOYJMUNXUMI
+55cNZLfY2sOE/mMihb2XlZSqtgjmTGHIvc4JjDj+ObsQqmjtsAbFsXdEEFK/SeNd
+Uth2+SdnUukoj5YeCGr8kZfaCuVM/TSB0mNCY7DCo8td3lWUW1zGr3StpJkx5TKc
+gVSGsyc5f6rzoasBiCZgpSgVR/ZrbgTnz9mkchOgnqzOkjRDYy8Ku6VzjcbMR1Iv
+KpkUjKcog2QxPOwL5lM1TrKcsduwzWMzxVsj1Kk/WGA3BgsywZSnTTOzBfqiyaQ6
+bJqKdf2+NOB2CRpqqcFAJVeVJsknLAskPEEHMrCsWfcb4KMp/faZTSuhYkOBo9D7
+XJ4IDleO0XbgT6pghcCft5iXh5x9NH9NYVdskBh6ay5y7S7H761/bW67rjo2nVJY
+fA+OdJcWMMplfWwSzfwJPi/B/eHh88L2ZCw5uetPAB4w5emWKWY2/zXr/YcVRqKK
+9k63+igCoI74alueyNPKaoDTuckr69iiHUFXH0Oxhi4ubUiuyGz+inDi1u/I5y+a
+2JUW5FXz9w1UZopn8GOK
+=xryR
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild
index 48ad44b5b76a..d2ab4f3afc3d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild,v 1.2 2012/02/05 07:42:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild,v 1.3 2012/02/07 10:14:00 xarthisius Exp $
 
 EAPI="2"
 
@@ -38,12 +38,12 @@ PDEPEND=">=x11-libs/libvdpau-0.3-r1
 	gtk? ( media-video/nvidia-settings )"
 
 QA_TEXTRELS_x86="
-	usr/lib/libOpenCL.so.1.0.0
+	usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
 	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/libcuda.so.${PV}
+	usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
 	usr/lib/libnvcuvid.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/libnvidia-compiler.so.${PV}
+	usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
 	usr/lib/libnvidia-glcore.so.${PV}
 	usr/lib/libnvidia-ml.so.${PV}
 	usr/lib/libvdpau_nvidia.so.${PV}
@@ -62,9 +62,9 @@ QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
 
 QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib32/libnvidia-glcore.so.${PV}
+	usr/lib32/libvdpau_nvidia.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
 	usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
 	usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}"
 
@@ -73,19 +73,18 @@ QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}
 	usr/lib/libXvMCNVIDIA.a:NVXVMC.o
-	usr/lib/libnvidia-compiler.so.${PV}
 	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/libcuda.so.${PV}
-	usr/lib/libOpenCL.so.1.0.0"
+	usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+	usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
+	usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0"
 
 QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib32/libvdpau_nvidia.so.${PV}
 	usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
 	usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+	usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
 	usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
 	usr/lib64/libnvidia-cfg.so.${PV}
 	usr/lib64/libnvidia-ml.so.${PV}
@@ -97,6 +96,7 @@ QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}
 	usr/lib64/OpenCL/vendors/nvidia/libcuda.so.${PV}
 	usr/lib64/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
+	usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
 	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig
@@ -522,6 +522,7 @@ pkg_postinst() {
 
 	# Switch to the nvidia implementation
 	eselect opengl set --use-old nvidia
+	eselect opencl set --use-old nvidia
 
 	echo
 	elog "You must be in the video group to use the NVIDIA device"
@@ -536,6 +537,8 @@ pkg_postinst() {
 
 	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
 	elog
+	elog "To use the NVIDIA CUDA/OpenCL, run \"eselect opencl set nvidia\""
+	elog
 	elog "NVIDIA has requested that any bug reports submitted have the"
 	elog "output of /usr/bin/nvidia-bug-report.sh included."
 	elog