From 83bf9acd36f6c68043dfeac232fa2cb730201486 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Mon, 28 Nov 2011 17:34:55 +0000
Subject: [PATCH] Add blocker on <gnome-settings-daemon-2.91.90 due to
 50-accessibility.xml file collision (bug #392283, thanks to Sebastian Pipping
 for reporting).

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
---
 gnome-base/gnome-control-center/ChangeLog            |  7 ++++++-
 gnome-base/gnome-control-center/Manifest             | 12 ++++++------
 .../gnome-control-center-3.2.1.ebuild                |  7 ++++---
 .../gnome-control-center-3.2.2.ebuild                |  7 ++++---
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 46771ddb433d..574382b83f7d 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.93 2011/11/13 18:02:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.94 2011/11/28 17:34:55 tetromino Exp $
+
+  28 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-control-center-3.2.1.ebuild, gnome-control-center-3.2.2.ebuild:
+  Add blocker on <gnome-settings-daemon-2.91.90 due to 50-accessibility.xml
+  file collision (bug #392283, thanks to Sebastian Pipping for reporting).
 
 *gnome-control-center-3.2.2 (13 Nov 2011)
 
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 9470f962e1f1..1acae260aba5 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -13,14 +13,14 @@ DIST gnome-control-center-2.32.1.tar.bz2 2280217 RMD160 47515f3f96d5695b457a8363
 DIST gnome-control-center-3.2.1.tar.xz 4252172 RMD160 00542e30fa12775d7683d09c2e12d6d9fa612343 SHA1 794cbff94baf876e80fe73c7e646f468cf5bc398 SHA256 bf354ea096ee7501cbdf53c42386355f19975b4206995e6110c180e7cb74a088
 DIST gnome-control-center-3.2.2.tar.xz 4225196 RMD160 6a97f6cf9824c99daf3b33c0e347131b7024988f SHA1 e946ab719625e6f793141434179a932c35ece183 SHA256 e675f8cfde06775919eb0c9fa4ee8c61310702989eecac6083098beb5afd9369
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2697 RMD160 579c17b90282bc8031137b478feddcf55d5168db SHA1 0cfe31988822ee4bc016f3f6ccc6640685f6f308 SHA256 e5850ae31e5c73ec3f7d77ee8d35af746080e5497dce91fff487e90b727c971b
-EBUILD gnome-control-center-3.2.1.ebuild 3090 RMD160 1dae1743efa388ab400c1687d6f2158afeded383 SHA1 8e91414c3a03a73792057373d0f51bb607ba2efe SHA256 652ac2f5e7018a38ac6aeb5c8bb8e3645177b348257d4c897dbbd28162f298ba
-EBUILD gnome-control-center-3.2.2.ebuild 3215 RMD160 c85c6aaebc9e45fd114dbdae37b6dd41a4881c5b SHA1 24d87527d9effd5aa247057b2d50e854a0eedd70 SHA256 51e24fee4bbd094cfb9ed84f2dd09ee223f86c6fd7bab1718d991761b0cbaa79
-MISC ChangeLog 54258 RMD160 4235476dc36297f832693763bd169b53536943b3 SHA1 31af2d31490529d5c1d9c5002049a85ca87ba4f8 SHA256 025c0cad2029e3d62cf4b14fa5220965d8a799463e903a851bf7cbec77667ccd
+EBUILD gnome-control-center-3.2.1.ebuild 3134 RMD160 ba370c022da382d7cfc4d6852e7c8f93702ce8cd SHA1 04c64f3a761e14b30b9806341c5a921391fa58a4 SHA256 b3eec71aca19bf5890295581e9530c41e8642ec07332db6f7360a13b2752836c
+EBUILD gnome-control-center-3.2.2.ebuild 3259 RMD160 16735cd9076f2cc1ec1dcb1fbe32f1e8bdffe97d SHA1 a7120325a96f880e0dcd9aafd6b553b75b41e911 SHA256 47144b4def9427a4db27aa86b17ae93f47334be5ca320239fa89a21d1e2a6d22
+MISC ChangeLog 54541 RMD160 4169fcf3068f156e149c2e5aecacbda0c0b3aad9 SHA1 8e1062983aa1ab53f8630ba510a9ba3f57224a20 SHA256 de49aecdf92b3699968f385ae826f2edd41cbce2129a1fedc1841f5105c2c618
 MISC metadata.xml 522 RMD160 4ab7dba7c77c1b268d4276a16475e9854f3610f1 SHA1 6f4dece0998697e456a3967b28e254a8eb7f6f9d SHA256 131c11bbcbcdf6d0ba43d74423f0afdb957375343bfe8de3e578fce0f21491a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF0EAREIAAYFAk7ABlQACgkQdjK8w9WeBnBatAD/bbGZX/0rwYpQPtr6UR7VnF6y
-mKnjkEjTlG09aEanKWsA+M/YQ99vkuDGxu/EXIvj3PtkrVuSM5AxU21dGpIKq7k=
-=J5oh
+iF4EAREIAAYFAk7TxkUACgkQdjK8w9WeBnCV7QEAgmTDL3oMzZzTNlkAEKY4VO7I
+krkw3M+PJ3P+LOnI9qgA/jrTFpuAfHL6HET2MD9A9HYMHUHHVKNoz48xminWpwmu
+=9PGz
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild
index 2538ad77dbb7..4668909d6ef9 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.2.1.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/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild,v 1.1 2011/10/29 06:53:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild,v 1.2 2011/11/28 17:34:55 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -67,10 +67,11 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/accountsservice
 	cups? ( net-print/cups-pk-helper )
 
+	!<gnome-base/gdm-2.91.94
+	!<gnome-base/gnome-settings-daemon-2.91.90
 	!<gnome-extra/gnome-color-manager-3.1.2
 	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<gnome-base/gdm-2.91.94"
+	!<gnome-extra/gnome-media-2.32.0-r300"
 # PDEPEND to avoid circular dependency
 PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
 DEPEND="${COMMON_DEPEND}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild
index dc7df69d5e4c..e325d29a920c 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.2.2.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/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild,v 1.1 2011/11/13 18:02:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild,v 1.2 2011/11/28 17:34:55 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -67,10 +67,11 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/accountsservice
 	cups? ( net-print/cups-pk-helper )
 
+	!<gnome-base/gdm-2.91.94
+	!<gnome-base/gnome-settings-daemon-2.91.90
 	!<gnome-extra/gnome-color-manager-3.1.2
 	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<gnome-base/gdm-2.91.94"
+	!<gnome-extra/gnome-media-2.32.0-r300"
 # PDEPEND to avoid circular dependency
 PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
 DEPEND="${COMMON_DEPEND}
-- 
2.26.2