Block mesa-7.6 since otherwise you will get inconsistent .la files.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

8 files changed, 26 insertions, 24 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index f11a724bb9e1..58bcab1013b7 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.196 2009/10/05 12:28:21 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.197 2009/10/22 10:49:06 scarabeus Exp $
+
+  22 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  ati-drivers-8.552-r2.ebuild, ati-drivers-8.593.ebuild,
+  ati-drivers-8.660.ebuild, ati-drivers-9.8.ebuild, ati-drivers-9.9.ebuild,
+  ati-drivers-9.9-r2.ebuild:
+  Block mesa-7.6 since otherwise you will get inconsistent .la files.
 
   05 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
   ati-drivers-9.9-r2.ebuild:
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 7d0028ee5c5b..a405256bd6fa 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 SHA1 01cac55ba02710dbd7d71737dd64dbec2cc081fd SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134
 AUX 8.40.4/ati-drivers-2.6.23.patch 1497 RMD160 3bcd335769ee98b2119fc62784d091000115a5bd SHA1 9328ece148ad52c048805b9c2c3a3bf0937b6d16 SHA256 6ea6385e602b9659ca01ef1d53cb53ca955f2396a2d8cc914355d3bb2a590d88
 AUX 8.40.4/ati-drivers-8.40.4-warnings.patch 3262 RMD160 158206cf638fd0f2ee34e8ff02e6a399933f844d SHA1 7b47d4d89ff80e930cd2fc66f513dbaf66de07d5 SHA256 45caca456493c23a6475bbec63df26a33ead8de59bf52e3c06c4433740dc5261
@@ -29,18 +26,11 @@ DIST ati-driver-installer-9-3-x86.x86_64.run 84841550 RMD160 76d4aa6ec575403190b
 DIST ati-driver-installer-9-8-x86.x86_64.run 96243549 RMD160 c5d2a3a724f1d04eb2040669d4f9a039ec529310 SHA1 75456facf8492b40354f2eaf6863e2929ec692ee SHA256 a3cdfa12f44455506f95274b1bb3b5abae6ad7663daecbd173a4ac65e0d10547
 DIST ati-driver-installer-9-9-x86.x86_64.run 98115301 RMD160 ab5fca036c3e5b3b4926ed16f24822596441cda6 SHA1 22e2adb9c4fdec4647927acec0410e43cb246a4d SHA256 66be4f4aa377cd22a45596c2e3fb5f1a0fbcdd3db5412478175d777572edc483
 DIST fglrx-installer_8.660.orig.tar.gz 60964800 RMD160 f50e58cec30c22ad84914b2ec02d04450a885fa1 SHA1 0846f65bba364e3e4145513cf8be42aec9668504 SHA256 181fb2065a16cc75e279b229ac850fe30b8dd7899679117a0d9b815e85c38e66
