gnome-base/gnome-settings-daemon: QAed

* Add missing xkeyboard-config dependency.
* Fix keywords.
* Remove old revision of optional patch.
* Sync live ebuild.

1 files changed, 0 insertions, 89 deletions

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch
deleted file mode 100644
index 213d0a73..00000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From a5ee890809d279c06bb5f00dec7ad71eae2af14f Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Tue, 10 Dec 2013 00:27:27 +0100
-Subject: [PATCH] Make colord and wacom support optional
-
----
- configure.ac        | 30 ++++++++++++++++++++++++++----
- plugins/Makefile.am |  7 ++++++-
- 2 files changed, 32 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9f3b7ed..5720d36 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -245,7 +245,20 @@ dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 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 >= 1.0.2 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 - datetime
-@@ -276,12 +289,21 @@ 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 librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
--        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+        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 librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
-+          PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+          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 2f4840d..d517e77 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -4,7 +4,6 @@ enabled_plugins =	\
- 	a11y-keyboard	\
- 	a11y-settings	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	datetime	\
- 	dummy		\
-@@ -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
--- 
-1.8.3.2
-