Bump, drop old. Lots of bugs fixed, several memory leaks plugged.

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

10 files changed, 69 insertions, 237 deletions

diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 3d0675fec679..9470f962e1f1 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -6,23 +6,21 @@ AUX gnome-control-center-2.32.1-erase-background.patch 1899 RMD160 3407e35a16bf8
 AUX gnome-control-center-2.32.1-mime-handler.patch 55290 RMD160 0001d36b7409ece4ab0b0f1ecf3f762863028c9a SHA1 9b17ebe472aabb69c768618cada7bfbd10cbe910 SHA256 49c034e437493f1639e97b31e0a38b1921536abfe31d8b3c7917d0b8495994cd
 AUX gnome-control-center-2.32.1-mime-handler2.patch 2229 RMD160 b8afdaa2b5df38ca6ba31f925bcbbb1b54f04d0e SHA1 6af85fb5fe55a8e05948338f66d79f10ca787e3e SHA256 3a49a66bb08cbcd24cf750894d156ba85686128e83561df40f8cfe88075ca99d
 AUX gnome-control-center-2.32.1-mime-handler3.patch 11957 RMD160 16e734ec1dfecc1e95cfc9ffcfe3b8cd294ee712 SHA1 b069adce19b7286e410beae4b9909ecc13485d2e SHA256 8637fdb6039d43d085cf7cf2915b46e744522b7a3976d1b64035a6be22491538
-AUX gnome-control-center-3.0.2-cups-ppd.h.patch 1534 RMD160 51b9b65a4c36beb67ece15a736a5e69abe363580 SHA1 73b7402688092c299f2f85d99ac61e344ba5a19a SHA256 ac21082f23ea4d11337e162d4b4eb410d5dbd01ca2e2e3bb82c2470c00434cad
-AUX gnome-control-center-3.0.2-delete-users-32-bit.patch 993 RMD160 4de0c576ccbf5fda4bc8508ec123816c0a9df361 SHA1 c3a24ea90fc5468777b0bc782784dbb788286f5a SHA256 1afb8d93ff9d3da24618e1da56cb36b67a3c0eb79e71bedb816f17619e3eca5c
-AUX gnome-control-center-3.0.2-https-handler.patch 1031 RMD160 0d8d7d3b00dda710e81661b89b31b14a3410e09a SHA1 e4bf47f8f3a8e49dda71bc112ac07fa22bd2f5bc SHA256 6a4a94c45e4160ef7ffd4745b653e8252a9209378edb4968923e6d22f8d12af3
 AUX gnome-control-center-3.2.1-optional-colord.patch 2005 RMD160 0a170f2ff2bd8886c3ecff18d22fc80a57497f2e SHA1 2047e863537832e3219564403a6207e8e8f7702b SHA256 852ca74531d54e65da41989f9c1c9f3883ecd7e31d0d4a17f6cca793c978284a
+AUX gnome-control-center-3.2.2-metacity-gconf.patch 1051 RMD160 3e828bc3217ff67cc862cc47edbc5b7c7f1a2309 SHA1 fbdfccca12c536bed76ad7783763b9e5a677dc2d SHA256 c3fa18ddebaec274e6095277cd1586041bba08b89cc03daaedada9103abea64d
 AUX org.gnome.control-center.defaultbackground.policy 836 RMD160 0e830941e4e03bd0c84ec6a352ed5df598f2ccb5 SHA1 c70e2db5e125e1236b0e796c3d9e293ecb3b58a7 SHA256 4fb135d55626e03a2b02b6c325e0fa3ee773984af2258acb3e2f1b22373dce52
 DIST gnome-control-center-2.32.1.tar.bz2 2280217 RMD160 47515f3f96d5695b457a8363bac183fb2188a256 SHA1 1e5ba3117aba7f939de25dbed13e430b90968561 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66
