Version bump for Gnome 3.6. Switch to EAPI=5.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

6 files changed, 248 insertions, 10 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 3e9a9383fdcd..ce1b50ad6fad 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.110 2012/12/11 09:33:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.111 2012/12/25 21:45:29 eva Exp $
+
+*gnome-settings-daemon-3.6.3 (25 Dec 2012)
+
+  25 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch,
+  +files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch,
+  +gnome-settings-daemon-3.6.3.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Switch to EAPI=5.
 
   11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   gnome-settings-daemon-3.2.3.ebuild, gnome-settings-daemon-3.4.2.ebuild:
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index b9b8c411013c..a97d90c87c94 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -16,23 +16,23 @@ AUX gnome-settings-daemon-3.4.0-optional-color-wacom.patch 4459 SHA256 90ca17376
 AUX gnome-settings-daemon-3.4.2-XI-2.2.patch 1816 SHA256 307e9328347ebcff8b4aa75174f8f41791135d6fa39b093e4cd897b017315793 SHA512 6fd5265255be5d7585daa2a3335916db00899a7654459a90a54adf43d067a29fbe7a0bc1fc1bbedaa4a0b9b74ac55a587092dc767f9f39fdda4c69fe54c9b153 WHIRLPOOL 1fa30f966b61b70676df6f2afc9e779fcf6724a82123571358fea607a99dafe3234263cc3ebd3a86070c34da68dd1a1014346308e8c3d5ee4b3983eff31c2694
 AUX gnome-settings-daemon-3.4.2-cups-1.6.patch 4719 SHA256 9efe540a040016244faedeecc074b404ca5c400c2aa77113986e7432ad6659fb SHA512 e2307beab24dcd7956d85235338f25e0c714f1a54c8589aae231cd1fc502478bd867409142efc868e81cf93e91ac8b26d05245fadde53612530efaf833c000a2 WHIRLPOOL 00823ece7de4d1e27340e8c0a185c489eeca7e70cd3ce8ea400812e91d3812bf978d665bb52ae8b6e0ace7149256ab8e758bb997eb1415c400f5d34beeecd1b3
 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
 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
