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

(Portage version: 2.2_rc46/cvs/Linux x86_64)

7 files changed, 19 insertions, 7 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/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