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

Package-Manager: portage-2.2_rc75/cvs/Linux x86_64

4 files changed, 25 insertions, 22 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/Manifest b/x11-libs/cairo/Manifest
index ab9305a9ce06..174d089cc611 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -6,10 +6,10 @@ DIST cairo-1.10.0.tar.gz 24022822 RMD160 fa65d4f3926308857d13f3ed0c100f89f075dc0
 DIST cairo-1.8-lcd_filter.patch.bz2 7067 RMD160 5c2ee470022788df88425da24cebea3baed69298 SHA1 9202c14967a633a9e57dd203695896d0197fea8b SHA256 6965d46df45d8382d122170a0f1dfaeb25bd68adc998b42f62397123e5795d1d
 DIST cairo-1.8.10.tar.gz 7102657 RMD160 9538baf30f812b950beeb93893f46d1223fb44ce SHA1 fd5e8ca82ff0e8542ea4c51612cad387f2a49df3 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
 DIST cairo-1.8.8.tar.gz 6646082 RMD160 78af536ebaaffc608114b626b22fc9a20cff3750 SHA1 e4b8b219427d1ca3dc95f5f44914dce1ae0c3766 SHA256 3c51d3de5dc4596e01a6675acd3c86c2c99c00f02e8fad5493758a29fe451c90
-EBUILD cairo-1.10.0.ebuild 3745 RMD160 ecf99fb45ad591a4fee42decfa9eb2681e5f050f SHA1 44f6f0150f03063fb3420607b0b345acb5e21e67 SHA256 d32468e87717f6f856ee9550707a409218bc6dde40603c893e6199bf399673be
+EBUILD cairo-1.10.0-r1.ebuild 3768 RMD160 253ef6d77eddd0403f7d852eb48fe0d3cb450d92 SHA1 e58388c82b59d4f6744549ec11dc9b7494ae2e7f SHA256 fb5df67e12f350e723e9174ac2125eb4c9743a2f9688b1fb3c15ed9349dc667d
 EBUILD cairo-1.8.10.ebuild 3586 RMD160 2b7d00410f705027e45aeba848d72a15c728a727 SHA1 fd90d5e499e57fecf6ae5a68754e49810204d128 SHA256 a122307a37eba3abff7fb58676255800918b7d89404ad1bf67d4d89c974f6fbd
 EBUILD cairo-1.8.8-r1.ebuild 3579 RMD160 a0bbaa9a2748d30bc408ad06b55d20ffdb3bb1be SHA1 ec55a981033137daf85a1c78ba16b3bdef23b7e4 SHA256 859054fa4543bc0d6fd0069f227c270cd7c505dafee3e20e85d25857ccbbf2aa
 EBUILD cairo-1.8.8.ebuild 3268 RMD160 93e9229cfa92173c2941f22a59960b52f3841cbc SHA1 f505952d4df79f73f95e90c0415c1bd58f51df10 SHA256 c50936f777d7a29b223ed4f80e192e11759c6a0f35779e2eaaa18aa9bbf89bbc
-EBUILD cairo-9999.ebuild 3743 RMD160 a07977216130fc9e141c394590f7ef9a9ec75585 SHA1 fa62fb6a37a05407ccdad12db79bc4747aa49746 SHA256 f16234c63f1166ef1c5727ce885a074ec141abc7aceaf236ca9ae51fb65941bd
-MISC ChangeLog 35517 RMD160 445136fe6b3af7e9d975c774030de8c9981cac70 SHA1 f233e86a18c62fda14b4ce9bdf7d6cdc9b450177 SHA256 ae038d8cba76adeb5588723eb7099a38d0f2d26b5dde5dd0e716d82a6612eea0
+EBUILD cairo-9999.ebuild 3763 RMD160 c87fe10ee4fe75abf82ed09037ae089cbb11f37a SHA1 c38df6d685d4bba10e4225d7c7fcbe0f548a1681 SHA256 1ece59f4db6548ea01defcf5d760e24b41d7147d69ce409d6c258980c6da148b
+MISC ChangeLog 35793 RMD160 72777663511b3aa1664255229c493c6b9aeeaa32 SHA1 6203e31712414c7895af2a78af810d1cc952b3ba SHA256 1f90671768cd593a1203ce8c35c3131384aa3fdd1641fa68358ddbbf1dcc5aaf
 MISC metadata.xml 1270 RMD160 c8e4ed6405aaccf4b19838a957742d9f28b24a92 SHA1 c1462b7e9810ef6f6b031875d7b6224ee1e2f0e8 SHA256 2041be22138e19a3a6a652d3bf02dd1cc54e916ce3e9e91257eb34f1ea9ef8da
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}
 }