-MISC ChangeLog 22196 SHA256 89bc25e686be1e075af4851fd8ce8a99d7f5729be6499b648b1a9134f78efd96 SHA512 f656db20ab3a415ba1637f1f2cb787e610eabd784d4e361b8cf6097f9150bbfc56045bf05f5fe299c57695047867e806d7c19855b874b78b039ce7dc99159a22 WHIRLPOOL 8666ee14ba03f4aa886f7dc484667e8bc3c96a551a661f9f93a3b601afa3b866681a26e02e69093182acbe810967b743111e7525a9c18dbbbde12cf8d8146564
-MISC metadata.xml 719 SHA256 c7a442b18c3adc866db0c31ec2303a008fcf5b3513c0b44c1b0c71628a46f608 SHA512 42d2a44fe2002ec44ee671992e708425a75b1e4917fe9678960b64d978b43c20fbd275cefab40811e370b4ed294ff3413dc1b7d36acf6d9bc92a8820771cd78f WHIRLPOOL 70faf7a2c9df00d1974b2d9a9316fefff4c479e875d7d833f5fb8cbe384b7dee8c5bba9b7ba28de49f8b3ca38c397432bfd3b927037b2a0006e7edbc6e46eb3e
+EBUILD gnome-settings-daemon-3.6.3.ebuild 3394 SHA256 1154eaa0e3ec601827d7bf4d56e36be96aa319c6307b60b3e797c57c417f7059 SHA512 d5565e20133b98199aa8a7c697239b1fe1151e46f40a87e9ebc46a5bc812f93b9c70591452c60be64459ec8896daf2bdafb24d39f088a2fa2773f3b9b48e515c WHIRLPOOL 287f3648dbeb9f2632a9fee623755d5b68521297d345b7b4dfda8b546d56e007bb50e36e643d4b78480d608d3e3672c800203e0d49128ad1e96ed494f7bf1c4d
+MISC ChangeLog 22524 SHA256 1963c645532e232792e7f78c90be71cc40695d512259e1ab4487b1fe9f6ce947 SHA512 9a9ef15a5336104275ad531f9ef2cbd9da95f9acdf2af2cc512ab448c8b0b9f17d857fb85db4bb5b66cd600a69fca011331b93af021a9ee1bb4555e85a6a5f92 WHIRLPOOL a173f71931441d98f6b43e5c37d8e9d97927586f0c09fc3403f4b3d00ba0728fe4a1f9b0f606f4ea08c66954f50f31f351da5f9357c3a5995a8102c919a0b214
+MISC metadata.xml 824 SHA256 cd04934476f26c5ef0f5838a82e581b94ec821b5f93ca801f92c90048e3f11d0 SHA512 e803caf03ec787144c7d91839172056f1ea7054f7e9a757b72ee45e290c178df7e21a9eb12de46f3df99d7452d73e60c3788b3c92a82e983bf6795585bb96bb0 WHIRLPOOL b4a20a878e953b27fa1ea7f556bf1d35f597a1f3de2c9a9affe95491bcbf5a76bb93d9e1db43386ebc2ebe221ed909876975de7051d004160c5858eafd377227
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQxv4AAAoJEEdUh39IaPFNPsgH/ibqcMKSdDct7k71PJzvNBpl
-/29qr46eUPZ+yDl8J2SHHg651yReABGTNDwyUCSA7IeJm/ohp5u637Wa0gbH6yQI
-h1lz7BRtvHWbsrgqwyMKET3mX6pYPg19wMRgJcyp8EkHXzzRa3dqMw4heFwxFEWV
-pInTQ8OIq3/vWvZC21kjOpqM/Eubal6/ephhZmYJUxdY3DaE5KK1S9EntaJaRKXm
-O89hfAgajmYlfzQQwlSbxUATPZatjKuYKiGh6ccBfaxEhIXmsnY2lBVZfN0ZMBw9
-zKoLzWsaJWUJIUoiOebQHPspV98+b82CPvG5S0EWbWVBTxd67gpU/c524tRB0lY=
-=LDSi
+iEYEAREIAAYFAlDaHnoACgkQ1fmVwcYIWAaNuwCgve5u+DRlzdvJ+bTUbKYkKh7f
+fq0AoKhHn6E30GKeUxS+5Uo7EN3onrUX
+=91R5
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch
new file mode 100644
index 000000000000..3605630dbb40
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch
@@ -0,0 +1,95 @@
+--- configure.ac
++++ configure.ac
+@@ -240,7 +240,20 @@
+ 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)
+@@ -252,11 +265,22 @@
+       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
+     ;;
+   *)
+--- data/Makefile.am
++++ data/Makefile.am
+@@ -11,7 +11,6 @@
+ 	org.gnome.settings-daemon.plugins.gschema.xml			\
+ 	org.gnome.settings-daemon.plugins.keyboard.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.power.gschema.xml		\
+-	org.gnome.settings-daemon.plugins.color.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml	\
+ 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
+@@ -20,6 +19,12 @@
+ 
+ all_schemas = $(gsettings_SCHEMAS)
+ 
++if WITH_COLOR
++gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
++else
++all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
++endif
++
+ if HAVE_PACKAGEKIT
+ gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
+ else
+--- plugins/Makefile.am
++++ plugins/Makefile.am
+@@ -6,7 +6,6 @@
+ 	automount	\
+ 	background	\
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	dummy		\
+ 	power		\
+@@ -21,6 +20,12 @@
+ 
+ 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/files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch
new file mode 100644
index 000000000000..b011009572ce
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
+index 80f664a..c9a29fb 100644
+--- a/plugins/mouse/gsd-mouse-manager.c
++++ b/plugins/mouse/gsd-mouse-manager.c
+@@ -533,7 +533,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
+ 
+                 g_ptr_array_add (args, "syndaemon");
+                 g_ptr_array_add (args, "-i");
+-                g_ptr_array_add (args, "1.0");
++                g_ptr_array_add (args, "0.5");
+                 g_ptr_array_add (args, "-t");
+                 g_ptr_array_add (args, "-K");
+                 g_ptr_array_add (args, "-R");
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
new file mode 100644
index 000000000000..6e9e20c74484
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.3.ebuild
@@ -0,0 +1,120 @@
+# 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.6.3.ebuild,v 1.1 2012/12/25 21:45:29 eva 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 packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+REQUIRED_USE="
+	packagekit? ( udev )
+	smartcard? ( udev )
+"
+
+# colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
+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.13 )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	i18n? ( >=app-i18n/ibus-1.4.99 )
+	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
+# <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.5.91-optional-color-wacom.patch"
+
+	eautoreconf
+
+	gnome2_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
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
index 7cff9d63b92f..b258fed96ee3 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -5,6 +5,8 @@
 	<use>
 		<flag name="colord">Support color management using
 			<pkg>x11-misc/colord</pkg></flag>
+		<flag name="i18n">Enable support for enhanced input methods through
+			<pkg>app-i18n/ibus</pkg></flag>
 		<flag name="packagekit">Enable support for the distro-neutral package
 			manager GUI <pkg>app-admin/packagekit</pkg></flag>
 		<flag name="short-touchpad-timeout">Change the touchpad timeout so that