diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-11-28 17:34:55 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2011-11-28 17:34:55 +0000 |
| commit | 72175c5c0db4ea48e7445e3d1098418741a8e921 (patch) | |
| tree | 23c9849fdb3eea1d56824508c3504fc0cd8e9245 /gnome-base/gnome-control-center | |
| parent | Force more recent dev-python/pygtk to avoid update problems wrt forum post. (diff) | |
| download | gentoo-2-72175c5c0db4ea48e7445e3d1098418741a8e921.tar.gz gentoo-2-72175c5c0db4ea48e7445e3d1098418741a8e921.tar.bz2 gentoo-2-72175c5c0db4ea48e7445e3d1098418741a8e921.zip | |
Add blocker on <gnome-settings-daemon-2.91.90 due to 50-accessibility.xml file collision (bug #392283, thanks to Sebastian Pipping for reporting).
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-control-center')
3 files changed, 14 insertions, 7 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/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} |