Add blocker on >=gnome-control-center-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

5 files changed, 32 insertions, 18 deletions

diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 1acae260aba5..04ed7a1ff902 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 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
+EBUILD gnome-control-center-3.2.1.ebuild 3090 RMD160 ce590e0a80d30d56c54e28eb150355aa51876d9a SHA1 5164380a8a6e60bfb1be255722afac3e1ccd89d4 SHA256 d5e199d63204c6b11bfcbffda3b96e59eaaca3d345b2381ae6111f3df2477b61
+EBUILD gnome-control-center-3.2.2.ebuild 3215 RMD160 1a0499bf44e6c92e7b4e071731aa09ab06f18944 SHA1 20886fd3d9f2efa377e72130bda67c59b9ca6c25 SHA256 a762c8349edce8a29dabaa61991339fd8efe7cb40a7b83bef1f9c11b14b5b5f3
+MISC ChangeLog 54809 RMD160 1c5a17aa326bb32ccb6df94b9f47aed899257810 SHA1 92e9a1a285d1aeb4f66fc63cd8d23f53a2749d1c SHA256 88903e5e0bed8cf1764b93910ae49e03deb5c526f20d84a23bbb04ff88683d6d
 MISC metadata.xml 522 RMD160 4ab7dba7c77c1b268d4276a16475e9854f3610f1 SHA1 6f4dece0998697e456a3967b28e254a8eb7f6f9d SHA256 131c11bbcbcdf6d0ba43d74423f0afdb957375343bfe8de3e578fce0f21491a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7TxkUACgkQdjK8w9WeBnCV7QEAgmTDL3oMzZzTNlkAEKY4VO7I
-krkw3M+PJ3P+LOnI9qgA/jrTFpuAfHL6HET2MD9A9HYMHUHHVKNoz48xminWpwmu
-=9PGz
+iF4EAREIAAYFAk7T0LoACgkQdjK8w9WeBnCSfQEAmgQC2dqUxnq426s1GDLw3+XR
+yCKpkbaq3o+KFWSHvUABAKe5cEj1X3m7lK2mNERp/dXiL9f0/bLzwYm8DGvyJSG0
+=6l4t
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index a04c5d2310da..6d9e49b065fe 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -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@gentoo.org>
+  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@gentoo.org>
+  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)
 
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 9f8095341f98..f30dbadfbb7a 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -15,15 +15,15 @@ DIST gnome-settings-daemon-2.32.1-gst-vol-control-support.patch 26788 RMD160 059
 DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 RMD160 71aef9419eeca5f9fa59bb55990327c307f9ca31 SHA1 f2550acb4a9fd8f96ead1263ba5739915c303f6e SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
 DIST gnome-settings-daemon-3.2.1.tar.xz 1418420 RMD160 ce15088f308ae96fb10975a66bcb55bea68d6eab SHA1 1526741dbdcf20a20aa4e78df483e6df881b52b5 SHA256 1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d
 DIST gnome-settings-daemon-3.2.2.tar.xz 1417364 RMD160 89b5fe84d337fb241a26f658e6daa35faf1fddc1 SHA1 fd79b7f8d28a5d448839e11960c9e07f0cef6ae5 SHA256 d91cac869e23f36942720485f04c3029fd5286fafb6ad12b07377e527b1f6884
-EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3795 RMD160 cacdc9dce05376e0a3ffc09b9253223211851ac8 SHA1 fe43bf2258a82216c7e0d11c870d391c245d2e8a SHA256 c1b014122e7577e2102119d5e7b1fcba2d8e8487dfb2a7ef06f9f2d37a8a30b7
+EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3945 RMD160 7b1a2738bfb1f3aa93beb2dd491d7a9d6baa4c85 SHA1 00d4145ea4860302867b95ee084214eb63461117 SHA256 bc133cd3e553fdda97e52479efdf29a100ae5941e8c39fb11bd36161af993c05
 EBUILD gnome-settings-daemon-3.2.1.ebuild 3995 RMD160 286e899fe4310424c20637730b473ba901716c77 SHA1 f13d080d1cb856436451970edb3debeb2bc92c4f SHA256 5df33b8a8835fb48acac5d40d4522f5b6684ae7690e1f241c61b0458bb0a0968
-EBUILD gnome-settings-daemon-3.2.2.ebuild 3882 RMD160 ac5f1846a117c5a12da5f01e8090648e87ba09e7 SHA1 45f2b25fe9b8fdcb9a32296d9a1fe193f0b38831 SHA256 267ddd52b90ba02c8479828789fe0911d74742ac3104e4f48ed21f605c4f05f1
-MISC ChangeLog 18970 RMD160 1351b1ca400c42bde856888ee6e9d7ba0187bcb5 SHA1 813b97baf5a79e36bc12f0da6cc6c8f16e4dbf98 SHA256 ccfe973b6912a756982c78ed41c34c2834739e92d677551c4d9153dae54a98a9
+EBUILD gnome-settings-daemon-3.2.2.ebuild 3883 RMD160 1a869ae34e0e0c90270180bd812d499334bf0ca5 SHA1 0d8ee66f897be99a27f623d489426162dab375fa SHA256 400f6d0b3c20e3e328b8b3871fbed93a1c850cc30ef49a6f4c8473dd4a044862
+MISC ChangeLog 19476 RMD160 2fea53e02a37222286618560728413c44d700aee SHA1 a4070a4a5a1b168d2063eb546e7d189973233d02 SHA256 4a3fe5c60d4e9d2cb7d09888d3769ea64b0efc5e6a5aeb7f9feff0ebe93408a8
 MISC metadata.xml 507 RMD160 da190ee6888fff3a8db0629c5c45ebd2235bf3fe SHA1 f7e7d8aa01ccdb946e6f7055992ac7f1da807815 SHA256 095c7487bf2ebadd2b70038c9f65724c2c4c6860a5b0da0096264e50a4e36480
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7ABicACgkQdjK8w9WeBnCIbQEAgjjED4Ox17kOpuHlAO6ErKp3
-yKseBBRWxGwL5Ko/QIIA/iMEoR+5K+m6NBeXQampPu14A7wstQKlM1HwdiHkXh0F
-=xG+8
+iF4EAREIAAYFAk7T0HgACgkQdjK8w9WeBnBNtgD/VSITsMi/NsAukECK2ekTZ09U
+CPHoJuyCMDYg0wMkOxYA/RYRWrTyAf/v500flZlxO8UCMhlehNShc5LgDtvnkQfe
+=s2sj
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild
index f168d21b3eed..4993da58cc86 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.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-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 @@ KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~am
 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 @@ RDEPEND=">=dev-libs/dbus-glib-0.74
 		>=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
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild
index aae1315861c0..c72f8777eb92 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-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-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 @@ HOMEPAGE="http://www.gnome.org"
 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