7 files changed, 19 insertions, 14 deletions
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index fdf6be9660fe..b6446b1a48f6 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.54 2010/09/04 21:53:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.55 2010/09/09 10:49:21 scarabeus Exp $
+
+  09 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> compiz-0.8.4.ebuild,
+  compiz-0.8.4-r1.ebuild, compiz-0.8.4-r2.ebuild, compiz-0.8.4-r3.ebuild,
+  compiz-0.8.6.ebuild, compiz-0.8.6-r1.ebuild:
+  Update deps on libX11[xcb].
 
 *compiz-0.8.6-r1 (04 Sep 2010)
 
diff --git a/x11-wm/compiz/compiz-0.8.4-r1.ebuild b/x11-wm/compiz/compiz-0.8.4-r1.ebuild
index cf35ca2399b4..2a9308d63e6b 100644
--- a/x11-wm/compiz/compiz-0.8.4-r1.ebuild
+++ b/x11-wm/compiz/compiz-0.8.4-r1.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/x11-wm/compiz/compiz-0.8.4-r1.ebuild,v 1.1 2010/01/31 16:49:44 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.4-r1.ebuild,v 1.2 2010/09/09 10:49:21 scarabeus Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ DEPEND="
 	media-libs/libpng
 	>=media-libs/mesa-6.5.1-r1
 	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/libX11[xcb]
+	|| ( <=x11-libs/libX11-1.3.5[xcb] >x11-libs/libX11-1.3.5  )
 	x11-libs/libxcb
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
diff --git a/x11-wm/compiz/compiz-0.8.4-r2.ebuild b/x11-wm/compiz/compiz-0.8.4-r2.ebuild
index 296b6f68deb0..cf1a220c54db 100644
--- a/x11-wm/compiz/compiz-0.8.4-r2.ebuild
+++ b/x11-wm/compiz/compiz-0.8.4-r2.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/x11-wm/compiz/compiz-0.8.4-r2.ebuild,v 1.2 2010/02/20 19:05:22 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.4-r2.ebuild,v 1.3 2010/09/09 10:49:21 scarabeus Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ DEPEND="
 	media-libs/libpng
 	>=media-libs/mesa-6.5.1-r1
 	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/libX11[xcb]
+	|| ( <=x11-libs/libX11-1.3.5[xcb] >x11-libs/libX11-1.3.5  )
 	x11-libs/libxcb
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
diff --git a/x11-wm/compiz/compiz-0.8.4-r3.ebuild b/x11-wm/compiz/compiz-0.8.4-r3.ebuild
index d18a33ac425a..31f83eb21819 100644
--- a/x11-wm/compiz/compiz-0.8.4-r3.ebuild
+++ b/x11-wm/compiz/compiz-0.8.4-r3.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/x11-wm/compiz/compiz-0.8.4-r3.ebuild,v 1.1 2010/04/03 06:03:27 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.4-r3.ebuild,v 1.2 2010/09/09 10:49:21 scarabeus Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ DEPEND="
 	media-libs/libpng
 	>=media-libs/mesa-6.5.1-r1
 	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/libX11[xcb]
+	|| ( <=x11-libs/libX11-1.3.5[xcb] >x11-libs/libX11-1.3.5  )
 	x11-libs/libxcb
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
diff --git a/x11-wm/compiz/compiz-0.8.4.ebuild b/x11-wm/compiz/compiz-0.8.4.ebuild
index 32a2c061338c..8a1e15a834ab 100644
--- a/x11-wm/compiz/compiz-0.8.4.ebuild
+++ b/x11-wm/compiz/compiz-0.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.4.ebuild,v 1.2 2009/10/25 00:29:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.4.ebuild,v 1.3 2010/09/09 10:49:21 scarabeus Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ DEPEND="
 	media-libs/libpng
 	>=media-libs/mesa-6.5.1-r1
 	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/libX11[xcb]
+	|| ( <=x11-libs/libX11-1.3.5[xcb] >x11-libs/libX11-1.3.5  )
 	x11-libs/libxcb
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
diff --git a/x11-wm/compiz/compiz-0.8.6-r1.ebuild b/x11-wm/compiz/compiz-0.8.6-r1.ebuild
index 77ecd67c66fe..bb17b3ea6442 100644
--- a/x11-wm/compiz/compiz-0.8.6-r1.ebuild
+++ b/x11-wm/compiz/compiz-0.8.6-r1.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/x11-wm/compiz/compiz-0.8.6-r1.ebuild,v 1.1 2010/09/04 21:53:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.6-r1.ebuild,v 1.2 2010/09/09 10:49:21 scarabeus Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ COMMONDEPEND="
 	media-libs/libpng
 	>=media-libs/mesa-6.5.1-r1
 	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/libX11[xcb]
+	|| ( <=x11-libs/libX11-1.3.5[xcb] >x11-libs/libX11-1.3.5  )
 	x11-libs/libxcb
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
diff --git a/x11-wm/compiz/compiz-0.8.6.ebuild b/x11-wm/compiz/compiz-0.8.6.ebuild
index a46e0dc02cba..513cb2565700 100644
--- a/x11-wm/compiz/compiz-0.8.6.ebuild
+++ b/x11-wm/compiz/compiz-0.8.6.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/x11-wm/compiz/compiz-0.8.6.ebuild,v 1.2 2010/04/29 00:18:52 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.6.ebuild,v 1.3 2010/09/09 10:49:21 scarabeus Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ COMMONDEPEND="
 	media-libs/libpng
 	>=media-libs/mesa-6.5.1-r1
 	>=x11-base/xorg-server-1.1.1-r1
-	x11-libs/libX11[xcb]
+	|| ( <=x11-libs/libX11-1.3.5[xcb] >x11-libs/libX11-1.3.5  )
 	x11-libs/libxcb
 	x11-libs/libXcomposite
 	x11-libs/libXdamage