-EBUILD ati-drivers-8.552-r2.ebuild 15132 RMD160 08693686e3a767576533c9625b6efaa0e727f5de SHA1 3f41f7bfc6e95f6520d5f38dbb6b05001db6b767 SHA256 059888be71be3759d9cd63cc4fa3300227ba9d99fcea1f32eb065ed5761aec79
-EBUILD ati-drivers-8.593.ebuild 15028 RMD160 b5c4cef44e3bc8de4d08860cf7032a0c83204d72 SHA1 c2a68ca3a777bc4851cedc7c3e78369fe4575d73 SHA256 09edac6fe290ef0ac6580e54ebea64d3bf80a317547e127bb73230f91b3dc08c
-EBUILD ati-drivers-8.660.ebuild 18437 RMD160 91ec954f7b75128c2f04ac15dbe6165c50ce8996 SHA1 1d994bf0e6b01df1c892fa54500c07e8a61def01 SHA256 95ce6c2c5492302c42d474418a1288b1a4e2ec8643a30873797fe66db5b8abb2
-EBUILD ati-drivers-9.8.ebuild 17950 RMD160 45e28cca858418c8e9652dec51e9a768bcaec58f SHA1 428bb676c4a14dfc00e42b9d8eb14aa9c6ef9d6c SHA256 509f7a262e1325d771f1e401c88897a2e5a8d22dd0e38692efe00db63b4f6692
-EBUILD ati-drivers-9.9-r2.ebuild 18544 RMD160 8df87fdbd6a787d6142bf20631f6cac229043f80 SHA1 434a5436b85e4ac6d7930c634ef305014f1c81d5 SHA256 92e6bdf81c09d6e20fe59d2543fb8d9b80e332b0fbd016aa27e388ae68fdd8c9
-EBUILD ati-drivers-9.9.ebuild 18435 RMD160 876fb240cf2c4c8d76d0dc8097a4a82d9faaaf04 SHA1 782c3a9ecf1c3cc20f71773647ff9f9f0a611a95 SHA256 b592275e6c0b142dc953771cdeb090e09adb3fe50a39017f7d1690ace1fb6047
-MISC ChangeLog 59687 RMD160 5f9ab4fa267f6ea21fd0b7f02ae6cb7f0c5877ab SHA1 4d39ca801d9488cbcd2eaa2c2ab035d0a568d711 SHA256 0a43431fedac5784832bc3140fe8fc4cc0de93095fedb4c9e81d474e6f1cdd6a
+EBUILD ati-drivers-8.552-r2.ebuild 15159 RMD160 0da6fc5dae6e01d533e42f1bc8ba4202b281d065 SHA1 95c2c944a7f23c5f6ff095f2a5ce31c0632e76b7 SHA256 d1ce7e41b11e38c3d1b0b9c3b3a20962df74f0d5bbe147e4f0db6e2f73b5ee0a
+EBUILD ati-drivers-8.593.ebuild 15053 RMD160 a3dbfe4c37711b94c32de563565b420688f6fe36 SHA1 fe5d8f8fef80e6c1ab2c86b1e5839ca19fddd36a SHA256 7eeb0a77548c4e21eaa8be827009e1ee9907c8a28977af31267d83ca1b43010e
+EBUILD ati-drivers-8.660.ebuild 18461 RMD160 231a4c9ae47a4575b5e14e034df762c7956badf2 SHA1 6b544b95ecf4b3a7b1b5b453dd60dc6f9dc7c87a SHA256 b545238de3ad4cf1234157de9a3804da05714b45b060bdc31582721c8558f2f0
+EBUILD ati-drivers-9.8.ebuild 17974 RMD160 eb4de7625e20703d437c5428b9b041c16118b082 SHA1 1d37ab50c32b97911dcaad4de172c88fb8b7f951 SHA256 51852b58091cfc2eb467f638d5e55bf7c9f9faf3ad7b360c8bb9b76505d6d2bc
+EBUILD ati-drivers-9.9-r2.ebuild 18572 RMD160 0273b5f109c8969a727a68b507cb372c1765e4ae SHA1 ecc6666034396f1b9270914b209d011bb9873979 SHA256 69b9eee1b84ef4b5b261e769b8eab6aeae918bc07c3a4242ff4691bd3ff8fc74
+EBUILD ati-drivers-9.9.ebuild 18459 RMD160 920cb51115c77682fc49cb072b79ee1c2690bfc0 SHA1 29094fda5b959eae75aae6b3c28f122f1aa56e80 SHA256 e9ecf0c97aa4c4970a8c64bfadc8e668371b84e1974ea499cd6371d88045b5bb
+MISC ChangeLog 59979 RMD160 cb52d5ab6eeb185ef0be6eee325fcc483dbf8cfd SHA1 dae68f27fbb7e0ac6f7f86bae7520a6fc0670f6f SHA256 16c7235ff7f168f8dc3f4fe51c2afea7ac03b6d8a5d53281c3542cb8596d6579
 MISC metadata.xml 359 RMD160 ece931b7435755393a605d11de0b9276a7a61785 SHA1 e8fe2ec8e95714ae50c71cadfa63cb92f85a1c5d SHA256 9dcb0fd39cbf80a8ef47d64e0a038f6bdcb49f106c0f810db1008e2bc56ee39b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrJ5nQACgkQNQqtfCuFneOHlwCgmveIgmTbJMO78bl+O6kXKqDM
