Make libGL.la point to /usr/lib in mesa

Package-Manager: portage-2.1.1_pre5-r3

3 files changed, 24 insertions, 10 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 1776925b7949..3d192ce947dc 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.103 2006/07/29 18:28:06 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.104 2006/08/25 19:47:02 hanno Exp $
+
+  25 Aug 2006; Hanno Boeck <hanno@gentoo.org> files/lib/libGL.la:
+  Make libGL.la point to /usr/lib to let apps link against currently running
+  libGL.
 
 *mesa-6.5-r4 (29 Jul 2006)
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 35d9dbfab1b4..7ee16d7ddfc7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 6.4-dont-install-gles-headers.patch 421 RMD160 70713f143d080b444089a95712efd227227c523f SHA1 ffdf556a66229d0417d5d7e7833c8e9bfdb39741 SHA256 8f636c2e09ac7fdab0d06ebe62af5a311b52a03bf7b7bdecf4789a6e30e0777e
 MD5 ae36bba4e878c77dc2e823ce00e98869 files/6.4-dont-install-gles-headers.patch 421
 RMD160 70713f143d080b444089a95712efd227227c523f files/6.4-dont-install-gles-headers.patch 421
@@ -30,10 +33,10 @@ AUX change-default-dri-driver-dir.patch 412 RMD160 84b1a7e60661603735f377759917c
 MD5 cdc08801bd33dadb19c29e4c91863c73 files/change-default-dri-driver-dir.patch 412
 RMD160 84b1a7e60661603735f377759917c1064346ee3e files/change-default-dri-driver-dir.patch 412
 SHA256 50868940210dc613b67b87a900158719e96bb38451cbcfbd12edab4b170065d7 files/change-default-dri-driver-dir.patch 412
-AUX lib/libGL.la 763 RMD160 a6882fb5d6d8ad195845bdda3bcbbef2aef79099 SHA1 ded967a6f28e90238b601b422abc76b472e8f732 SHA256 0fb9c02b01c9b2306fac89034144bb3e87aedba0dee0a49203aa18fbf0b706bf
-MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763
-RMD160 a6882fb5d6d8ad195845bdda3bcbbef2aef79099 files/lib/libGL.la 763
-SHA256 0fb9c02b01c9b2306fac89034144bb3e87aedba0dee0a49203aa18fbf0b706bf files/lib/libGL.la 763
+AUX lib/libGL.la 743 RMD160 67407ee9bff348276723ba93d811a2c12720edb8 SHA1 650973d708466f5c4c21e70c1f1f6c118b27e614 SHA256 82381f53695e0603e0b1dbd7db3bff754071ba332203e6a43f06d02585b9df04
+MD5 b0b8a0de99c7837ac2b413c28bf24c26 files/lib/libGL.la 743
+RMD160 67407ee9bff348276723ba93d811a2c12720edb8 files/lib/libGL.la 743
+SHA256 82381f53695e0603e0b1dbd7db3bff754071ba332203e6a43f06d02585b9df04 files/lib/libGL.la 743
 AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5
 MD5 9abdd26694e6f1d7bd93193f900acc6c files/lib/libGLU.la 752
 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 files/lib/libGLU.la 752
@@ -60,10 +63,10 @@ EBUILD mesa-6.5-r4.ebuild 9163 RMD160 b94a20be564b61950bea08cc80515d27bf04c463 S
 MD5 e1899dbb9fed6363fe52fa15735ab2d8 mesa-6.5-r4.ebuild 9163
 RMD160 b94a20be564b61950bea08cc80515d27bf04c463 mesa-6.5-r4.ebuild 9163
 SHA256 9c802b6a44611f3e8c7e0afe736cd29d287b1e6c84369d4e43339d7bccfeb597 mesa-6.5-r4.ebuild 9163
-MISC ChangeLog 19397 RMD160 575d05786ac712a9d388a5c4e5dd03eb37aedb77 SHA1 39b79559bfe78795ea5a6c451dd90388f8cfa2ce SHA256 98b6ed1d461a85488f5c0e75fb2b9f2c36535d73e0beeaa92bf8e6a710983938
-MD5 bff68f8fa68d4d2604d8e9607565c025 ChangeLog 19397
-RMD160 575d05786ac712a9d388a5c4e5dd03eb37aedb77 ChangeLog 19397
-SHA256 98b6ed1d461a85488f5c0e75fb2b9f2c36535d73e0beeaa92bf8e6a710983938 ChangeLog 19397
+MISC ChangeLog 19542 RMD160 feee638f210d177dfcd1e4e1b14bb72a4c47ac1e SHA1 2392b2fb36c0b1d53ccc9641c9d28c02a23ea96f SHA256 146ab6d4135da343b87494ed616491eb8dba26ae4ecc39d948a38b6a775b2323
+MD5 b9e9ea033ced4280a06ed2f9a3cb8e0c ChangeLog 19542
+RMD160 feee638f210d177dfcd1e4e1b14bb72a4c47ac1e ChangeLog 19542
+SHA256 146ab6d4135da343b87494ed616491eb8dba26ae4ecc39d948a38b6a775b2323 ChangeLog 19542
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -77,3 +80,10 @@ SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/di
 MD5 80bc8bfb6472d4dcbad6e14a2595c1a9 files/digest-mesa-6.5-r4 241
 RMD160 069ddf1320b547a5a5cf1af3d0611a6c35398c7e files/digest-mesa-6.5-r4 241
 SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/digest-mesa-6.5-r4 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE71PKr2QksT29OyARApWRAJ9JXQ2m1t+LLwJX1C9maYyZ7qBWYQCeKW07
+GrK+HnILkHjDd28f6YkRo5Q=
+=RMr3
+-----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/files/lib/libGL.la b/media-libs/mesa/files/lib/libGL.la
index 1a773c25f0be..573953319eaa 100644
--- a/media-libs/mesa/files/lib/libGL.la
+++ b/media-libs/mesa/files/lib/libGL.la
@@ -29,4 +29,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/usr/lib/opengl/xorg-x11/lib'
+libdir='/usr/lib'