[gentoo-commits] gentoo-x86 commit in gnome-base/gnome-settings-daemon: gnome-settings-daemon-3.2.2.ebuild ChangeLog gnome-settings-daemon-2.32.1-r2.ebuild

[Alexandre Rostovtsev (tetromino)]

tetromino    11/11/28 18:18:26

  Modified:             gnome-settings-daemon-3.2.2.ebuild ChangeLog
                        gnome-settings-daemon-2.32.1-r2.ebuild
  Log:
  Add blocker on >=gnome-control-center-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)

Revision  Changes    Path
1.2                  gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild?r1=1.1&r2=1.2

Index: gnome-settings-daemon-3.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-settings-daemon-3.2.2.ebuild	13 Nov 2011 18:02:09 -0000	1.1
+++ gnome-settings-daemon-3.2.2.ebuild	28 Nov 2011 18:18:26 -0000	1.2
@@ -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-settings-daemon/gnome-settings-daemon-3.2.2.ebuild,v 1.1 2011/11/13 18:02:09 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild,v 1.2 2011/11/28 18:18:26 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+colord +cups debug packagekit policykit short-touchpad-timeout smartcard +udev"
+IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard +udev"
 
 # Latest gsettings-desktop-schemas is needed due to commit e8d1de92
 # Latest gnome-desktop needed to fix the DPMS timeout bug #385063



1.98                 gnome-base/gnome-settings-daemon/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog?r1=1.97&r2=1.98

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- ChangeLog	13 Nov 2011 18:02:09 -0000	1.97
+++ ChangeLog	28 Nov 2011 18:18:26 -0000	1.98
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.97 2011/11/13 18:02:09 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.98 2011/11/28 18:18:26 tetromino Exp $
+
+  28 Nov 2011; Alexandre Rostovtsev <tetromino@g.o>
+  gnome-settings-daemon-2.32.1-r2.ebuild, gnome-settings-daemon-3.2.2.ebuild:
+  Add blocker on >=gnome-control-center-2.91.90 due to 50-accessibility.xml
+  file collision (bug #392283, thanks to Sebastian Pipping for reporting).
+
+  24 Nov 2011; Alexandre Rostovtsev <tetromino@g.o>
+  gnome-settings-daemon-3.2.2.ebuild:
+  Follow Ubuntu's example and make short touchpad timeout the default. 2
+  seconds really is far too long for comfort.
 
 *gnome-settings-daemon-3.2.2 (13 Nov 2011)
 



1.8                  gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild?r1=1.7&r2=1.8

Index: gnome-settings-daemon-2.32.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-settings-daemon-2.32.1-r2.ebuild	30 Oct 2011 16:06:55 -0000	1.7
+++ gnome-settings-daemon-2.32.1-r2.ebuild	28 Nov 2011 18:18:26 -0000	1.8
@@ -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-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild,v 1.7 2011/10/30 16:06:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild,v 1.8 2011/11/28 18:18:26 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -23,7 +23,7 @@
 IUSE="debug libnotify policykit pulseaudio smartcard"
 
 # libgnomekbd-2.91 breaks API/ABI
-RDEPEND=">=dev-libs/dbus-glib-0.74
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 	>=dev-libs/glib-2.18:2
 	>=x11-libs/gtk+-2.21.2:2
 	>=gnome-base/gconf-2.6.1:2
@@ -51,7 +51,11 @@
 		>=media-libs/gst-plugins-base-0.10.1.2:0.10 )
 	smartcard? ( >=dev-libs/nss-3.11.2 )"
 
-DEPEND="${RDEPEND}
+# 50-accessibility.xml moved to gnome-control-center in gnome-3
+RDEPEND="${COMMON_DEPEND}
+	!>=gnome-base/gnome-control-center-2.91.90"
+
+DEPEND="${COMMON_DEPEND}
 	!<gnome-base/gnome-control-center-2.22
 	sys-devel/gettext
 	>=dev-util/intltool-0.40