fix libdir path in nvidia-driver's libGL.la

Package-Manager: portage-2.1.1_rc1

3 files changed, 23 insertions, 10 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index c38bff2923c6..af7cbfbf42b7 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.8 2006/08/27 08:09:55 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.9 2006/08/27 19:14:18 hanno Exp $
+
+  27 Aug 2006; Hanno Boeck <hanno@gentoo.org> files/libGL.la-r2:
+  Fix libdir in libGL.la (bug #140982).
 
   27 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   nvidia-drivers-1.0.8774.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 8de2a3ef4d46..d581beccaf7d 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39
 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca files/09nvidia 61
@@ -14,10 +17,10 @@ AUX NVIDIA_glx-glheader.patch 380 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853b
 MD5 32901fb95c4fdc6cfa6b762498240b3c files/NVIDIA_glx-glheader.patch 380
 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf files/NVIDIA_glx-glheader.patch 380
 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf files/NVIDIA_glx-glheader.patch 380
-AUX libGL.la-r2 751 RMD160 55658c04bed5ab85b36a1849d0619820306e273d SHA1 2ef1647a5cd950f22982c1545ec988cb8d96b342 SHA256 e5147149f3f35f0f34fd9ac077b132f0fa6a201d56cac9bcc2e65b5e0dd39680
-MD5 6e47667cc38d8ce4ac2f4c7dbb392abe files/libGL.la-r2 751
-RMD160 55658c04bed5ab85b36a1849d0619820306e273d files/libGL.la-r2 751
-SHA256 e5147149f3f35f0f34fd9ac077b132f0fa6a201d56cac9bcc2e65b5e0dd39680 files/libGL.la-r2 751
+AUX libGL.la-r2 733 RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 SHA1 88656b7e7234ade4f5564373fd6eb5c040167655 SHA256 4856e7a2c31763ade41c93a395f3e80a2705ac2ab4dbd73e5161cdba132f407b
+MD5 ca48410a5f23b1fa3c5895201a7161e6 files/libGL.la-r2 733
+RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 files/libGL.la-r2 733
+SHA256 4856e7a2c31763ade41c93a395f3e80a2705ac2ab4dbd73e5161cdba132f407b files/libGL.la-r2 733
 AUX nvidia 704 RMD160 e53af79cf9a56377908834bdbe07fa3c99a5530e SHA1 f57628e6cd4d5ea5bf1b22a55dd81a55166f7c55 SHA256 6ac22481314de823ec31e60663521f318c7eceec75162c11cb97260db6ee0fe2
 MD5 e8166a48172ea0f32a3b73e2d44f30a3 files/nvidia 704
 RMD160 e53af79cf9a56377908834bdbe07fa3c99a5530e files/nvidia 704
@@ -40,10 +43,10 @@ EBUILD nvidia-drivers-1.0.8774.ebuild 11099 RMD160 053ff84f33677da2d66784181f4fe
 MD5 60d5204eeab114cbefa0742907dc4098 nvidia-drivers-1.0.8774.ebuild 11099
 RMD160 053ff84f33677da2d66784181f4fe3182e7394ac nvidia-drivers-1.0.8774.ebuild 11099
 SHA256 14fb2f7e69cae93bc07ad01182a5d83cdef8b8945a51eb190f62316e3f0ab41c nvidia-drivers-1.0.8774.ebuild 11099
-MISC ChangeLog 1653 RMD160 144df34cf53113b16d447ae3bbdc7ff5c25b4e48 SHA1 16cad8dd60941a5e4152345e85da64725ca4d674 SHA256 5184f4803e68b36a155ace5664bdee304ab9607889fbbe605607487351127106
-MD5 40202cd36f622b4f441dadfdd92d927f ChangeLog 1653
-RMD160 144df34cf53113b16d447ae3bbdc7ff5c25b4e48 ChangeLog 1653
-SHA256 5184f4803e68b36a155ace5664bdee304ab9607889fbbe605607487351127106 ChangeLog 1653
+MISC ChangeLog 1755 RMD160 220190d497d8e6d4d8f7951f574a9c2b98b5c35a SHA1 3197eda7ac43b15f0d6520391394db0fee9dda82 SHA256 8f26922d37100d4a5f095bbc026d1fe41c8498f12aafd64230128baf486341a7
+MD5 81e44563a66347f12a4e84009957d181 ChangeLog 1755
+RMD160 220190d497d8e6d4d8f7951f574a9c2b98b5c35a ChangeLog 1755
+SHA256 8f26922d37100d4a5f095bbc026d1fe41c8498f12aafd64230128baf486341a7 ChangeLog 1755
 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f
 MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302
 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302
@@ -57,3 +60,10 @@ SHA256 7e0343d6e805357410cd03b1ce990bf79b7faf1fa7e01809ea52e14b1e0f8bb0 files/di
 MD5 001ce5de86d073b2f9d1f7075aca2787 files/digest-nvidia-drivers-1.0.8774 870
 RMD160 88f38c4e304f6b6c91063a373559721e3555c883 files/digest-nvidia-drivers-1.0.8774 870
 SHA256 dba7d0016db3321eac77d5136e3f0da180cbb687969d3c1303675d4bd2ba2fee files/digest-nvidia-drivers-1.0.8774 870
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE8e8ur2QksT29OyARAnpBAJkB5nZFH54zZg7c0LfrakjmrWjC8wCfS0Wi
+YE/V498+gGM3Oo6yNmUJkBk=
+=lbW2
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/files/libGL.la-r2 b/x11-drivers/nvidia-drivers/files/libGL.la-r2
index ef8d5cc56e0a..863d184419aa 100644
--- a/x11-drivers/nvidia-drivers/files/libGL.la-r2
+++ b/x11-drivers/nvidia-drivers/files/libGL.la-r2
@@ -29,4 +29,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/${libdir}/opengl/nvidia/lib'
+libdir='/usr/${libdir}'