Version bump; fixes lots of bugs, including #450290 (gsettings-list-recursively crash), #451042 (caps lock key unreliable if used for layout switching), and adds a KDE-compatible org.freedesktop.ScreenSaver.xml dbus interface. Rename USE=wacom to INPUT_DEVICES=wacom to match the rest of the tree. Update license. Drop old.

Package-Manager: portage-2.2.0_alpha158/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

9 files changed, 280 insertions, 186 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index ea30d5addf68..d8422b360976 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.114 2013/01/06 09:37:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.115 2013/01/22 07:37:37 tetromino Exp $
+
+*gnome-settings-daemon-3.6.4 (22 Jan 2013)
+
+  22 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-settings-daemon-2.32.1-r2.ebuild, -gnome-settings-daemon-3.2.3.ebuild,
+  gnome-settings-daemon-3.4.2.ebuild, gnome-settings-daemon-3.6.3.ebuild,
+  +gnome-settings-daemon-3.6.4.ebuild,
+  +files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch, metadata.xml:
+  Version bump; fixes lots of bugs, including #450290
+  (gsettings-list-recursively crash), #451042 (caps lock key unreliable if used
+  for layout switching), and adds a KDE-compatible
+  org.freedesktop.ScreenSaver.xml dbus interface. Rename USE=wacom to
+  INPUT_DEVICES=wacom to match the rest of the tree. Update license. Drop old.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org>
   gnome-settings-daemon-3.6.3.ebuild:
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 3efb5ee20a83..a03cc421e1da 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gnome-settings-daemon-2.32.1-lcdfilter.patch 1749 SHA256 6aaf4fe50034de4c403850df25a93e371a94486af9629f4d3cc70863abbfb3ae SHA512 7ef482265b6eea94e742cb4f0c5b39e92ce9186fd9e80073feceddae1a48a8812ce4abc58d8fd20755e0aeccf5b9dcfbedf1e3d17c83b9fb87637793a1d2e1e6 WHIRLPOOL 2372b8a3026bcbdce3b4f78c836f4157746942275b5bc43ed1429a298d02cc3f4c7608bad6052a170526666aa8b3fec2d6795c04f2fd6cd163e726609caa8c21
 AUX gnome-settings-daemon-2.32.1-libnotify-0.7.patch 3490 SHA256 da836e61ddaea8b3a90692951296a28c4533e1e117412a0602f6c76e564e837d SHA512 b78bc5055457bf929f6f74da68d4df2873f985bb2d016d26092be6e61d9f53d20d4fbca1a4454a8e32a5879e41c754108120113ba4afbaac1a40712bc939a745 WHIRLPOOL cb56b2920659174fd942737094ba8046596524f15e9a65ec80b25a0d73a96edff06a92121a7a7e7dde1ccadd05e4e77b54774b75a8f045c3cb705f3c44c88a16
 AUX gnome-settings-daemon-2.32.1-libnotify-init.patch 602 SHA256 3f81b1bf76b4e01fe6264be0de987fe9d346eee305a898dca630dea7d77b61f3 SHA512 4286162da82f669d9141861a9ae13b770aaa0228a4fa89dbdb250f4a901c9f2f3280519b1efbc74454f36c6c1567465bf04f0d355b7648ca437bb17ae6fe8a7b WHIRLPOOL 75d8bdc9f6fe3eff26b4148a8ea68edfd4d752512635ef1d939810f9ebb82863a8fd0a0123cf963b24ec942d33e93535c96b061cb18103f298e3db32be4e0e43
