Update the .la files per bug #267580. Hopefully it will fix at least some issues.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 14 insertions, 9 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 6554832ce3d8..68c880104e21 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.223 2009/07/22 08:19:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.224 2009/07/22 08:31:04 scarabeus Exp $
+
+  22 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org> files/lib/libGL.la,
+  files/lib/libGLU.la:
+  Update the .la files per bug #267580. Hopefully it will fix at least some
+  issues.
 
   22 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org> -mesa-7.5.ebuild,
   mesa-7.5-r1.ebuild:
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 4d0103fe7781..d8011dd3d3b8 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,8 +3,8 @@ Hash: SHA1
 
 AUX 6.5.2-i965-wine-fix.patch 2888 RMD160 e899ac128933eb1a65e5c79de97408679beb2a50 SHA1 741221fba69b3891665e16da5baf6e66be62449d SHA256 bc19f4b5ce44a90c6b2aeab2c1148200539791ff9d0c60c5ffc2d4d8fe5fee78
 AUX 7.4-fix-parallel-make.patch 552 RMD160 06fdc748ef5ffa9ced1fd0b13d24299ad3522f97 SHA1 72801ed7e6951506811637675947aa9a869365f6 SHA256 4df0f41cffa5a0472f934da8ca1adf6c2b051a068943392a7ceeea3ae9c1b30a
-AUX lib/libGL.la 755 RMD160 a60984e0d56d559c2c15bd4693e01404a7e0a408 SHA1 d6e231ffaccd1b13c3628744031cc761ffaf76d8 SHA256 b32ffd7f3f866da7dbae80ba78b1dc5b4924b33ab133b13397af9cda0a274f91
-AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5
+AUX lib/libGL.la 729 RMD160 b89950051dfa9d02824eb0b15858855016f92dcc SHA1 32c0aabf00f1590aa7aeca75955b80a04c6c7f15 SHA256 f5e62da033bfb72a56d6290d6030df4d5f687acea456a8f31a765c0c4f532606
+AUX lib/libGLU.la 743 RMD160 34e3adc8e0422a5477a9eaa0fee141e577afeee4 SHA1 c131df3a61b7f193e8a8cea3feeb1f9ff0f1ea7d SHA256 0a8efb7cd557598607ede88af6442574a6999689ddbb7f0f3cbaf53734bfa284
 DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
 DIST MesaLib-7.0.3.tar.bz2 3389327 RMD160 1672be9d235f19c779c42ea4f443995b1844c836 SHA1 49b92094a25f189b411f393174ee666e73dddf36 SHA256 ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22
 DIST MesaLib-7.1.tar.bz2 3338885 RMD160 e03960762a35eeb56755105fda5ba1b580c7dacc SHA1 0b946a8a4334ca22baf3e0fe583f88187e9d74fa SHA256 d63a29bf206a5304b3c319a47fa16892db3d2e14737f2c534acf1eb220e9c550
@@ -22,12 +22,12 @@ EBUILD mesa-7.3-r1.ebuild 7229 RMD160 b62d77615267fa439965d22fe09932ad2801e2ce S
 EBUILD mesa-7.4.2.ebuild 7725 RMD160 b5bf98f78c724d365787bbe2c425b2279e78c082 SHA1 c978b607a96df0a1f89138c47ca3557c0c8e77ad SHA256 f9e93c2ad3920a7db65c4200fee4b49b16c739658360039b4285880c92b300fb
 EBUILD mesa-7.4.4.ebuild 7722 RMD160 019abf0239996dfb0e8777f1fa43046b08d63397 SHA1 56c36e3712d73a847234e5db6d7e2b79e8d17646 SHA256 faab5636f062d3572a28ad39eb34923d0f758e2a609614ade827c29335b9793c
 EBUILD mesa-7.5-r1.ebuild 7604 RMD160 2242ed6b45af121b28c300a5613b798fffb34f2b SHA1 d8e249a5a99eb23868675588746341eacd545e2b SHA256 f211cf3f95b2c5f94c576a2174ae629998509584f000389e034d1ee1b848b0c2
-MISC ChangeLog 40642 RMD160 ef7c757e7ac6869affa640e7341ce9481f0365e0 SHA1 28f202a71c55e89a778346d0fcfe19986bbef90e SHA256 6a088215e38904ea9427d1656e585268eac596c5a70cdc4e47c3d36e7d19393a
+MISC ChangeLog 40827 RMD160 38c75901190933bed0582a48917bbd9f8ab2de52 SHA1 55a84f41f04889a1d7fc4b8b01557cfa744b86e5 SHA256 008703bae874ae28180d79eb303654bc133dde95c8ce721c34cdac7284b71f05
 MISC metadata.xml 251 RMD160 e6e718c1f8c8ab33331fcdc2ed16dc7da35d04aa SHA1 a753e5190a6008a77db021b70d5962cbc2e9e488 SHA256 689bc8ac5839e4eb6173899024bf1f6169a5d3f3a1e82e4cdd80011e3e43a8de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpmy5UACgkQHB6c3gNBRYdEIgCggmmngq45W0oXyA0njsfCt5LH
-2g0AoILdwrBH7mejY27RnLcbXO5OCFTX
-=M1jE
+iEYEARECAAYFAkpmzk8ACgkQHB6c3gNBRYdJWgCfd5WCEcVPvtwkcEg6r/KZsK4A
+jdgAoLqzuXRg3ME+aJo7mJKS7mHDqiE0
+=7ODv
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/files/lib/libGL.la b/media-libs/mesa/files/lib/libGL.la
index cc2fd24acd20..5c3f25a3bd24 100644
--- a/media-libs/mesa/files/lib/libGL.la
+++ b/media-libs/mesa/files/lib/libGL.la
@@ -14,7 +14,7 @@ library_names='libGL.so.1.2 libGL.so.1 libGL.so'
 old_library=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/${libdir} -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread        '
+dependency_libs='-lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread'
 
 # Version information for libGL.
 current=3
diff --git a/media-libs/mesa/files/lib/libGLU.la b/media-libs/mesa/files/lib/libGLU.la
index cc76b4b191bb..a87a7ad6d533 100644
--- a/media-libs/mesa/files/lib/libGLU.la
+++ b/media-libs/mesa/files/lib/libGLU.la
@@ -14,7 +14,7 @@ library_names='libGLU.so.1.3 libGLU.so.1 libGLU.so'
 old_library=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/usr/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread      '
+dependency_libs='-lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread -lstdc++'
 
 # Version information for libGLU.
 current=4