-+KMAn3MMLi+Zxwz7jzYbLuUkfhzsrRLc
-=PnC/
------END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild
index 048d6d11001e..393ea5ac0980 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.552-r2.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/ati-drivers/ati-drivers-8.552-r2.ebuild,v 1.8 2009/04/13 20:18:05 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.552-r2.ebuild,v 1.9 2009/10/22 10:49:06 scarabeus Exp $
 
 IUSE="acpi debug"
 
@@ -18,6 +18,7 @@ KEYWORDS="amd64 x86"
 # The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
 RDEPEND=">=x11-base/xorg-server-1.5
 	!x11-apps/ati-drivers-extra
+	!>=media-libs/mesa-7.6
 	>=app-admin/eselect-1.0.9
 	app-admin/eselect-opengl
 	amd64? ( app-emulation/emul-linux-x86-xlibs )
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.593.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.593.ebuild
index ad9669b6b4b9..c68c9064ab11 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.593.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.593.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/ati-drivers/ati-drivers-8.593.ebuild,v 1.3 2009/08/23 02:21:21 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.593.ebuild,v 1.4 2009/10/22 10:49:06 scarabeus Exp $
 
 IUSE="acpi debug"
 
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86"
 # The portage dep is for COLON_SEPARATED support in env-update.
 # The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
 RDEPEND=">=x11-base/xorg-server-1.5
+	!>=media-libs/mesa-7.6
 	!x11-apps/ati-drivers-extra
 	>=app-admin/eselect-1.0.9
 	app-admin/eselect-opengl
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild
index cea4480cb0cb..a4dae770a997 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.660.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/ati-drivers/ati-drivers-8.660.ebuild,v 1.3 2009/09/07 12:50:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.660.ebuild,v 1.4 2009/10/22 10:49:06 scarabeus Exp $
 
 EAPI="2"
 
@@ -24,6 +24,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="1"
 
 RDEPEND="
+	!>=media-libs/mesa-7.6
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
 	>=app-admin/eselect-opengl-1.0.7
diff --git a/x11-drivers/ati-drivers/ati-drivers-9.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-9.8.ebuild
index 1b7d73c88395..813d5f219747 100644
--- a/x11-drivers/ati-drivers/ati-drivers-9.8.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-9.8.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/ati-drivers/ati-drivers-9.8.ebuild,v 1.16 2009/09/21 09:06:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.8.ebuild,v 1.17 2009/10/22 10:49:06 scarabeus Exp $
 
 EAPI="2"
 
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="1"
 
 RDEPEND="
+	!>=media-libs/mesa-7.6
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
 	>=app-admin/eselect-opengl-1.0.7
diff --git a/x11-drivers/ati-drivers/ati-drivers-9.9-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-9.9-r2.ebuild
index d029934549f8..cd1eaa48f14d 100644
--- a/x11-drivers/ati-drivers/ati-drivers-9.9-r2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-9.9-r2.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/ati-drivers/ati-drivers-9.9-r2.ebuild,v 1.4 2009/10/05 12:28:21 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.9-r2.ebuild,v 1.5 2009/10/22 10:49:06 scarabeus Exp $
 
 EAPI="2"
 
@@ -24,6 +24,7 @@ KEYWORDS="amd64 x86"
 SLOT="1"
 
 RDEPEND="
+	!>=media-libs/mesa-7.6
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
 	>=app-admin/eselect-opengl-1.0.8
diff --git a/x11-drivers/ati-drivers/ati-drivers-9.9.ebuild b/x11-drivers/ati-drivers/ati-drivers-9.9.ebuild
index 124b8ae53d8b..e68bc6218c1d 100644
--- a/x11-drivers/ati-drivers/ati-drivers-9.9.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-9.9.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/ati-drivers/ati-drivers-9.9.ebuild,v 1.2 2009/09/13 20:29:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.9.ebuild,v 1.3 2009/10/22 10:49:06 scarabeus Exp $
 
 EAPI="2"
 
@@ -24,6 +24,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="1"
 
 RDEPEND="
+	!>=media-libs/mesa-7.6
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
 	>=app-admin/eselect-opengl-1.0.7