oops. fix issue where we might remove vdpau and cuda files

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

3 files changed, 18 insertions, 14 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 42229343807c..ae4a7a72cc4b 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.199 2009/11/06 16:25:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.200 2009/11/06 16:55:10 cardoe Exp $
+
+  06 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
+  nvidia-drivers-190.42-r3.ebuild:
+  oops. fix issue where we might remove vdpau and cuda files
 
   06 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
   nvidia-drivers-190.42-r3.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 89a79121a18d..9a65ca88d21c 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -36,16 +36,16 @@ EBUILD nvidia-drivers-180.60.ebuild 16498 RMD160 350d810e70913d1c29ce527efc18b5c
 EBUILD nvidia-drivers-185.18.36-r1.ebuild 16288 RMD160 18eae7b4dc22ab5c1dd05d9b3d56832ca4b855eb SHA1 54af90a1af63003e0dc8be86b13f37308cbbb2a7 SHA256 49b183d595319696dc51ed805603b5be8d58f76ec795a1f4cfdb3048f870bb0e
 EBUILD nvidia-drivers-185.18.36.ebuild 16618 RMD160 485fcb2bcb54c50677c4876c580799c1245ead8a SHA1 542093c2f97fb0dcc17a5150b3dbe6392dfd0f5d SHA256 ff22712974def26c094959503a8d206e225faf457f91704f587ff72d7661fa53
 EBUILD nvidia-drivers-190.42-r2.ebuild 15660 RMD160 7f29ee6ab980b505fa6f905b103db319caa3ce66 SHA1 341ba0641a909ec9b277472f1a7d527f591cc9ba SHA256 6de69f744ffd6baa4f2ac2fe129e6a044b5eb828547a06a51d4f412a2d9172d3
-EBUILD nvidia-drivers-190.42-r3.ebuild 15307 RMD160 98a966ffaf73af8df9343b2eba53e2bc21b89dac SHA1 f8f9ec08ba56579a3766d30e455ad027876ea6c7 SHA256 09f13a65010d8ccc437413c1d654030f0861047ea8d01afedc7b156d2eb884e3
+EBUILD nvidia-drivers-190.42-r3.ebuild 15279 RMD160 a910a5807d2ad913b1c41cb4b4485e8ef839a12d SHA1 485bc7fb28f97a7188512d0cd0bd3cad1f53b680 SHA256 13c5b9a3b3d72cbfa95e074cf2f61cd3b8ee2c19ec58b87dc0ad2e5c7b381731
 EBUILD nvidia-drivers-71.86.09.ebuild 14141 RMD160 2e5f2187b9ed1e187c911ef14d695cbbb57fbb5b SHA1 4c39f467cc23265efebcf021ae5af8a0e5c4bb84 SHA256 87084b0ce8a5ba967bfa73eeaf7fff2ba6e47eb063a723d7486e8643d80cc07a
 EBUILD nvidia-drivers-71.86.11.ebuild 14143 RMD160 82d24dc392482f0c9e9f0c79f03207bbe33b95f2 SHA1 9b71d5f0558bf5b6cb286c703ce1ab6bb1561a83 SHA256 f6ed960f992cef05c6e1ecc9c2f5f6c878a22d24018a5a4c2b16f15fad04f423
 EBUILD nvidia-drivers-96.43.13.ebuild 14468 RMD160 4c0bbeb1f06cb7df7900d2d2d5ac08703345f548 SHA1 375a2babdcd5ace77ac4b436b6591cf9a1a2f66a SHA256 28ad4cf84b0f6e2f9c8b5aa274c90747bfaff6d91a1778e2d6109a3de668e6d3
-MISC ChangeLog 45477 RMD160 aef8b71b1c781744c3f8fc7447fc676daccc5f3e SHA1 c9883f9647282f87b0b1d79d96b5bd0a7697836e SHA256 baad3895d2d2560bc66e25fd5741ddcd2822ec9d07a32cd5f48c66ebb58c21e1
+MISC ChangeLog 45624 RMD160 08cb5d0b6a90c2bfa8f07c14d5d8288e6c27e7fc SHA1 e6eb15977bdd2d952a9a549ccde45111af2de66d SHA256 1852dfd42a589205924248a92f8b1100f01ca91589d81bf0856471751c9b0555
 MISC metadata.xml 608 RMD160 69923c951a3b11d3632338cd673430c1335f78cd SHA1 febe635634c122bf9fb5fd83fd486ab5a25282b3 SHA256 6b13dc244ff827b23a6f1de01eef3a7f607917573fb36b7316a1a629c78cc6bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkr0Tf0ACgkQoeSe8B0zEfxLsQCgg0h+p8pU1JyHcDAb8Vr1T7lG
-URIAn3vn8h5XEPDbHRjTSjuw1K0Id56w
-=mNTi
+iEYEARECAAYFAkr0VZQACgkQoeSe8B0zEfz2YgCfYZP2W03WBY11O0VD3z4r0jYv
+aIIAnAkCGiGZ25TrswWe7wW0fmLCNXeN
+=iXjh
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r3.ebuild
index b10c8d724d44..f1b09acdaa8d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r3.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r3.ebuild,v 1.2 2009/11/06 16:25:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-190.42-r3.ebuild,v 1.3 2009/11/06 16:55:10 cardoe Exp $
 
 EAPI="2"
 
@@ -417,27 +417,27 @@ src_install-libs() {
 	fi
 
 	#cuda
-	if [[ -f usr/${libdir}/libcuda.so.${sover} ]]; then
-		dolib.so usr/${libdir}/libcuda.so.${sover}
+	if [[ -f ${libdir}/libcuda.so.${sover} ]]; then
+		dolib.so ${libdir}/libcuda.so.${sover}
 		[[ ${sover} -ne 1 ]] && dosym libcuda.so.${sover} /usr/${inslibdir}/libcuda.so.1
 		dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so
 	fi
 
 	#vdpau
-	if [[ -f usr/${libdir}/libvdpau_nvidia.so.${sover} ]]; then
-		dolib.so usr/${libdir}/libvdpau_nvidia.so.${sover}
+	if [[ -f ${libdir}/libvdpau_nvidia.so.${sover} ]]; then
+		dolib.so ${libdir}/libvdpau_nvidia.so.${sover}
 		dosym libvdpau_nvidia.so.${sover} /usr/${inslibdir}/libvdpau_nvidia.so
 	fi
 
 	# OpenCL
 	# NOTE: This isn't currently available in the publicly released drivers.
-	if [[ -f usr/${libdir}/libOpenCL.so.1.0.0 ]]; then
+	if [[ -f ${libdir}/libOpenCL.so.1.0.0 ]]; then
 
-		dolib.so usr/${libdir}/libnvcompiler.so.${sover}
+		dolib.so ${libdir}/libnvcompiler.so.${sover}
 		[[ ${sover} -ne 1 ]] && dosym libnvcompiler.so.${sover} /usr/${inslibdir}/libnvcompiler.so.1
 		dosym libnvcompiler.so.1 /usr/${inslibdir}/libnvcompiler.so
 
-		dolib.so usr/${libdir}/libOpenCL.so.1.0.0
+		dolib.so ${libdir}/libOpenCL.so.1.0.0
 		dosym libOpenCL.so.1.0.0 /usr/${inslibdir}/libOpenCL.so.1
 		dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so
 	fi