summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-libs/mesa/ChangeLog6
-rw-r--r--media-libs/mesa/mesa-7.7.1.ebuild4
-rw-r--r--media-libs/mesa/mesa-7.8.2.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index c1f8d6267af6..ede418767317 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/mesa
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.282 2010/08/27 19:18:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.283 2010/09/09 11:00:12 scarabeus Exp $
+
+ 09 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> mesa-7.7.1.ebuild,
+ mesa-7.8.2.ebuild:
+ Update deps on libX11[xcb].
27 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> mesa-7.7.1.ebuild,
mesa-7.8.2.ebuild:
diff --git a/media-libs/mesa/mesa-7.7.1.ebuild b/media-libs/mesa/mesa-7.7.1.ebuild
index 147d5841453c..86f45b53d81d 100644
--- a/media-libs/mesa/mesa-7.7.1.ebuild
+++ b/media-libs/mesa/mesa-7.7.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.1.ebuild,v 1.10 2010/08/27 19:18:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.1.ebuild,v 1.11 2010/09/09 11:00:12 scarabeus Exp $
EAPI="2"
@@ -51,7 +51,7 @@ RDEPEND="
dev-libs/expat
>=x11-libs/libdrm-2.4.17
x11-libs/libICE
- x11-libs/libX11[xcb?]
+ || ( <=x11-libs/libX11-1.3.5[xcb?] >x11-libs/libX11-1.3.5 )
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXi
diff --git a/media-libs/mesa/mesa-7.8.2.ebuild b/media-libs/mesa/mesa-7.8.2.ebuild
index 197625336f2a..9fddec1b7e9f 100644
--- a/media-libs/mesa/mesa-7.8.2.ebuild
+++ b/media-libs/mesa/mesa-7.8.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.8.2.ebuild,v 1.9 2010/08/27 19:18:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.8.2.ebuild,v 1.10 2010/09/09 11:00:12 scarabeus Exp $
EAPI=3
@@ -53,7 +53,7 @@ RDEPEND="
video_cards_nouveau? ( <x11-libs/libdrm-2.4.21 )
)
x11-libs/libICE
- x11-libs/libX11[xcb?]
+ || ( <=x11-libs/libX11-1.3.5[xcb?] >x11-libs/libX11-1.3.5 )
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXi