Depend on pixman unconditionally, bug #410813 comment 3.

(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)

9 files changed, 24 insertions, 17 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 8b4db8d2e2ed..40c91cdb61e7 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.98 2012/09/02 19:35:47 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.99 2012/09/03 09:25:25 chithanh Exp $
+
+  03 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xf86-video-intel-2.18.0.ebuild, xf86-video-intel-2.19.0.ebuild,
+  xf86-video-intel-2.20.0.ebuild, xf86-video-intel-2.20.1.ebuild,
+  xf86-video-intel-2.20.2.ebuild, xf86-video-intel-2.20.3.ebuild,
+  xf86-video-intel-2.20.5.ebuild, xf86-video-intel-2.20.6.ebuild:
+  Depend on pixman unconditionally, bug #410813 comment 3.
 
 *xf86-video-intel-2.20.6 (02 Sep 2012)
 
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.18.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.18.0.ebuild
index a5580b53a875..698e31703564 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.18.0.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.18.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.18.0.ebuild,v 1.4 2012/07/04 22:13:45 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.18.0.ebuild,v 1.5 2012/09/03 09:25:25 chithanh Exp $
 
 EAPI=4
 
@@ -16,11 +16,11 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXvMC
 	>=x11-libs/libxcb-1.5
+	>=x11-libs/pixman-0.24
 	x11-libs/xcb-util
 	>=x11-libs/libdrm-2.4.29[video_cards_intel]
 	sna? (
 		>=x11-base/xorg-server-1.10
-		>=x11-libs/pixman-0.24
 	)"
 DEPEND="${RDEPEND}
 	>=x11-proto/dri2proto-2.6"
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild
index af629e747973..8c8fa06d81b2 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild,v 1.8 2012/08/26 19:57:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild,v 1.9 2012/09/03 09:25:25 chithanh Exp $
 
 EAPI=4
 
@@ -16,6 +16,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXvMC
 	>=x11-libs/libxcb-1.5
+	>=x11-libs/pixman-0.24
 	x11-libs/xcb-util
 	>=x11-libs/libdrm-2.4.29[video_cards_intel]
 	glamor? (
@@ -23,7 +24,6 @@ RDEPEND="x11-libs/libXext
 	)
 	sna? (
 		>=x11-base/xorg-server-1.10
-		>=x11-libs/pixman-0.24
 	)"
 DEPEND="${RDEPEND}
 	>=x11-proto/dri2proto-2.6"
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.0.ebuild
index 412a9f6401b1..a1d0c49d625e 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.0.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.0.ebuild,v 1.1 2012/07/19 06:46:17 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.0.ebuild,v 1.2 2012/09/03 09:25:25 chithanh Exp $
 
 EAPI=4
 
@@ -16,6 +16,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXvMC
 	>=x11-libs/libxcb-1.5
+	>=x11-libs/pixman-0.27.1
 	x11-libs/xcb-util
 	>=x11-libs/libdrm-2.4.29[video_cards_intel]
 	glamor? (
@@ -23,7 +24,6 @@ RDEPEND="x11-libs/libXext
 	)
 	sna? (
 		>=x11-base/xorg-server-1.10
-		>=x11-libs/pixman-0.23
 	)"
 DEPEND="${RDEPEND}
 	>=x11-proto/dri2proto-2.6"
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.1.ebuild
index 1688142d9124..629fc41cf88c 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.1.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.1.ebuild,v 1.1 2012/07/23 12:01:52 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.1.ebuild,v 1.2 2012/09/03 09:25:25 chithanh Exp $
 
 EAPI=4
 
@@ -16,6 +16,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXvMC
 	>=x11-libs/libxcb-1.5
+	>=x11-libs/pixman-0.27.1
 	x11-libs/xcb-util
 	>=x11-libs/libdrm-2.4.29[video_cards_intel]
 	glamor? (
@@ -23,7 +24,6 @@ RDEPEND="x11-libs/libXext
 	)
 	sna? (
 		>=x11-base/xorg-server-1.10
-		>=x11-libs/pixman-0.23
 	)"
 DEPEND="${RDEPEND}
 	>=x11-proto/dri2proto-2.6"
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.2.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.2.ebuild
index f22ccc6f74e9..dc95752e1840 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.2.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.2.ebuild,v 1.1 2012/07/27 23:00:34 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.2.ebuild,v 1.2 2012/09/03 09:25:25 chithanh Exp $
 
 EAPI=4
 
@@ -16,6 +16,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXvMC
 	>=x11-libs/libxcb-1.5
+	>=x11-libs/pixman-0.27.1
 	x11-libs/xcb-util
 	>=x11-libs/libdrm-2.4.29[video_cards_intel]
 	glamor? (
@@ -23,7 +24,6 @@ RDEPEND="x11-libs/libXext
 	)
 	sna? (
 		>=x11-base/xorg-server-1.10
-		>=x11-libs/pixman-0.23
 	)"
 DEPEND="${RDEPEND}
 	>=x11-proto/dri2proto-2.6"
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.3.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.3.ebuild
index 56650fc33f11..7d66f5134371 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.3.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.3.ebuild,v 1.1 2012/08/04 14:20:54 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.3.ebuild,v 1.2 2012/09/03 09:25:25 chithanh Exp $
 
 EAPI=4
 
@@ -16,6 +16,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXvMC
 	>=x11-libs/libxcb-1.5
+	>=x11-libs/pixman-0.27.1
 	x11-libs/xcb-util
 	>=x11-libs/libdrm-2.4.29[video_cards_intel]
 	glamor? (
@@ -23,7 +24,6 @@ RDEPEND="x11-libs/libXext
 	)
 	sna? (
 		>=x11-base/xorg-server-1.10
-		>=x11-libs/pixman-0.23
 	)"
 DEPEND="${RDEPEND}
 	>=x11-proto/dri2proto-2.6"
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.5.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.5.ebuild
index fca05cb81e0f..758cfd990a62 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.5.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.5.ebuild,v 1.1 2012/09/01 15:05:23 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.5.ebuild,v 1.2 2012/09/03 09:25:25 chithanh Exp $
 
 EAPI=4
 
@@ -16,6 +16,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXvMC
 	>=x11-libs/libxcb-1.5
+	>=x11-libs/pixman-0.27.1
 	x11-libs/xcb-util
 	>=x11-libs/libdrm-2.4.29[video_cards_intel]
 	glamor? (
@@ -23,7 +24,6 @@ RDEPEND="x11-libs/libXext
 	)
 	sna? (
 		>=x11-base/xorg-server-1.10
-		>=x11-libs/pixman-0.23
 	)"
 DEPEND="${RDEPEND}
 	>=x11-proto/dri2proto-2.6"
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.6.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.6.ebuild
index 955f1521a19c..f1a4ebe7db41 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.6.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.6.ebuild,v 1.1 2012/09/02 19:35:47 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.6.ebuild,v 1.2 2012/09/03 09:25:25 chithanh Exp $
 
 EAPI=4
 
@@ -16,6 +16,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXvMC
 	>=x11-libs/libxcb-1.5
+	>=x11-libs/pixman-0.27.1
 	x11-libs/xcb-util
 	>=x11-libs/libdrm-2.4.29[video_cards_intel]
 	glamor? (
@@ -23,7 +24,6 @@ RDEPEND="x11-libs/libXext
 	)
 	sna? (
 		>=x11-base/xorg-server-1.10
-		>=x11-libs/pixman-0.23
 	)"
 DEPEND="${RDEPEND}
 	>=x11-proto/dri2proto-2.6"