-DIST gnome-control-center-3.0.2.tar.bz2 4567179 RMD160 e1903c84d7f6a6662a6386e7110773ba789f634b SHA1 c0d5d203e25bc1829e25780b125efb3d9a4e741f SHA256 477b09a060a75e3664bd9cc9aac6b780067e50198217e3e11dc64980e3414896
 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.0.2-r2.ebuild 3148 RMD160 50d910316443d554b01e94899ac12e8c9609ea4f SHA1 d827f3d8a567a4125f6afd1e7dea07dc51013f4a SHA256 b7438707e1e06277d487b1ae4d22fd1bca1d9e74df7120ee9b836b554bbad01c
 EBUILD gnome-control-center-3.2.1.ebuild 3090 RMD160 1dae1743efa388ab400c1687d6f2158afeded383 SHA1 8e91414c3a03a73792057373d0f51bb607ba2efe SHA256 652ac2f5e7018a38ac6aeb5c8bb8e3645177b348257d4c897dbbd28162f298ba
-MISC ChangeLog 53771 RMD160 6d2b4a05cddb979919b54d4fd31a2222a71670db SHA1 a60f03db2338bb0c642facbe11b50bc622d56cb0 SHA256 e2afe2fb3adb0212eb60cad478d185bbce93c757ac1543b6448f0d9cf5d45df6
+EBUILD gnome-control-center-3.2.2.ebuild 3215 RMD160 c85c6aaebc9e45fd114dbdae37b6dd41a4881c5b SHA1 24d87527d9effd5aa247057b2d50e854a0eedd70 SHA256 51e24fee4bbd094cfb9ed84f2dd09ee223f86c6fd7bab1718d991761b0cbaa79
+MISC ChangeLog 54258 RMD160 4235476dc36297f832693763bd169b53536943b3 SHA1 31af2d31490529d5c1d9c5002049a85ca87ba4f8 SHA256 025c0cad2029e3d62cf4b14fa5220965d8a799463e903a851bf7cbec77667ccd
 MISC metadata.xml 522 RMD160 4ab7dba7c77c1b268d4276a16475e9854f3610f1 SHA1 6f4dece0998697e456a3967b28e254a8eb7f6f9d SHA256 131c11bbcbcdf6d0ba43d74423f0afdb957375343bfe8de3e578fce0f21491a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6rov4ACgkQdjK8w9WeBnDmfgD7BSIRUaK15ej/KYFWhC0D6Ao4
-Zp31Qrw4VZQ2c4d4qh4BAIfGlxGM3clQLbDxwASVzpafoFZeM2pEiQz0t/BR6KsU
-=PnMr
+iF0EAREIAAYFAk7ABlQACgkQdjK8w9WeBnBatAD/bbGZX/0rwYpQPtr6UR7VnF6y
+mKnjkEjTlG09aEanKWsA+M/YQ99vkuDGxu/EXIvj3PtkrVuSM5AxU21dGpIKq7k=
+=J5oh
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index cf8c598b0f0d..a04c5d2310da 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,19 @@
 # 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.96 2011/10/30 16:09:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.97 2011/11/13 18:02:09 tetromino Exp $
+
+*gnome-settings-daemon-3.2.2 (13 Nov 2011)
+
+  13 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-settings-daemon-3.0.2-r2.ebuild,
+  -files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch,
+  -files/gnome-settings-daemon-3.0.2-keygrab-defines.patch,
+  -files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch,
+  -files/gnome-settings-daemon-3.0.2-keygrab-pause.patch,
+  -files/gnome-settings-daemon-3.0.2-keygrab-range.patch,
+  -files/gnome-settings-daemon-3.0.2-wacom-touch.patch,
+  +gnome-settings-daemon-3.2.2.ebuild:
+  Bump, drop old. Lots of bugs fixed, several memory leaks plugged.
 
   30 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   -gnome-settings-daemon-2.32.1.ebuild,
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 07e0cc502b1c..9f8095341f98 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gnome-settings-daemon-2.32.1-lcdfilter.patch 1749 RMD160 3c3ac3aab62db8c963bb46f89b5ddc42ae699f82 SHA1 de66d2a6a5e8b7fd66def022338ba482dce4d62d SHA256 6aaf4fe50034de4c403850df25a93e371a94486af9629f4d3cc70863abbfb3ae
 AUX gnome-settings-daemon-2.32.1-libnotify-0.7.patch 3490 RMD160 f02271a40dd6f22e0041db8eff79441513b24ddd SHA1 ec981586bddcbe35269583b4a50827b57e31d55d SHA256 da836e61ddaea8b3a90692951296a28c4533e1e117412a0602f6c76e564e837d