@@ -15,14 +18,26 @@ AUX gnome-settings-daemon-3.4.2-cups-1.6.patch 4719 SHA256 9efe540a040016244faed
 AUX gnome-settings-daemon-3.4.2-double-unref.patch 1179 SHA256 67453794ae5bec487395cc48e7f5caea820020559b5ff9eca8a069b64a1e7dc3 SHA512 c16dd903ee2af3f212e45ed57d527d156c57c75de16d363ed6ce8a104a9914424d2a3c55a581bc3e754a5286d456bf362214ae050d554464944a23012592cba6 WHIRLPOOL 79d452f2bbbf083c53bb52d667926b3476bfc79a25ec6973bd2397136307770ad9449833c39a9ce9530e8cdd2949d00dd20203d2da2934d65ab9ae6692c997f3
 AUX gnome-settings-daemon-3.5.91-optional-color-wacom.patch 2931 SHA256 6f1586967c7678e9706df6d115a3f441444e011ba9ad25dc8df7f281f48d57a4 SHA512 1c866bb5df983854387d6c2c85a3439618ed38e89453f562b15531f3b03b48fa941b2639db0dd377c2017f6bb34179051550862cd274b4c3e6b53477ba878f9c WHIRLPOOL 97b38aee43fe74a3bbe7bb0cc1a1a89b9824c5c4ed6c0fcd1a0925e495c7dcb170b03f9455e5868e26d51a5ed59c0495b1a0445b8e9cc7368089362ca99407c1
 AUX gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch 617 SHA256 361a46394907a00f4df78aaaff01bfbf492d438b18359de0c0838fa7e85dd2b2 SHA512 5130aadf82a8fd881d793b082801d045ea552ca778ef2e3c284944cfa823866e202fed67149b12ae7a40c8c957f9afda090bbd8726c79d224d1af1c4d54b3adc WHIRLPOOL b3a3060eeeb358e715df20eaa1bbc2b827b253befd502ad1a9d001a441cbfb7a82a13f5794425bce39387acdb4b95b638ce151b384934d8701fd50111a2682ed
+AUX gnome-settings-daemon-3.6.4-optional-color-wacom.patch 2420 SHA256 f3cd396ba3ff966058dc503398d3969559913a441864e18ff91239f207ab4cb7 SHA512 0dfe364e63867c391aa957bfd8add1e9e1ce93135a8352ebe8450c30ff36529eac9ba2b596520f633fc72c76724abf90f3368020d673b4a7ed6f135fa11b9470 WHIRLPOOL 5477a440d5ed8dfeefeb1bded6db8e00612cae2ea13d08c22632c7ce3d9b1e48c8365943ade2bc92445fee33e5e8ff3958befbe8ca9e9080a87184d875c692f0
 DIST gnome-settings-daemon-2.32.1-gst-vol-control-support.patch 26788 SHA256 689f6152d6e27ddc0b8080d5c8c1644b6116075ff505951631af9b7289d2f933 SHA512 a4ee10135e7339fa25412e7b790c0c56b3def826d81a89ca399cfb6f2236da14ec78a729ec5d27d3528cdde3eff8fb70cf3f297ddee756665c1d83fb73d2ca15 WHIRLPOOL f3cc8d7ec7065018b69ee78a9f1cc278c8e37910e9dc5a061d8a57d52def0316fb4bbeb4891b742f54e32e06a8d31617241300e3aa82f5a0c39a79aa829225eb
 DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86 SHA512 69bceb01e1dd15a75dc3db1e78aebee8c7c4004f217856391a64bc527c6b46146f893e90292441d3c7650df8a1b3aee2078d7cbef33c76e47a8f1904dd8e447a WHIRLPOOL 6608a9470666d943e0f39a4cadb36a1ccffbe8b40bcdae97d93b3d9b676da0c3efb33d5be1accaf2066760de6a4a36db16c94a093965f2f8da29511464ec2071
-DIST gnome-settings-daemon-3.2.3.tar.xz 1418144 SHA256 53c4d642ec8a4b812ad35c1b4cba7d33e9e4dc90ab135b726219ad9adc4a94b9 SHA512 4b771b4fbd6fb676c6ce712f7cb246fcde35527afeea2370f95c7dce391728c5c9c4c6f201843e0232e2f18cdb6332fd130fadb21a1fea8254ddb66e62a8271b WHIRLPOOL e47f076bb682aea8626eaad647e65cf79b80e964162982f373c0d938ff42dacf91cdcf2f54c31ed075914982fd3b614dd41a75dd9fb6f654f0b42b329425b2b0
 DIST gnome-settings-daemon-3.4.2.tar.xz 1430872 SHA256 00499118c80474981f3389ef518e2d001f1b1a3b1fb78e54859d59f3bee38ff4 SHA512 4a05995511cd1b4324844c164bc2acd831d5e1b9b989ef35716bd7630126406f77b13ea93921379375790d4dea75b9cc14b6107daebdbf264fbf5157f7bd7093 WHIRLPOOL 07cdca28f44523eb8de94bc50d8b565770513820bdd3f8ef07a4b581bc915138044a4136ab9a88e5e67d0c97f8b9b030367fa58bde86ea77897c297b2de37123
 DIST gnome-settings-daemon-3.6.3.tar.xz 1492024 SHA256 606aaaba9cc7f51035702aead46c8bb595917a09cb947b396a579ea443328cdc SHA512 45b7a0a2162d8419ba9c9d248b87374f9d2012b43b9667f34d3a125567b45e2c2dde5535091cf7cd170e982b07ec7594803cba2628774aefae9ce9f3e672a49a WHIRLPOOL b3c5776d1bc605c88480deebccd95e97538783bc1fc8b602d4c0238352bfe14e720e96debb58d5312803e03813fc857083ffdc9367a6a45d189c748273e0cc69
-EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3934 SHA256 1e30ad404ed92c793b4342dda5a7091678ce0869f6118a7e5fe3c3ded4cc55ea SHA512 8794a1145fa88555061334edfb9325aa2b39a079b32b48897144e5e0a90d1d4a5c75cb8a7bfbdaeccd7bd701407290076f947b53ef1ed5ea3dd7a5e7e13ae8bc WHIRLPOOL 8ff06069eabd39fe06c5f6a1225dcb3bfa06f4dc49a26a806e8e3f2f5991d0c767143c29d39f389085c4a61ebbc20f3512b35e831983e0bd9f9338d47f7d41da
-EBUILD gnome-settings-daemon-3.2.3.ebuild 3981 SHA256 50154b53bfb4bd7f75f7c571411b43c7c1569ff8ad4b9ed2eb94f8f51c7a1b7d SHA512 f9be0aa7bb682d1d8184b0950ab9ea01fb98318a98753424d642c5f7842508d487821f4d5036edff12a053e2c8250b561cfdbb97b9c16a6faed6d6d2cc7e8e6d WHIRLPOOL 794e96e6bd23aadc298d23e044b59e5e2a958887b2f590da5f776d9b9191bd8323a214eded755dceec8a6e1bf244f8b557d7559d887e34a1f38d6399201cabbc
-EBUILD gnome-settings-daemon-3.4.2.ebuild 3730 SHA256 4323175521c96b783354588673e52f4e4fd8c15b4d1b73082461d6dd655fd468 SHA512 9ae50701132e2738d016e0b8063dfb13a8f638f41f1c6cfaa7298bd1d1536eaa655ec3c7a80d39c7a40032554b349b7960e321c548250b0eefebd47ac107419e WHIRLPOOL a1e353ce951bd0a3de23bd0034a1ac630f7f65393b3a3c51b632ab582eb9294f344018c9c712f34cc2cf0c593a694501d77385c21de1660cf41c070716c8c30b
-EBUILD gnome-settings-daemon-3.6.3.ebuild 3414 SHA256 da665eff2e2c7075e91d42a4b28491eb00fa17036a7fc7a54864e4268cf3ec2f SHA512 8157d104b449d9d42a7a5c8e520824a3eaeb0c7abd0ef9a80f1e1544e209eb7c95be84178f7679c52b3b9940d979c160eef93d7f29c1e64f5242c814df2e5e0e WHIRLPOOL cb00b1c988b10cfefbc2b985963233031a9cb203e86177ad222754eda90eaae9546c663dcff08af9d3163330d168acd8eed806610c297759dc49184a7aa2b639
-MISC ChangeLog 22877 SHA256 dbcd1f192572a1f0c700f84348c2cca664fcd25c46da77d0743f2976e9fc7ef0 SHA512 7e89cf1c98e920897eede2a245e59c748c4b137753e47f9ab37b9e94606436d341ee2cdec304ac18236e887daf6198a0c003c11f56d1ddd7b9dd49cdbb596ea6 WHIRLPOOL 882a2329f6177da4fb12e9542856cade8729d80fedc9d19813408c13cbd96f41854034a819fca02f3c0df68721b50c68c0cb7970d881763c94a5fced93942b58
-MISC metadata.xml 824 SHA256 cd04934476f26c5ef0f5838a82e581b94ec821b5f93ca801f92c90048e3f11d0 SHA512 e803caf03ec787144c7d91839172056f1ea7054f7e9a757b72ee45e290c178df7e21a9eb12de46f3df99d7452d73e60c3788b3c92a82e983bf6795585bb96bb0 WHIRLPOOL b4a20a878e953b27fa1ea7f556bf1d35f597a1f3de2c9a9affe95491bcbf5a76bb93d9e1db43386ebc2ebe221ed909876975de7051d004160c5858eafd377227
+DIST gnome-settings-daemon-3.6.4.tar.xz 1518708 SHA256 3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15 SHA512 f8d263f9a22934e015ff642f9ac93c09764b89151260887242d6b946250d50a2400404f61376a34ec903606bf4061c9733ddb42f0ed92ecc42f873fafb766af7 WHIRLPOOL fba7fb4ec0c236584534b75fda3ebab651f67227c4fcc1183c085cba5cf315418f9a178a2c2ac9c96190a3b7b997a166a13172d48d8f068723bd5a0427cdf703
+EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3939 SHA256 f8ef87e63f2424cb2d9fced9bafa82fcd62079846c1e9562e27049eaa682d76d SHA512 946bcc938bd19a49cb060a034a0da4e26040c228f8987a6981a8c507ce63fe6b4aa889ecd0c12e5dc3b0fb3e2a106955bde4fbb0a9820ca2c325cf0793f1267b WHIRLPOOL 16062f23d482227a871eff39698659be325aa787606d1bdadcfff3444cb2730d42eb5d9d42a14eff7277da66b893518dd0956bdf2891b9deab0118548f0012b9
+EBUILD gnome-settings-daemon-3.4.2.ebuild 3811 SHA256 57fb0063f625fb7be1416ca39a91eed14cd4eb90f94764dc6306639d97f82b6e SHA512 76d4fccdeb567a658a5888bd835047572123c1f0afba01622702925a6aa42429c5af45d2bfdfc279437faf63fca6173ef777575f774dda8884247dfd1a960821 WHIRLPOOL 9bdc341b69f8be7bf950e137d9d52175c5a785794628e5b6a7c64f0588c998f2be022641fb2e548ecd8b1b62cc72abaf2bb614ed9cca752a328e1d368fc0f2e2
+EBUILD gnome-settings-daemon-3.6.3.ebuild 3473 SHA256 9be7f814189ec95706202099a0aa2fab15b1a8d124fba1f7428086c5f6c01611 SHA512 a91a75f1adffe683049ce6d8b9451967c98895d6a07c43193ecbb2de34d6c7962f9fd888f617c58125445651eba8c6a700b55ae9d9d43907b74501669eabdede WHIRLPOOL 8829e81cad163895ec3ef0e23e4d22f78b69c08245439661f7aa3dd20fd618e447c08b4796bcfbb11bdf2835f0d03cbb1df04054f1fa90ddd04d64d8756f4d9b
+EBUILD gnome-settings-daemon-3.6.4.ebuild 3457 SHA256 368057b260e6af6b74c5e7d53abc52f005bde420faee14ec2d1b68c3178441ed SHA512 debdd113066e75c1f35c42ac8f583c187b211bd30905041fc2e00a8461e110975a3b316cf57f3e930463d8f7a697b2ad48e215f6a938ea7fa562322f096f7244 WHIRLPOOL a8c2c82ad03d6b60b543155aba9d7a653008f9e3e2cda52b601279711d351dbb58dd027391eadc8f0b4d7fc33a4cad751bbaf20eda9e088f915b5d1a88c44f44
+MISC ChangeLog 23592 SHA256 c5395b2abc9ef8619c35d07d6dd8d2205a80edd713d6677d6805329d6282a4ad SHA512 7022f3b559590d3637ef87fe1c5a5eebc1af312bc48a72a7d270302132c0436322808e60654e17fd74c2dce09e9ca77d79565cb89ad7b198b63068311a0e8850 WHIRLPOOL 17bdfa9f0bace59d3bfcd2f8ae4c09af170d22a7d7ed3e12b74e7c5495c7c6404834ecfd860c857db7f011b7d5f39dc726d6253625d8df49257d8c7bd499560e
+MISC metadata.xml 740 SHA256 ca5ca4c0105f158353f42bd7e8ed35024737203b0cc09f524b58ca1b11d971e2 SHA512 d744233d4307204157b192d026fbb90245e4222a5eed6248c9c96c8b7e20ae8fdfa3eb88ea3701962945d2fdc99127ac5f518d6da289b93ea6b5f7841f39f1f4 WHIRLPOOL 96e27f3a348003634a79159542b9ec44a62ea8b8b2d8a967f37a8eda3a24f53ea44f8429f00800d55d25893254b56f046887ee1a9f94e3a0a00831afa7db569a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ/kHDAAoJEJ0WA1zPCt1h6KAIAIMm+OLk7rbXj/2Wf+uDf1Eq
+fhX9vzi0fHUKBNTXptczmxvz+h3sc/Q52qPLUBw2/Tqt9RQf7eYO/1O2BOVX4l1v
+V0snKWdZ1fVg9tuUVM1kfQw0mPQyyXroT1J8Zx5aWG520j7NqhpkLw2UJeA1QAn+
+Tls27253iEkE0UOMmFlIgrPUIhGSOuoJH/FaAxvIIKdhDD2yaRdrabOdJzrhdHWc
+O5XoUgsb78fIj5RDPKYyy3MfgDkBQg2YX+iHy2Lpups66k4Z/O73Vpo7PsqbtIuE
+ux30Ey9RBMqmzdIoHhfXm/DuN8w6/UOzy62VlfXYCEyvCLDQBKaqzmtGRRXQ26U=
+=lRGF
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch
new file mode 100644
index 000000000000..bd02900a40af
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch
@@ -0,0 +1,76 @@
+diff --git a/configure.ac b/configure.ac
+index d1739c4..752c09d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -241,7 +241,20 @@ dnl ---------------------------------------------------------------------------
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++AC_ARG_ENABLE([color],
++  AS_HELP_STRING([--disable-color],
++                 [turn off color plugin]),
++       [with_color=$enableval],
++       [with_color=yes]) dnl Default value
++
++if test x$with_color = xyes; then
++       PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
++fi
++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
++
++AC_SUBST(COLOR_CFLAGS)
++AC_SUBST(COLOR_LIBS)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - wacom (disabled for s390/s390x and non Linux platforms)
+@@ -253,11 +266,22 @@ case $host_os in
+       have_wacom=no
+     else
+       if test x$enable_gudev != xno; then
+-        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++	AC_ARG_ENABLE([wacom],
++	  AS_HELP_STRING([--disable-wacom],
++	                 [turn off wacom plugin]),
++	       [with_wacom=$enableval],
++	       [with_wacom=no]) dnl Default value
++
++	if test x$with_wacom = xyes; then
++		PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++		have_wacom=yes
++	fi
++
++	AC_SUBST(WACOM_CFLAGS)
++	AC_SUBST(WACOM_LIBS)
+       else
+         AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+       fi
+-      have_wacom=yes
+     fi
+     ;;
+   *)
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 69b7181..a1cdf6c 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -6,7 +6,6 @@ enabled_plugins =	\
+ 	automount	\
+ 	background	\
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	dummy		\
+ 	power		\
+@@ -22,6 +21,12 @@ enabled_plugins =	\
+ 
+ disabled_plugins = $(NULL)
+ 
++if WITH_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if HAVE_PACKAGEKIT
+ enabled_plugins += updates
+ else
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 ab46df9b5168..9aa88ae3bbe5 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-2012 Gentoo Foundation
+# Copyright 1999-2013 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.9 2012/05/05 05:38:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild,v 1.10 2013/01/22 07:37:37 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -17,7 +17,7 @@ SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/gnome-settings-daemon-2.3
 # 	mirror://gentoo/${PN}-2.30.0-gst-vol-control-support.patch" -> this causes bug #327609
 # 	mirror://gentoo/${PN}-2.30.2-gst-vol-control-support.patch.bz2" -> this patch has worse problems like bug #339732
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug libnotify policykit pulseaudio smartcard"
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.3.ebuild
deleted file mode 100644
index 99e297fc1673..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2012 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.3.ebuild,v 1.5 2012/12/11 09:33:51 ssuominen Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-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.29.14:2
-	>=x11-libs/gtk+-3.1.10:3
-	>=gnome-base/gconf-2.6.1:2
-	>=gnome-base/libgnomekbd-2.91.1
-	>=gnome-base/gnome-desktop-3.2.0-r1:3
-	>=gnome-base/gsettings-desktop-schemas-0.1.7.1
-	media-fonts/cantarell
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-0.9.16
-	>=sys-power/upower-0.9.11
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=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
-
-	colord? ( >=x11-misc/colord-0.1.13 )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	packagekit? (
-		virtual/udev[gudev]
-		>=app-admin/packagekit-base-0.6.12 )
-	policykit? (
-		>=sys-auth/polkit-0.97
-		>=sys-apps/dbus-1.1.2[X] )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( virtual/udev[gudev] )"
-# 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-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
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/xf86miscproto
-	>=x11-proto/xproto-7.0.15"
-
-pkg_setup() {
-	# README is empty
-	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-	G2CONF="${G2CONF}
-		--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)
-		$(use_enable packagekit)
-		$(use_enable policykit polkit)
-		$(use_enable smartcard smartcard-support)
-		$(use_enable udev gudev)"
-}
-
-src_prepare() {
-	# 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
-	# people, so revert it if USE=short-touchpad-timeout.
-	# Revisit if/when upstream adds a setting for customizing the timeout.
-	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"
-
-	# bug #428816, https://bugzilla.gnome.org/show_bug.cgi?id=679761
-	epatch "${FILESDIR}/${PN}-3.4.2-cups-1.6.patch"
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	echo 'GSETTINGS_BACKEND="dconf"' >> 51gsettings-dconf
-	doenvd 51gsettings-dconf || die "doenvd failed"
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild
index 32de5b7b06cd..bf0daf15c906 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.4.2.ebuild,v 1.5 2012/12/11 09:33:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild,v 1.6 2013/01/22 07:37:37 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,10 +11,10 @@ inherit autotools eutils gnome2 virtualx
 DESCRIPTION="Gnome Settings Daemon"
 HOMEPAGE="http://www.gnome.org"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
+IUSE="+colord +cups debug input_devices_wacom packagekit policykit +short-touchpad-timeout smartcard systemd +udev"
 
 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
 COMMON_DEPEND="
@@ -43,6 +43,9 @@ COMMON_DEPEND="
 
 	colord? ( >=x11-misc/colord-0.1.13 )
 	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.6
+		x11-drivers/xf86-input-wacom )
 	packagekit? (
 		virtual/udev[gudev]
 		>=app-admin/packagekit-base-0.6.12 )
