From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 14 Aug 2011 06:48:39 +0000 (+0000)
Subject: Remove unnecessary --{en,dis}able-xcb-drm wrt bug #379097.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3dfc528053c488dcfc4c09a6f3355142ff4a7b97;p=gentoo.git

Remove unnecessary --{en,dis}able-xcb-drm wrt bug #379097.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
---

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 13bb5514d26b..d45233b8042a 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.283 2011/07/13 09:05:48 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.284 2011/08/14 06:48:39 mgorny Exp $
+
+  14 Aug 2011; Michał Górny <mgorny@gentoo.org> cairo-9999.ebuild:
+  Remove unnecessary --{en,dis}able-xcb-drm wrt bug #379097.
 
   13 Jul 2011; Markus Duft <mduft@gentoo.org> cairo-1.10.2-r1.ebuild,
   +files/cairo-1.10.2-interix.patch:
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 0efdfa1439b1..57ce13eab6e8 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX cairo-1.10.0-buggy_gradients.patch 581 RMD160 077fb7a18c2840c0d637d2161ca9d244cb69608b SHA1 45f4b6a834cb9f1c153f092fba18416d257d71c7 SHA256 3b622bb250b996ea5f5adc5c899af343e0efba5c477fa0e51fdbb720a8dd1b18
 AUX cairo-1.10.2-interix.patch 1235 RMD160 83803df650e8381649b11bd3c81dd0c6ee5f8e53 SHA1 d6b731fc8aa0c9461e62a9afc1431782d3af433b SHA256 d915d69e2eb96f6a4bef1de0c493ed9face7b5d6a79194ab9f2a7f3d85b799ea
@@ -11,13 +11,15 @@ DIST cairo-1.8-lcd_filter.patch.bz2 7067 RMD160 5c2ee470022788df88425da24cebea3b
 DIST cairo-1.8.10.tar.gz 7102657 RMD160 9538baf30f812b950beeb93893f46d1223fb44ce SHA1 fd5e8ca82ff0e8542ea4c51612cad387f2a49df3 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
 EBUILD cairo-1.10.2-r1.ebuild 4143 RMD160 a133b34322130bcc37bf24dcc47d4d0f2ee53586 SHA1 df64a3fe568a9c799927af4c47846bf4e833461c SHA256 0d23e478717f6221da9ede8781815e6d4c95520ecf514d2aba62c076b4238278
 EBUILD cairo-1.8.10.ebuild 3451 RMD160 c9205d9e45a024a67c3a7acb247a4f6feb21f4e2 SHA1 84ca8d3e011c476dc899e7f850d6885277643d15 SHA256 0fd58c9f5c9255f94864d9b137d6b4d940281d088a2f4f498a6b1495daca438c
-EBUILD cairo-9999.ebuild 3744 RMD160 c12315c9152b881ca995b5cb991ede75110e1870 SHA1 cbb683373ca0f19aa859158e13114213dd673c58 SHA256 ee1b817b90ec513d2a1c4746d6ea8f13c846d601c42519803b9547778d684974
-MISC ChangeLog 39848 RMD160 6ea1814eb3e495daacde0ee20dece45af2b646aa SHA1 7aae46ecb37bb951fd2696034a2f4b246ee6647b SHA256 ee69fde6cb770712206df9537a0452b993b571c71ebe3d12ed23d7d1c2eac1b2
+EBUILD cairo-9999.ebuild 3631 RMD160 ac3d210f7bd2ec6f74762bfd76ae5a0adad5474e SHA1 46ca6078237a8e1396d3ec15665b0b42554224db SHA256 f5ab90012d7fd824c4e22b9487f42e5711b8f07f074f8c0f0a260d5c14f14d2f
+MISC ChangeLog 39980 RMD160 dd15ed7dc4ff99a8adc340cadc94b490f219d224 SHA1 19a906e522dfdebb7d2a117df87c343f755234dd SHA256 e7fa77e741d94068bfa1028c20b07728fc770373a4e38a31af90fabe89f09893
 MISC metadata.xml 998 RMD160 2a4f5df13bc9d39c91e12e80924465450d758e32 SHA1 f4e943a00531a6f6a5ca2945a05ab95233b63e3b SHA256 325e1f55131748f3840ed1cfec421fe27aa6a621568135e4f6ce1d517b5d3cd8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4dX/EACgkQaBSIl5HlrrKPZgCdFoicZOmVnZCDTfCZzsNlX38C
-ROkAn093EVLtRH0xKKeK/MFd2lgIjvx8
-=Hy74
+iJwEAQEIAAYFAk5HcC0ACgkQfXuS5UK5QB00FAQAq8OxZXOeEquXpN6SJtNRmHbb
+anH8wIDM2AhAfP5bAMeatpoOav8bdSyco4FcTXR8g7WwPVcpoHovb3srszgd9re4
+cCFbLbNX4zRNz6V9Y7+AnUWnfyxYLqH2nQg0ndgod1/tZUG+3JllMOxfC4qA5jd2
+W1PpSxqqJnxgzXiJvjo=
+=EbGU
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index edda9c725a25..9edef51bc27b 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.14 2011/07/07 05:46:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.15 2011/08/14 06:48:39 mgorny Exp $
 
 EAPI=4
 
@@ -97,15 +97,6 @@ src_configure() {
 	append-flags -finline-limit=1200
 
 	use X && myopts+=" --enable-tee=yes"
-	if use drm; then
-		myopts+="
-			$(use_enable xcb xcb-drm)
-		"
-	else
-		myopts+="
-			--disable-xcb-drm
-		"
-	fi
 
 	# --disable-xcb-lib:
 	#	do not override good xlib backed by hardforcing rendering over xcb