@@ -7,32 +7,23 @@ AUX gnome-settings-daemon-2.32.1-libnotify-init.patch 602 RMD160 90aee270093da76
 AUX gnome-settings-daemon-2.32.1-media-keys-react.patch 1556 RMD160 36120e9451f49045450fa17bf1fb3e304ce39e23 SHA1 680e13a75c296ddb899cb7637682e89ae19d09b5 SHA256 9d56379de2c2cc83ffd4c40f7ab4c913647fefc54a1978ca0c5a4300bf3abec2
 AUX gnome-settings-daemon-2.32.1-netfs-monitor.patch 1753 RMD160 af98d9b35a2f9748fc86654d4f9a90a85c1c1537 SHA1 b8606ac345e367619838466d5883c0595cd6bcc8 SHA256 ba30e87b4815dca4bae74076b787a3fb9bd083923a1a8e6dee2cd95e8f4ca4e9
 AUX gnome-settings-daemon-2.32.1-syndaemon-mode.patch 1612 RMD160 1ec1582c3e1565e128c8124510a0d9f10432a9fc SHA1 10c05a986f34147d2b17c2c20a5910ac13633c0e SHA256 1ac8939aa161c9a9737f5bdf68ccfdc923944802a864cd76dcc8655fa5b129e0
-AUX gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch 1172 RMD160 e8313bf240937688948166ee0cce93ce013b7c63 SHA1 387cdae77b3a905bd6133d0f0807842b2c763a97 SHA256 c7ac7734e691216882656d46d16ff5f795548a8ad1cf53cc1dd7ff48089d9f5a
-AUX gnome-settings-daemon-3.0.2-keygrab-defines.patch 1305 RMD160 80ad4327cabbbe5a5011b9114674683fc4eaef67 SHA1 40b7a7f5279875d5960701d159a3d1b11b8cb32e SHA256 e5aad4c5c8c4f62eec1fe76aa52eda4f484cd94f6822970de4597f601aac0a50
-AUX gnome-settings-daemon-3.0.2-keygrab-function-keys.patch 1702 RMD160 8bd705d64c1c9bad443e4ca83f409daf57a7e059 SHA1 c49cc8c848d0a591fe5883329bb82b05fe47b272 SHA256 427f888d5e610ba3cad52ec233fed2c9ed0955d38b4b0f2f4c4b2290ef25a35b
-AUX gnome-settings-daemon-3.0.2-keygrab-pause.patch 980 RMD160 eeef9f17f28f38340cc44defb9a464a774319539 SHA1 df67d52e217c6c0eec6afe13e1c039176b600033 SHA256 9836f0dc097ed6741d14c6c19aa24a1e626b7baac3a018e2b053e7fd6dbba8b0
-AUX gnome-settings-daemon-3.0.2-keygrab-range.patch 978 RMD160 5a050d53a32abcbb03a72c9209facce768782d28 SHA1 09013258f42ab7fddcdbde91f3d478a1f2a506b8 SHA256 1c4162a8e7167009c8a5cfca89b3e7769db9432540af0cf5f05a31f1d72fd044
 AUX gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch 519 RMD160 a1f9801351d469aed5f626787c1ce1917468fda7 SHA1 4100b4d7c0e4f3fd85afe3eb4b0fc4e258e7edea SHA256 94c82c7f1b213af232bd1a401ddcaef1578dc7cc70ce3258e73887e438532133
-AUX gnome-settings-daemon-3.0.2-wacom-touch.patch 1550 RMD160 1e32eb1d347a9b273acd881f934be43cf6e33f78 SHA1 59cd418d36841d40db9461f414dbef87d9ee23cd SHA256 b8c474e480443646fa77ead806b3097c7cfdc6e6442e1d0a1d560606459b7d17
 AUX gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch 1595 RMD160 70df7f86b947ed569307ac8df8ec73f0b224cef0 SHA1 0e86ec669d19597c7b36fa76cc383dfadafcb0e6 SHA256 14a6f7e5593186a41f8e0a391708b433367e9d86015f559f28a87fd39a8f3195
 AUX gnome-settings-daemon-3.2.1-WEXITSTATUS.patch 667 RMD160 7360ac29861f96fc198d47967d370062639d22ef SHA1 6ccefe15ece8970661a8e09bdac2706bb1190329 SHA256 cdbae4bc1ed795e014aa03dd59dd00971d3ae5fecfc926af31318a6889c403db
 AUX gnome-settings-daemon-3.2.1-optional-colord.patch 2934 RMD160 cefc964b1c6449807043977b81ac4f593f37b7e3 SHA1 e1fa059374a429fe532af88f3a490d0ad5a2153a SHA256 2eb0e6cffd2fc579ece5cbe36950a28e9831d63764d8b5fae89df711ead4bf52