@@ -51,8 +54,7 @@ COMMON_DEPEND="
 		>=dev-libs/nss-3.11.2 )
 	systemd? ( >=sys-apps/systemd-31 )
 	udev? ( virtual/udev[gudev] )
-	wacom? ( >=dev-libs/libwacom-0.3
-		x11-drivers/xf86-input-wacom )"
+"
 # 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
@@ -75,24 +77,8 @@ DEPEND="${COMMON_DEPEND}
 	x11-proto/inputproto
 	x11-proto/kbproto
 	x11-proto/xf86miscproto
-	>=x11-proto/xproto-7.0.15"
-
-pkg_setup() {
-	# README is empty
-	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		$(use_enable colord color)
-		$(use_enable cups)
-		$(use_enable debug)
-		$(use_enable debug more-warnings)
-		$(use_enable packagekit)
-		$(use_enable smartcard smartcard-support)
-		$(use_enable systemd)
-		$(use_enable udev gudev)
-		$(use_enable wacom)"
-}
+	>=x11-proto/xproto-7.0.15
+"
 
 src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
@@ -117,6 +103,23 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
+src_configure() {
+	# README is empty
+	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
+	gnome2_src_configure \
+		--disable-static \
+		--disable-schemas-compile \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable debug more-warnings) \
+		$(use_enable packagekit) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable systemd) \
+		$(use_enable udev gudev) \
+		$(use_enable input_devices_wacom wacom)
+}
+
 src_test() {
 	Xemake check
 }
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.3.ebuild
index 4c966422ee99..e37bf8189ec9 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.3.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.6.3.ebuild,v 1.4 2013/01/06 09:37:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.3.ebuild,v 1.5 2013/01/22 07:37:37 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -11,9 +11,9 @@ inherit autotools eutils gnome2 virtualx
 DESCRIPTION="Gnome Settings Daemon"
 HOMEPAGE="http://www.gnome.org"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+colord +cups debug +i18n packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
