Move libcuda and libnvidia-compiler back to /usr/lib since they're not creating any conflicts now. That will allow to use CUDA without explicit eselect opencl. Fixes bug 403495 by Michal Januszewski <spock@gentoo.org>

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

3 files changed, 57 insertions, 47 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 2bc508cc1ff0..200b33688cc6 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,16 @@
 # 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.320 2012/02/14 21:01:46 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.321 2012/02/15 09:53:34 xarthisius Exp $
+
+*nvidia-drivers-290.10-r2 (15 Feb 2012)
+*nvidia-drivers-295.20-r1 (15 Feb 2012)
+
+  15 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +nvidia-drivers-290.10-r2.ebuild, +nvidia-drivers-295.20-r1.ebuild,
+  -nvidia-drivers-290.10-r1.ebuild, -nvidia-drivers-295.20.ebuild:
+  Move libcuda and libnvidia-compiler back to /usr/lib since they're not
+  creating any conflicts now. That will allow to use CUDA without explicit
+  eselect opencl. Fixes bug 403495 by Michal Januszewski <spock@gentoo.org>
 
 *nvidia-drivers-295.20 (14 Feb 2012)
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.20.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r2.ebuild
index 4ad49542ae4b..ee6c76dddd76 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.20.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r2.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-295.20.ebuild,v 1.1 2012/02/14 21:01:46 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r2.ebuild,v 1.1 2012/02/15 09:53:34 xarthisius Exp $
 
 EAPI="2"
 
@@ -40,10 +40,10 @@ PDEPEND=">=x11-libs/libvdpau-0.3-r1
 QA_TEXTRELS_x86="
 	usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
 	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
+	usr/lib/libcuda.so.${PV}
 	usr/lib/libnvcuvid.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+	usr/lib/libnvidia-compiler.so.${PV}
 	usr/lib/libnvidia-glcore.so.${PV}
 	usr/lib/libnvidia-ml.so.${PV}
 	usr/lib/libvdpau_nvidia.so.${PV}
@@ -64,9 +64,9 @@ 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/libcuda.so.${PV}
 	usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}"
+	usr/lib32/libnvidia-compiler.so.${PV}"
 
 QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib/libnvidia-glcore.so.${PV}
@@ -74,17 +74,17 @@ QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}
 	usr/lib/libXvMCNVIDIA.a:NVXVMC.o
 	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
-	usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
+	usr/lib/libnvidia-compiler.so.${PV}
+	usr/lib/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/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
+	usr/lib32/libcuda.so.${PV}
 	usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+	usr/lib32/libnvidia-compiler.so.${PV}
 	usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
 	usr/lib64/libnvidia-cfg.so.${PV}
 	usr/lib64/libnvidia-ml.so.${PV}
@@ -95,8 +95,8 @@ QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib64/opengl/nvidia/extensions/libglx.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/libOpenCL.so.1.0.0
+	usr/lib64/libnvidia-compiler.so.${PV}
 	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig
@@ -115,20 +115,20 @@ QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}"
 
-QA_SONAME_x86="usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}"
+QA_SONAME_x86="usr/lib/libnvidia-compiler.so.${PV}"
 
-QA_SONAME_amd64="usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
-	usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}"
+QA_SONAME_amd64="usr/lib64/libnvidia-compiler.so.${PV}
+	usr/lib32/libnvidia-compiler.so.${PV}"
 
-QA_DT_HASH_amd64="usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
+QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libnvidia-tls.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}
+	usr/lib32/libnvidia-compiler.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/OpenCL/vendors/nvidia/libcuda.so.${PV}
+	usr/lib64/libcuda.so.${PV}
 	usr/lib64/libnvidia-cfg.so.${PV}
 	usr/lib64/libnvidia-glcore.so.${PV}
 	usr/lib64/libnvidia-ml.so.${PV}
@@ -138,13 +138,13 @@ QA_DT_HASH_amd64="usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
 	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	usr/lib64/libvdpau_nvidia.so.${PV}
 	usr/lib64/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+	usr/lib64/libnvidia-compiler.so.${PV}
 	usr/lib64/libnvcuvid.so.${PV}
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig
 	usr/bin/nvidia-settings"
 
-QA_DT_HASH_x86="usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
+QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
 	usr/lib/libnvidia-glcore.so.${PV}
 	usr/lib/libnvidia-ml.so.${PV}
@@ -155,7 +155,7 @@ QA_DT_HASH_x86="usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
 	usr/lib/libXvMCNVIDIA.so.${PV}
 	usr/lib/libvdpau_nvidia.so.${PV}
 	usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+	usr/lib/libnvidia-compiler.so.${PV}
 	usr/lib/libnvcuvid.so.${PV}
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig
@@ -290,7 +290,7 @@ src_prepare() {
 		convert_to_m "${NV_SRC}"/Makefile.kbuild
 	fi
 	cat <<- EOF > "${S}"/nvidia.icd
-		/usr/$(get_libdir)/OpenCL/vendors/nvidia/libcuda.so
+		/usr/$(get_libdir)/libcuda.so
 	EOF
 }
 