-DIST gnome-settings-daemon-2.30.0-gst-vol-control-support.patch 27189 RMD160 77e44583894977b6255fba168d565c5948481401 SHA1 8db1dde75b1866619d6589e989ed27fc45050c50 SHA256 0858e7fdb97086f7f0a284d535d642c23f06fb7d9fc71d9f7477dc856439a158
 DIST gnome-settings-daemon-2.32.1-gst-vol-control-support.patch 26788 RMD160 059f8e3e69990cf7f6f3e63159ab8d43f2f4f78a SHA1 5a734843d2094dccdb17014485ac20171193e130 SHA256 689f6152d6e27ddc0b8080d5c8c1644b6116075ff505951631af9b7289d2f933
 DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 RMD160 71aef9419eeca5f9fa59bb55990327c307f9ca31 SHA1 f2550acb4a9fd8f96ead1263ba5739915c303f6e SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
-DIST gnome-settings-daemon-3.0.2.tar.bz2 1578597 RMD160 a396bfe8e422586c572315981ecd7e82e629f105 SHA1 a1d617eb58edaeb2c57364b074fc1040f2317c65 SHA256 f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec
 DIST gnome-settings-daemon-3.2.1.tar.xz 1418420 RMD160 ce15088f308ae96fb10975a66bcb55bea68d6eab SHA1 1526741dbdcf20a20aa4e78df483e6df881b52b5 SHA256 1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d
-EBUILD gnome-settings-daemon-2.32.1-r1.ebuild 3592 RMD160 840be968e22e9ccd20eb5dbe01de024e1a3b057d SHA1 6c1e15fde157bfb037faf921b35f6cac97a53187 SHA256 4ca2aa34cccd70992f33083e731f7056a8c805e3c287b148baa9cbc648ad77ed
+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.ebuild 3221 RMD160 936a84871290b091dc7c1f65d92b5c06eb9f5dd5 SHA1 23efa449f73333872e8934f7eea743b2567fe18b SHA256 d1de887b4510cc37998a44b51f7ce880af0cf02d72e917f09c604e3cc9e3b31e
-EBUILD gnome-settings-daemon-3.0.2-r2.ebuild 3132 RMD160 1eafd36e9c157ecc60b548533d3885886a94e4e6 SHA1 4df9c1e7f314b8c2ae167f2820d463e4477052e2 SHA256 d0254eb3e7c9a8bafdda1945acd1a47a9116c648a8adeaa3338eacbf377a34da
 EBUILD gnome-settings-daemon-3.2.1.ebuild 3995 RMD160 286e899fe4310424c20637730b473ba901716c77 SHA1 f13d080d1cb856436451970edb3debeb2bc92c4f SHA256 5df33b8a8835fb48acac5d40d4522f5b6684ae7690e1f241c61b0458bb0a0968