+IUSE="+colord +cups debug +i18n input_devices_wacom packagekit policykit +short-touchpad-timeout smartcard systemd +udev"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="
 	packagekit? ( udev )
@@ -46,13 +46,13 @@ COMMON_DEPEND="
 	colord? ( >=x11-misc/colord-0.1.13 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	i18n? ( >=app-i18n/ibus-1.4.99 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.6
+		x11-drivers/xf86-input-wacom )
 	packagekit? ( >=app-admin/packagekit-base-0.7.4 )
 	smartcard? ( >=dev-libs/nss-3.11.2 )
 	systemd? ( >=sys-apps/systemd-31 )
 	udev? ( virtual/udev[gudev] )
-	wacom? (
-		>=dev-libs/libwacom-0.6
-		x11-drivers/xf86-input-wacom )
 "
 # 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
@@ -99,20 +99,19 @@ src_prepare() {
 src_configure() {
 	# README is empty
 	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-man
-		$(use_enable colord color)
-		$(use_enable cups)
-		$(use_enable debug)
-		$(use_enable debug more-warnings)
-		$(use_enable i18n ibus)
-		$(use_enable packagekit)
-		$(use_enable smartcard smartcard-support)
-		$(use_enable systemd)
-		$(use_enable udev gudev)
-		$(use_enable wacom)"
-	gnome2_src_configure
+	gnome2_src_configure \
+		--disable-static \
+		--enable-man \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable debug more-warnings) \
+		$(use_enable i18n ibus) \
+		$(use_enable packagekit) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable systemd) \
+		$(use_enable udev gudev) \
+		$(use_enable input_devices_wacom wacom)
 }
 
 src_test() {
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.4.ebuild
new file mode 100644
index 000000000000..dc17ed292987
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 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.6.4.ebuild,v 1.1 2013/01/22 07:37:37 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 virtualx
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug +i18n input_devices_wacom packagekit policykit +short-touchpad-timeout smartcard systemd +udev"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+REQUIRED_USE="
+	packagekit? ( udev )
+	smartcard? ( udev )
+"
+
+# require colord-0.1.27 dependency for connection type support
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.0:2
+	>=x11-libs/gtk+-3.3.4:3
+	>=gnome-base/gnome-desktop-3.5.3:3=
+	>=gnome-base/gsettings-desktop-schemas-3.5.90
+	media-fonts/cantarell
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra[gtk3]
+	>=media-sound/pulseaudio-0.9.16
+	>=sys-power/upower-0.9.11
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/libnotify-0.7.3:=
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	x11-libs/libXxf86misc
+
+	colord? ( >=x11-misc/colord-0.1.27:= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	i18n? ( >=app-i18n/ibus-1.4.99 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.6
+		x11-drivers/xf86-input-wacom )
+	packagekit? ( >=app-admin/packagekit-base-0.7.4 )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
+	systemd? ( >=sys-apps/systemd-31 )
+	udev? ( virtual/udev[gudev] )
+"
+# 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-extra/gnome-color-manager-3.1.1
+	!<gnome-extra/gnome-power-manager-3.1.3
+
+	!systemd? ( sys-auth/consolekit )
+"
+# xproto-7.0.15 needed for power plugin
+DEPEND="${COMMON_DEPEND}
+	cups? ( sys-apps/sed )
+	dev-libs/libxml2:2
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	>=x11-proto/xproto-7.0.15
+"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
+	# Apparently this change severely affects touchpad usability for some
+	# people, so revert it if USE=short-touchpad-timeout.
+	# Revisit if/when upstream adds a setting for customizing the timeout.
+	use short-touchpad-timeout &&
+		epatch "${FILESDIR}/${PN}-3.5.91-short-touchpad-timeout.patch"
+
+	# Make colord and wacom optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.6.4-optional-color-wacom.patch"
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# README is empty
+	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
+	gnome2_src_configure \
+		--disable-static \
+		--enable-man \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable debug) \
+		$(use_enable debug more-warnings) \
+		$(use_enable i18n ibus) \
+		$(use_enable packagekit) \
+		$(use_enable smartcard smartcard-support) \
+		$(use_enable systemd) \
+		$(use_enable udev gudev) \
+		$(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
index b258fed96ee3..5b106cd32729 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -13,7 +13,5 @@
 			it's effective for fast typists</flag>
 		<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
 			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
-		<flag name="wacom">Enable support for Wacom tablets and drawing
-			devices</flag>
 	</use>
 </pkgmetadata>