Disable xlib over xcb by default. To make the choice of backend up to application. Thanks to remi for pointing out.

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

3 files changed, 22 insertions, 19 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 58168c01f174..634e97f80598 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.255 2010/09/08 20:01:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.256 2010/09/09 08:03:08 scarabeus Exp $
+
+*cairo-1.10.0-r1 (09 Sep 2010)
+
+  09 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> -cairo-1.10.0.ebuild,
+  +cairo-1.10.0-r1.ebuild, cairo-9999.ebuild:
+  Disable xlib over xcb by default. To make the choice of backend up to
+  application. Thanks to remi for pointing out.
 
   08 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> cairo-1.10.0.ebuild,
   cairo-9999.ebuild:
diff --git a/x11-libs/cairo/cairo-1.10.0.ebuild b/x11-libs/cairo/cairo-1.10.0-r1.ebuild
index bab76ed1dd6a..5d2d61f965f3 100644
--- a/x11-libs/cairo/cairo-1.10.0.ebuild
+++ b/x11-libs/cairo/cairo-1.10.0-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-libs/cairo/cairo-1.10.0.ebuild,v 1.3 2010/09/08 20:01:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.0-r1.ebuild,v 1.1 2010/09/09 08:03:08 scarabeus Exp $
 
 EAPI=3
 
@@ -39,12 +39,6 @@ RDEPEND="media-libs/fontconfig
 			>=sys-fs/udev-136
 			gallium? ( media-libs/mesa[gallium] )
 		)
-		xcb? (
-			|| (
-				<=x11-libs/libX11-1.3.5[xcb]
-				>x11-libs/libX11-1.3.5
-			)
-		)
 	)
 	xcb? (
 		x11-libs/libxcb
@@ -93,7 +87,6 @@ src_configure() {
 	if use X; then
 		myopts+="
 			$(use_enable drm)
-			$(use_enable xcb xlib-xcb)
 		"
 
 		if use drm; then
@@ -112,10 +105,14 @@ src_configure() {
 		use drm && ewarn "drm use requires X use enabled. So disabling for now."
 		myopts+="
 			--disable-drm
-			--disable-xcb-lib
+			--disable-gallium
+			--disable-xcb-drm
 		"
 	fi
 
+
+	# --disable-xcb-lib:
+	#	do not override good xlib backed by hardforcing rendering over xcb
 	econf \
 		--disable-dependency-tracking \
 		$(use_with X x) \
@@ -137,6 +134,7 @@ src_configure() {
 		--enable-pdf \
 		--enable-png \
 		--enable-ps \
+		--disable-xcb-lib \
 		${myopts}
 }
 
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 02fd07b007ea..bfbca78df73c 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.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-libs/cairo/cairo-9999.ebuild,v 1.2 2010/09/08 20:01:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.3 2010/09/09 08:03:08 scarabeus Exp $
 
 EAPI=3
 
@@ -39,12 +39,6 @@ RDEPEND="media-libs/fontconfig
 			>=sys-fs/udev-136
 			gallium? ( media-libs/mesa[gallium] )
 		)
-		xcb? (
-			|| (
-				<=x11-libs/libX11-1.3.5[xcb]
-				>x11-libs/libX11-1.3.5
-			)
-		)
 	)
 	xcb? (
 		x11-libs/libxcb
@@ -93,7 +87,6 @@ src_configure() {
 	if use X; then
 		myopts+="
 			$(use_enable drm)
-			$(use_enable xcb xlib-xcb)
 		"
 
 		if use drm; then
@@ -112,10 +105,14 @@ src_configure() {
 		use drm && ewarn "drm use requires X use enabled. So disabling for now."
 		myopts+="
 			--disable-drm
-			--disable-xcb-lib
+			--disable-gallium
+			--disable-xcb-drm
 		"
 	fi
 
+
+	# --disable-xcb-lib:
+	#	do not override good xlib backed by hardforcing rendering over xcb
 	econf \
 		--disable-dependency-tracking \
 		$(use_with X x) \
@@ -137,6 +134,7 @@ src_configure() {
 		--enable-pdf \
 		--enable-png \
 		--enable-ps \
+		--disable-xcb-lib \
 		${myopts}
 }