Move the 50-accessibility.xml blocker to gnome-settings-daemon-2 ebuild since it...

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

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 574382b83f7d7f245a710c09958e6a37509e1137..8b88a4cfe512db3fddc27019d11b41a49ba6af1b 100644 (file)
--- 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.94 2011/11/28 17:34:55 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.95 2011/11/28 18:19:32 tetromino Exp $
+
+  28 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-control-center-3.2.1.ebuild, gnome-control-center-3.2.2.ebuild:
+  Move the 50-accessibility.xml blocker to gnome-settings-daemon-2 ebuild since
+  it is only relevant on a downgrade from gnome-3 to 2.
 
   28 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-control-center-3.2.1.ebuild, gnome-control-center-3.2.2.ebuild:

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 4668909d6ef9184832e431108fd75498b5b67464..5ab8f96e4481dc55b3308befca30cc3d70dff667 100644 (file)
--- 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.2 2011/11/28 17:34:55 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild,v 1.3 2011/11/28 18:19:32 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -68,7 +68,6 @@ RDEPEND="${COMMON_DEPEND}
        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"

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 e325d29a920cc1dd8b01553856439e3752a45a2a..bcafc66dc86ee2910f411f8e2639bc630a157358 100644 (file)
--- 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.2 2011/11/28 17:34:55 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.2.ebuild,v 1.3 2011/11/28 18:19:32 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -68,7 +68,6 @@ RDEPEND="${COMMON_DEPEND}
        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"