-MISC ChangeLog 18208 RMD160 befecc35011aa5f9f8b3ac0f0372c74a99a96bd9 SHA1 88380cad359cfd6ddb66200e6bf76d992e3452b5 SHA256 72192c335f2e3ad809197abd5fd32edbc72728e09ae8666a6d71ea2657ceab4b
+EBUILD gnome-settings-daemon-3.2.2.ebuild 3882 RMD160 ac5f1846a117c5a12da5f01e8090648e87ba09e7 SHA1 45f2b25fe9b8fdcb9a32296d9a1fe193f0b38831 SHA256 267ddd52b90ba02c8479828789fe0911d74742ac3104e4f48ed21f605c4f05f1
+MISC ChangeLog 18970 RMD160 1351b1ca400c42bde856888ee6e9d7ba0187bcb5 SHA1 813b97baf5a79e36bc12f0da6cc6c8f16e4dbf98 SHA256 ccfe973b6912a756982c78ed41c34c2834739e92d677551c4d9153dae54a98a9
 MISC metadata.xml 507 RMD160 da190ee6888fff3a8db0629c5c45ebd2235bf3fe SHA1 f7e7d8aa01ccdb946e6f7055992ac7f1da807815 SHA256 095c7487bf2ebadd2b70038c9f65724c2c4c6860a5b0da0096264e50a4e36480
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6tdiYACgkQuQc30/atMkCeFACfTDqxd0HCiuBlgFMvY2Y1qNW0
-h1MAmwWFzmlCMufoMHh30Pe2dfObLbow
-=bzMj
+iF4EAREIAAYFAk7ABicACgkQdjK8w9WeBnCIbQEAgjjED4Ox17kOpuHlAO6ErKp3
+yKseBBRWxGwL5Ko/QIIA/iMEoR+5K+m6NBeXQampPu14A7wstQKlM1HwdiHkXh0F
+=xG+8
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch
deleted file mode 100644
index 23146b6a5e10..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 33efc3649aa75fc77e4f1521031992376131d507 Mon Sep 17 00:00:00 2001
-From: Chris Coulson <chris.coulson@canonical.com>
-Date: Wed, 13 Jul 2011 11:58:29 +0200
-Subject: [PATCH 01/11] common: Fix grabbing of multimedia keys
-
----
- plugins/common/gsd-keygrab.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
-index 70fde7a..1d50a22 100644
---- a/plugins/common/gsd-keygrab.c
-+++ b/plugins/common/gsd-keygrab.c
-@@ -146,9 +146,9 @@ grab_key_unsafe (Key                 *key,
-          * (which are useful to grab without a modifier).
-          */
-         if ((modifiers & gsd_used_mods) == 0 &&
--            (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) ||
--             IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) ||
--             key->keysym == GDK_KEY_Pause)) {
-+            !IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) &&
-+            !IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) &&
-+             key->keysym != GDK_KEY_Pause) {
-                 GString *keycodes;
- 
-                 keycodes = g_string_new ("");
--- 
-1.7.6
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-defines.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-defines.patch
deleted file mode 100644
index 84d6d6beceab..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-defines.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From afceb3e697934780b487db1e11e21fb23cbe9e28 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 01 Jul 2011 12:28:51 +0000
-Subject: common: Use defines instead of variables for ranges
-
-Seeing as those won't ever change.
----
-diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
-index 464f6e8..17e287c 100644
---- a/plugins/common/gsd-keygrab.c
-+++ b/plugins/common/gsd-keygrab.c
-@@ -42,8 +42,10 @@ static GdkModifierType gsd_ignored_mods = 0;
- static GdkModifierType gsd_used_mods = 0;
- 
- /* Taken from a comment in XF86keysym.h */
--static guint gsd_unmodified_keysym_min = 0x10080001;
--static guint gsd_unmodified_keysym_max = 0x1008FFFF;
-+#define XF86KEYS_RANGE_MIN 0x10080001
-+#define XF86KEYS_RANGE_MAX 0x1008FFFF
-+
-+#define IN_RANGE(x, min, max) (x >= min && x <= max)
- 
- static void
- setup_modifiers (void)
-@@ -141,8 +143,7 @@ grab_key_unsafe (Key                 *key,
-          * a modifier).
-          */
-         if ((modifiers & gsd_used_mods) == 0 &&
--            ((key->keysym < gsd_unmodified_keysym_min) ||
--             (key->keysym > gsd_unmodified_keysym_max))) {
-+            (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX))) {
-                 GString *keycodes;
- 
-                 keycodes = g_string_new ("");
---
-cgit v0.9
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch
deleted file mode 100644
index 6603f7e22173..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From bc6561d2b2adbe39e928528dfaba2d129b143952 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 01 Jul 2011 12:32:30 +0000
-Subject: common: Fix function keys not being grabbed
-
-Because they were unmodified, and we tried to avoid screwing
-up the user's keymaps for those.
-
-Bug was introduced in 469145ff59fe2a65d603cfeb5011427dc0f7c36b
-
-https://bugzilla.gnome.org/show_bug.cgi?id=649222
----
-diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
-index 17e287c..31c1ba6 100644
---- a/plugins/common/gsd-keygrab.c
-+++ b/plugins/common/gsd-keygrab.c
-@@ -45,6 +45,9 @@ static GdkModifierType gsd_used_mods = 0;
- #define XF86KEYS_RANGE_MIN 0x10080001
- #define XF86KEYS_RANGE_MAX 0x1008FFFF
- 
-+#define FKEYS_RANGE_MIN GDK_KEY_F1
-+#define FKEYS_RANGE_MAX GDK_KEY_F35
-+
- #define IN_RANGE(x, min, max) (x >= min && x <= max)
- 
- static void
-@@ -139,11 +142,12 @@ grab_key_unsafe (Key                 *key,
-         /* If key doesn't have a usable modifier, we don't want
-          * to grab it, since the user might lose a useful key.
-          *
--         * The exception is the XFree86 keys (which are useful to grab without
--         * a modifier).
-+         * The exception is the XFree86 keys and the Function keys
-+         * (which are useful to grab without a modifier).
-          */
-         if ((modifiers & gsd_used_mods) == 0 &&
--            (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX))) {
-+            IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) &&
-+            IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX)) {
-                 GString *keycodes;
- 
-                 keycodes = g_string_new ("");
---
-cgit v0.9
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-pause.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-pause.patch
deleted file mode 100644
index a5fc2d3abd84..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-pause.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 65a5ca27a24a2d5a59797d13f305b13026794fc2 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 01 Jul 2011 12:39:45 +0000
-Subject: common: Allow the "Pause" key to be used
-
-That'd be the "Pause"/"PrtScreen" key, not AudioPause.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=653524
----
-diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
-index 304c8c2..70fde7a 100644
---- a/plugins/common/gsd-keygrab.c
-+++ b/plugins/common/gsd-keygrab.c
-@@ -147,7 +147,8 @@ grab_key_unsafe (Key                 *key,
-          */
-         if ((modifiers & gsd_used_mods) == 0 &&
-             (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) ||
--             IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX))) {
-+             IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) ||
-+             key->keysym == GDK_KEY_Pause)) {
-                 GString *keycodes;
- 
-                 keycodes = g_string_new ("");
---
-cgit v0.9
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-range.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-range.patch
deleted file mode 100644
index 7a2f3052b021..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-range.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 74631cb8e0950c7a648df53195377b0c96a09008 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 01 Jul 2011 12:38:50 +0000
-Subject: common: Fix keys range check
-
-That could never happen...
----
-diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
-index 31c1ba6..304c8c2 100644
---- a/plugins/common/gsd-keygrab.c
-+++ b/plugins/common/gsd-keygrab.c
-@@ -146,8 +146,8 @@ grab_key_unsafe (Key                 *key,
-          * (which are useful to grab without a modifier).
-          */
-         if ((modifiers & gsd_used_mods) == 0 &&
--            IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) &&
--            IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX)) {
-+            (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) ||
-+             IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX))) {
-                 GString *keycodes;
- 
-                 keycodes = g_string_new ("");
---
-cgit v0.9
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch
deleted file mode 100644
index 977b38ce40b1..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4248d799058f36bbb93ab9be173b249e7f631f80 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 25 May 2011 02:50:15 +0000
-Subject: wacom: enable wacom touch key by default.
-
-This was caused by a misunderstanding of the touch behaviour.
-This key enables/disables the touch part of the tablet altogether, not the
-behaviour of touch while using the pen. Hence the erroneous default, we
-really don't want to disable touch on most tablets by default.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
-https://bugzilla.gnome.org/show_bug.cgi?id=651020
----
-diff --git a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
-index 738b26a..4554d62 100644
---- a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
-+++ b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
-@@ -23,9 +23,9 @@
-     <_description>Set this to 'none', 'cw' for 90 degree clockwise, 'half' for 180 degree, and 'ccw' for 90 degree counterclockwise.</_description>
-     </key>
-     <key name="touch" type="b">
--      <default>false</default>
-+      <default>true</default>
-       <_summary>Wacom touch feature</_summary>
--      <_description>Enable this to only move the cursor when the user touches the tablet.</_description>
-+      <_description>Enable this to move the cursor when the user touches the tablet.</_description>
-     </key>
-     <key name="tablet-pc-button" type="b">
-       <default>false</default>
---
-cgit v0.9
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild
index ab0567473e46..aae1315861c0 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild
@@ -1,12 +1,12 @@
 # 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.0.2-r2.ebuild,v 1.3 2011/09/05 19:51:16 maekke Exp $
+# $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 $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit autotools eutils gnome2 virtualx
 
 DESCRIPTION="Gnome Settings Daemon"
 HOMEPAGE="http://www.gnome.org"
@@ -14,34 +14,40 @@ 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="+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
+# colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
+# upower-0.9.11 needed for UpSleepKind
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.26.0:2
+	>=dev-libs/glib-2.29.14:2
 	>=x11-libs/gtk+-2.99.3:3
 	>=gnome-base/gconf-2.6.1:2
 	>=gnome-base/libgnomekbd-2.91.1
-	>=gnome-base/gnome-desktop-2.91.5:3
+	>=gnome-base/gnome-desktop-3.2.0-r1:3
 	>=gnome-base/gsettings-desktop-schemas-0.1.7.1
 	media-fonts/cantarell
 	media-libs/fontconfig
-
-	>=x11-libs/libnotify-0.6.1
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra[gtk3]
+	>=media-sound/pulseaudio-0.9.16
+	>=sys-power/upower-0.9.11
+	>=x11-libs/libnotify-0.7.3
+	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libXext
+	x11-libs/libXfixes
 	x11-libs/libXxf86misc
 	>=x11-libs/libxklavier-5.0
 	>=media-sound/pulseaudio-0.9.16
-	media-libs/libcanberra[gtk3]
 
+	colord? ( >=x11-misc/colord-0.1.13 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	packagekit? (
-		dev-libs/glib:2
 		|| ( sys-fs/udev[gudev]
 			sys-fs/udev[extras] )
-		>=app-admin/packagekit-base-0.6.4
-		>=sys-power/upower-0.9.1 )
+		>=app-admin/packagekit-base-0.6.12 )
 	policykit? (
 		>=sys-auth/polkit-0.97
 		>=sys-apps/dbus-1.1.2[X] )
@@ -49,19 +55,26 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 	udev? ( || ( sys-fs/udev[gudev]
 		sys-fs/udev[extras] ) )"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
+# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
+# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/dconf
 	>=x11-themes/gnome-themes-standard-2.91
 	>=x11-themes/gnome-icon-theme-2.91
 	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	!<gnome-base/gnome-control-center-2.22"
+	!<gnome-base/gnome-control-center-2.22
+	!<gnome-extra/gnome-color-manager-3.1.1
+	!<gnome-extra/gnome-power-manager-3.1.3"
+# xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )
 	sys-devel/gettext
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.19
 	x11-proto/inputproto
-	x11-proto/xproto"
+	x11-proto/kbproto
+	x11-proto/xf86miscproto
+	>=x11-proto/xproto-7.0.15"
 
 pkg_setup() {
 	# README is empty
@@ -70,6 +83,8 @@ pkg_setup() {
 		--disable-static
 		--disable-schemas-compile
 		--enable-gconf-bridge
+		--with-pnpids=${EPREFIX}/usr/share/libgnome-desktop-3.0/pnp.ids
+		$(use_enable colord color)
 		$(use_enable cups)
 		$(use_enable debug)
 		$(use_enable debug more-warnings)
@@ -80,12 +95,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Patch from upstream git, will be in next release
-	epatch "${FILESDIR}/${P}-wacom-touch.patch"
-	# Patches for various keyboard shortcut bugs, will be in next release
-	epatch "${FILESDIR}/${P}-keygrab-"{defines,function-keys,range,pause}.patch
-	# bug #375087
-	epatch "${FILESDIR}/${P}-keygrab-broken-logic.patch"
+	# Backport patch from git master branch (not in gnome-3-2 branch yet)
+	# fixing loading color profiles at startup
+	epatch "${FILESDIR}/${PN}-3.2.0-color-unbreak-loading-profiles.patch"
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
 	# Apparently this change severely affects touchpad usability for some
@@ -94,9 +106,17 @@ src_prepare() {
 	use short-touchpad-timeout &&
 		epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
 
+	# Make colord optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch"
+	eautoreconf
+
 	gnome2_src_prepare
 }
 
+src_test() {
+	Xemake check
+}
+
 src_install() {
 	gnome2_src_install