@@ -492,8 +492,8 @@ src_install-libs() {
 
 	# CUDA & OpenCL
 	if use kernel_linux; then
-		donvidia ${CL_ROOT} ${libdir}/libcuda.so ${sover}
-		donvidia ${CL_ROOT} ${libdir}/libnvidia-compiler.so ${sover}
+		donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover}
+		donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover}
 		donvidia ${CL_ROOT} ${libdir}/libOpenCL.so 1.0.0
 		#dosym libOpenCL.so.1 ${CL_ROOT}/libOpenCL.so
 	fi
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.20-r1.ebuild
index d2ab4f3afc3d..3551c12af738 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-290.10-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.20-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.3 2012/02/07 10:14:00 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.20-r1.ebuild,v 1.1 2012/02/15 09:53:34 xarthisius Exp $
 
 EAPI="2"
 
@@ -40,10 +40,10 @@ PDEPEND=">=x11-libs/libvdpau-0.3-r1
 QA_TEXTRELS_x86="
 	usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
 	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
+	usr/lib/libcuda.so.${PV}
 	usr/lib/libnvcuvid.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+	usr/lib/libnvidia-compiler.so.${PV}
 	usr/lib/libnvidia-glcore.so.${PV}
 	usr/lib/libnvidia-ml.so.${PV}
 	usr/lib/libvdpau_nvidia.so.${PV}
@@ -64,9 +64,9 @@ 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/libcuda.so.${PV}
 	usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}"
+	usr/lib32/libnvidia-compiler.so.${PV}"
 
 QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib/libnvidia-glcore.so.${PV}
@@ -74,17 +74,17 @@ QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}
 	usr/lib/libXvMCNVIDIA.a:NVXVMC.o
 	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
-	usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
+	usr/lib/libnvidia-compiler.so.${PV}
+	usr/lib/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/opengl/nvidia/lib/libnvidia-tls.so.${PV}
 	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
+	usr/lib32/libcuda.so.${PV}
 	usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+	usr/lib32/libnvidia-compiler.so.${PV}
 	usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
 	usr/lib64/libnvidia-cfg.so.${PV}
 	usr/lib64/libnvidia-ml.so.${PV}
@@ -94,9 +94,9 @@ QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib64/libnvidia-glcore.so.${PV}
 	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/OpenCL/vendors/nvidia/libcuda.so.${PV}
+	usr/lib64/libcuda.so.${PV}
 	usr/lib64/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+	usr/lib64/libnvidia-compiler.so.${PV}
 	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig
@@ -115,20 +115,20 @@ QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}"
 
-QA_SONAME_x86="usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}"
+QA_SONAME_x86="usr/lib/libnvidia-compiler.so.${PV}"
 
-QA_SONAME_amd64="usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
-	usr/lib32/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}"
+QA_SONAME_amd64="usr/lib64/libnvidia-compiler.so.${PV}
+	usr/lib32/libnvidia-compiler.so.${PV}"
 
-QA_DT_HASH_amd64="usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
+QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
 	usr/lib32/libnvidia-glcore.so.${PV}
 	usr/lib32/opengl/nvidia/lib/libnvidia-tls.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}
+	usr/lib32/libnvidia-compiler.so.${PV}
 	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/OpenCL/vendors/nvidia/libcuda.so.${PV}
+	usr/lib64/libcuda.so.${PV}
 	usr/lib64/libnvidia-cfg.so.${PV}
 	usr/lib64/libnvidia-glcore.so.${PV}
 	usr/lib64/libnvidia-ml.so.${PV}
@@ -138,13 +138,13 @@ QA_DT_HASH_amd64="usr/lib32/OpenCL/vendors/nvidia/libcuda.so.${PV}
 	usr/lib64/xorg/modules/drivers/nvidia_drv.so
 	usr/lib64/libvdpau_nvidia.so.${PV}
 	usr/lib64/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib64/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+	usr/lib64/libnvidia-compiler.so.${PV}
 	usr/lib64/libnvcuvid.so.${PV}
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig
 	usr/bin/nvidia-settings"
 
-QA_DT_HASH_x86="usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
+QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
 	usr/lib/libnvidia-cfg.so.${PV}
 	usr/lib/libnvidia-glcore.so.${PV}
 	usr/lib/libnvidia-ml.so.${PV}
@@ -155,7 +155,7 @@ QA_DT_HASH_x86="usr/lib/OpenCL/vendors/nvidia/libcuda.so.${PV}
 	usr/lib/libXvMCNVIDIA.so.${PV}
 	usr/lib/libvdpau_nvidia.so.${PV}
 	usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib/OpenCL/vendors/nvidia/libnvidia-compiler.so.${PV}
+	usr/lib/libnvidia-compiler.so.${PV}
 	usr/lib/libnvcuvid.so.${PV}
 	usr/bin/nvidia-smi
 	usr/bin/nvidia-xconfig
@@ -290,7 +290,7 @@ src_prepare() {
 		convert_to_m "${NV_SRC}"/Makefile.kbuild
 	fi
 	cat <<- EOF > "${S}"/nvidia.icd
-		/usr/$(get_libdir)/OpenCL/vendors/nvidia/libcuda.so
+		/usr/$(get_libdir)/libcuda.so
 	EOF
 }
 
@@ -492,8 +492,8 @@ src_install-libs() {
 
 	# CUDA & OpenCL
 	if use kernel_linux; then
-		donvidia ${CL_ROOT} ${libdir}/libcuda.so ${sover}
-		donvidia ${CL_ROOT} ${libdir}/libnvidia-compiler.so ${sover}
+		donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover}
+		donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover}
 		donvidia ${CL_ROOT} ${libdir}/libOpenCL.so 1.0.0
 		#dosym libOpenCL.so.1 ${CL_ROOT}/libOpenCL.so
 	fi