Rekeyword as missing dep was finally keyworded, bug #478082, drop old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

17 files changed, 22 insertions, 961 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 5ca84883d61f..8d57c376c5a1 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,23 @@
 # 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.126 2013/11/10 09:59:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.127 2013/11/13 19:30:31 pacho Exp $
+
+  13 Nov 2013; Pacho Ramos <pacho@gentoo.org>
+  -files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch,
+  -files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch,
+  -files/gnome-settings-daemon-3.2.1-optional-colord.patch,
+  -files/gnome-settings-daemon-3.2.2-color-unavailable-edid.patch,
+  -files/gnome-settings-daemon-3.2.2-print-notifications-malformed-dbus.patch,
+  -files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch,
+  -files/gnome-settings-daemon-3.4.2-XI-2.2.patch,
+  -files/gnome-settings-daemon-3.4.2-cups-1.6.patch,
+  -files/gnome-settings-daemon-3.4.2-double-unref.patch,
+  -files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch,
+  -files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch,
+  -files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch,
+  -gnome-settings-daemon-3.6.4.ebuild, -gnome-settings-daemon-3.8.5.ebuild,
+  gnome-settings-daemon-3.8.3.ebuild, gnome-settings-daemon-3.8.6.1.ebuild:
+  Rekeyword as missing dep was finally keyworded, bug #478082, drop old.
 
 *gnome-settings-daemon-3.8.6.1 (10 Nov 2013)
 
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch
deleted file mode 100644
index a87a3d9b9777..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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)
- 
-                 args[0] = "syndaemon";
-                 args[1] = "-i";
--                args[2] = "2.0";
-+                args[2] = "0.5";
-                 args[3] = "-K";
-                 args[4] = "-R";
-                 args[5] = NULL;
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch
deleted file mode 100644
index 370cfc5e0fba..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.0-color-unbreak-loading-profiles.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e46d34f5bd9b0260a204d5f8a9d23c747b61923f Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Mon, 3 Oct 2011 10:02:34 -0400
-Subject: [PATCH] color: unbreak loading profiles at startup
-
-A recent commit broke color profile loading at startup if the profile
-directory exists already. Fix this.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660790
-
-Signed-off-by: Richard Hughes <richard@hughsie.com>
-
-[Alexandre Rostovtsev <tetromino@gmail.com>: backported to 3.2]
----
- plugins/color/gcm-profile-store.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
-index 3dde406..f8b0889 100644
---- a/plugins/color/gcm-profile-store.c
-+++ b/plugins/color/gcm-profile-store.c
-@@ -445,13 +445,14 @@ gcm_profile_store_search (GcmProfileStore *profile_store)
-         /* get Linux per-user profiles */
-         path = g_build_filename (g_get_user_data_dir (), "icc", NULL);
-         ret = gcm_profile_store_mkdir_with_parents (path, &error);
--        if (!ret) {
-+        if (!ret &&
-+            !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
-                 g_warning ("failed to create directory on startup: %s", error->message);
--                g_error_free (error);
-         } else {
-                 gcm_profile_store_search_path (profile_store, path, 0);
-         }
-         g_free (path);
-+        g_clear_error (&error);
- 
-         /* get per-user profiles from obsolete location */
-         path = g_build_filename (g_get_home_dir (), ".color", "icc", NULL);
--- 
-1.7.7
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch
deleted file mode 100644
index 98afbec65067..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From e1e0584cec966dc58a51efaf534f129b4830399f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 27 Oct 2011 23:30:41 -0400
-Subject: [PATCH] Make colord optional
-
----
- configure.ac        |   20 +++++++++++++++++++-
- data/Makefile.am    |    7 ++++++-
- plugins/Makefile.am |    7 ++++++-
- 3 files changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fe74674..f1a8547 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -107,7 +107,25 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VE
- dnl ---------------------------------------------------------------------------
- dnl - Check for colord
- dnl ---------------------------------------------------------------------------
--PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
-+build_color=false
-+AC_ARG_ENABLE(color,
-+  AC_HELP_STRING([--disable-color],
-+                 [turn off color plugin]),
-+      [case "${enableval}" in
-+              yes) WANT_COLOR=yes ;;
-+	      no) WANT_COLOR=no ;;
-+	      *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
-+      esac],
-+      [WANT_COLOR=yes]) dnl Default value
-+
-+if test x$WANT_COLOR = xyes; then
-+      PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
-+      build_color=true
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
-+
-+AC_SUBST(COLORD_CFLAGS)
-+AC_SUBST(COLORD_LIBS)
- 
- dnl ---------------------------------------------------------------------------
- dnl - Check for libcanberra
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 43ba27c..1f3bbef 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -11,7 +11,6 @@ gsettings_SCHEMAS =							\
- 	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	\
-@@ -21,6 +20,12 @@ gsettings_SCHEMAS =							\
- 
- all_schemas = $(gsettings_SCHEMAS)
- 
-+if BUILD_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
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 5e26811..d2404ab 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -6,7 +6,6 @@ enabled_plugins =	\
- 	automount	\
- 	background	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	datetime	\
- 	dummy		\
-@@ -24,6 +23,12 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_GCONF_BRIDGE
- enabled_plugins += gconf
- else
--- 
-1.7.7.1
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.2-color-unavailable-edid.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.2-color-unavailable-edid.patch
deleted file mode 100644
index dbfc8f1c8ecd..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.2-color-unavailable-edid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8cd361027c86a37c73eb8f787a88eda701d0fa4d Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Wed, 2 Nov 2011 16:49:07 +0000
-Subject: [PATCH] color: Set model and vendor to 'unknown' if not specified or
- unavailable
-
-If the user has connected a device without the ability to get the EDID (e.g.
-composite TV connection) then don't show a critical warning and fail to add
-the device.
-
-Resolves https://bugzilla.redhat.com/show_bug.cgi?id=749504
----
- plugins/color/gsd-color-manager.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/color/gsd-color-manager.c b/plugins/color/gsd-color-manager.c
-index 01b20c0..2474040 100644
---- a/plugins/color/gsd-color-manager.c
-+++ b/plugins/color/gsd-color-manager.c
-@@ -1263,6 +1263,12 @@ gcm_session_add_x11_output (GsdColorManager *manager, GnomeRROutput *output)
-         if (serial == NULL)
-                 serial = "unknown";
- 
-+        /* ensure mandatory fields are set */
-+        if (model == NULL)
-+                model = "unknown";
-+        if (vendor == NULL)
-+                vendor = "unknown";
-+
-         device_id = gcm_session_get_output_id (manager, output);
-         g_debug ("output %s added", device_id);
-         device_props = g_hash_table_new_full (g_str_hash, g_str_equal,
--- 
-1.7.8
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.2-print-notifications-malformed-dbus.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.2-print-notifications-malformed-dbus.patch
deleted file mode 100644
index 53c590b75753..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.2-print-notifications-malformed-dbus.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cbc5ab2ae34643775c980228d56f6b800f606b96 Mon Sep 17 00:00:00 2001
-From: Lars Uebernickel <lars.uebernickel@canonical.com>
-Date: Wed, 7 Dec 2011 16:21:38 +0100
-Subject: [PATCH] print-notifications: detect malformed d-bus signals
-
-Fixes a crash that happens when receiving a d-bus call with an invalid
-number of arguments.  The issue was first reported at lp #893676.  A
-patch to CUPS which makes it stop sending those malformed signals has
-been submitted to cups.org as STR #3984. (#665689)
----
- .../gsd-print-notifications-manager.c              |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/print-notifications/gsd-print-notifications-manager.c b/plugins/print-notifications/gsd-print-notifications-manager.c
-index 96285bc..fc557a1 100644
---- a/plugins/print-notifications/gsd-print-notifications-manager.c
-+++ b/plugins/print-notifications/gsd-print-notifications-manager.c
-@@ -405,6 +405,10 @@ on_cups_notification (GDBusConnection *connection,
-                         g_free (job_uri);
-                 }
-         }
-+        else {
-+                g_warning ("Invalid number of parameters for signal '%s'", signal_name);
-+                return;
-+        }
- 
-         if (g_strcmp0 (signal_name, "PrinterAdded") == 0) {
-                 cupsFreeDests (manager->priv->num_dests, manager->priv->dests);
--- 
-1.7.8
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch
deleted file mode 100644
index 045b4d61aad6..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3.92.new//configure.ac
---- gnome-settings-daemon-3.3.92//configure.ac	2012-03-19 14:23:38.000000000 +0530
-+++ gnome-settings-daemon-3.3.92.new//configure.ac	2012-03-25 11:36:35.833356226 +0530
-@@ -194,13 +194,39 @@
- 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 wacom plugin is enabled])
-+fi
-+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
-+
-+AC_SUBST(COLOR_CFLAGS)
-+AC_SUBST(COLOR_LIBS)
- 
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG 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_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
-+       AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled])
-+fi
-+AM_CONDITIONAL(WITH_WACOM, test "x$with_wacom" = "xyes")
-+
-+AC_SUBST(WACOM_CFLAGS)
-+AC_SUBST(WACOM_LIBS)
- 
- dnl ==============================================
- dnl PackageKit section
-diff -Naur gnome-settings-daemon-3.3.92//data/Makefile.am gnome-settings-daemon-3.3.92.new//data/Makefile.am
---- gnome-settings-daemon-3.3.92//data/Makefile.am	2012-03-16 22:59:35.000000000 +0530
-+++ gnome-settings-daemon-3.3.92.new//data/Makefile.am	2012-03-25 11:39:24.548364338 +0530
-@@ -11,16 +11,20 @@
- 	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	\
- 	org.gnome.settings-daemon.plugins.print-notifications.gschema.xml	\
--	org.gnome.settings-daemon.peripherals.wacom.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.xrandr.gschema.xml
- 
- 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
-@@ -33,6 +37,12 @@
- all_schemas += org.gnome.settings-daemon.plugins.orientation.gschema.xml
- endif
- 
-+if WITH_WACOM
-+gsettings_SCHEMAS += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
-+else
-+all_schemas += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
-+endif
-+
- @INTLTOOL_XML_NOMERGE_RULE@
- 
- @GSETTINGS_RULES@
-diff -Naur gnome-settings-daemon-3.3.92//plugins/Makefile.am gnome-settings-daemon-3.3.92.new//plugins/Makefile.am
---- gnome-settings-daemon-3.3.92//plugins/Makefile.am	2012-03-16 22:59:35.000000000 +0530
-+++ gnome-settings-daemon-3.3.92.new//plugins/Makefile.am	2012-03-25 11:37:47.296359651 +0530
-@@ -6,7 +6,6 @@
- 	automount	\
- 	background	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	dummy		\
- 	power		\
-@@ -15,13 +14,18 @@
- 	media-keys	\
- 	mouse		\
- 	sound		\
--	wacom		\
- 	xrandr		\
- 	xsettings	\
- 	$(NULL)
- 
- disabled_plugins = $(NULL)
- 
-+if WITH_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if HAVE_PACKAGEKIT
- enabled_plugins += updates
- else
-@@ -46,5 +50,11 @@
- disabled_plugins += print-notifications
- endif
- 
-+if WITH_WACOM
-+enabled_plugins += wacom
-+else
-+disabled_plugins += wacom
-+endif
-+
- SUBDIRS = common $(enabled_plugins)
- DIST_SUBDIRS = $(SUBDIRS) $(disabled_plugins)
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-XI-2.2.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-XI-2.2.patch
deleted file mode 100644
index f2079dd81b88..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-XI-2.2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9d23fac4ce927cd27964323aa4cf8138e5128ba0 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 12 Apr 2012 13:51:09 +1000
-Subject: [PATCH] common: Try XI 2.2 if XI 2.0 fails
-
-The media-keys plugin calls supports_xinput2_devices(). That again calls
-XIQueryDevice with a major/minor of 2.0. The upstream server has a check
-for this in place and responds BadValue if a client initiates XI2 twice
-with two different versions (such both us and GTK+ checking for
-different versions). This happens here, and thus the plugin fails
-to load.
-
-The X server was fixed, but this is still required for older versions
-of the Xi code:
-http://cgit.freedesktop.org/xorg/xserver/commit/?id=ea51e9b2877df60135edaf2a8f88d0f2a2b41060
-
-https://bugzilla.gnome.org/show_bug.cgi?id=673964
----
- plugins/common/gsd-input-helper.c |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c
-index cf9e83d..f06b507 100644
---- a/plugins/common/gsd-input-helper.c
-+++ b/plugins/common/gsd-input-helper.c
-@@ -129,7 +129,14 @@ supports_xinput2_devices (int *opcode)
- 
-         if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
-                 gdk_error_trap_pop_ignored ();
--                return FALSE;
-+                /* try for 2.2, maybe gtk has already announced 2.2 support */
-+                gdk_error_trap_push ();
-+                major = 2;
-+                minor = 2;
-+                if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
-+                    gdk_error_trap_pop_ignored ();
-+                    return FALSE;
-+                }
-         }
-         gdk_error_trap_pop_ignored ();
- 
--- 
-1.7.8.6
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-cups-1.6.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-cups-1.6.patch
deleted file mode 100644
index b73fa08e0596..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-cups-1.6.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 2cc8d6f3917b8480036a24db52f9717db5b31736 Mon Sep 17 00:00:00 2001
-From: Jiri Popelka <jpopelka@redhat.com>
-Date: Wed, 11 Jul 2012 18:17:12 +0200
-Subject: [PATCH] Use CUPS-1.6 IPP API getter/setter functions.
-
-CUPS 1.6 makes various structures private and
-introduces these ippGet and ippSet functions
-for all of the fields in these structures.
-http://www.cups.org/str.php?L3928
-
-We define our own accessors when
-building against CUPS < 1.6.
----
- .../gsd-print-notifications-manager.c                |   18 ++++++++++++++----
- plugins/print-notifications/gsd-printer.c            |   10 +++++++++-
- 2 files changed, 23 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/print-notifications/gsd-print-notifications-manager.c b/plugins/print-notifications/gsd-print-notifications-manager.c
-index 0092865..482a528 100644
---- a/plugins/print-notifications/gsd-print-notifications-manager.c
-+++ b/plugins/print-notifications/gsd-print-notifications-manager.c
-@@ -53,6 +53,16 @@
- #define REASON_TIMEOUT                   15000
- #define CUPS_CONNECTION_TEST_INTERVAL    300
- 
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
-+#define HAVE_CUPS_1_6 1
-+#endif
-+
-+#ifndef HAVE_CUPS_1_6
-+#define ippGetStatusCode(ipp) ipp->request.status.status_code
-+#define ippGetInteger(attr, element) attr->values[element].integer
-+#define ippGetString(attr, element, language) attr->values[element].string.text
-+#endif
-+
- struct GsdPrintNotificationsManagerPrivate
- {
-         GDBusConnection              *cups_bus_connection;
-@@ -398,10 +408,10 @@ on_cups_notification (GDBusConnection *connection,
-                         response = cupsDoRequest (http, request, "/");
- 
-                         if (response) {
--                                if (response->request.status.status_code <= IPP_OK_CONFLICT &&
-+                                if (ippGetStatusCode (response) <= IPP_OK_CONFLICT &&
-                                     (attr = ippFindAttribute(response, "job-originating-user-name",
-                                                              IPP_TAG_NAME))) {
--                                        if (g_strcmp0 (attr->values[0].string.text, cupsUser ()) == 0)
-+                                        if (g_strcmp0 (ippGetString (attr, 0, NULL), cupsUser ()) == 0)
-                                                 my_job = TRUE;
-                                 }
-                                 ippDelete(response);
-@@ -891,12 +901,12 @@ renew_subscription (gpointer data)
-                                        "notify-lease-duration", SUBSCRIPTION_DURATION);
-                         response = cupsDoRequest (http, request, "/");
- 
--                        if (response != NULL && response->request.status.status_code <= IPP_OK_CONFLICT) {
-+                        if (response != NULL && ippGetStatusCode (response) <= IPP_OK_CONFLICT) {
-                                 if ((attr = ippFindAttribute (response, "notify-subscription-id",
-                                                               IPP_TAG_INTEGER)) == NULL)
-                                         g_debug ("No notify-subscription-id in response!\n");
-                                 else
--                                        manager->priv->subscription_id = attr->values[0].integer;
-+                                        manager->priv->subscription_id = ippGetInteger (attr, 0);
-                         }
- 
-                         if (response)
-diff --git a/plugins/print-notifications/gsd-printer.c b/plugins/print-notifications/gsd-printer.c
-index 886f6ce..26dbb6d 100644
---- a/plugins/print-notifications/gsd-printer.c
-+++ b/plugins/print-notifications/gsd-printer.c
-@@ -63,6 +63,14 @@ static GDBusNodeInfo *pdi_introspection_data = NULL;
- #define GNOME_SESSION_PRESENCE_DBUS_PATH  "/org/gnome/SessionManager/Presence"
- #define GNOME_SESSION_PRESENCE_DBUS_IFACE "org.gnome.SessionManager.Presence"
- 
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
-+#define HAVE_CUPS_1_6 1
-+#endif
-+
-+#ifndef HAVE_CUPS_1_6
-+#define ippGetState(ipp) ipp->state
-+#endif
-+
- enum {
-   PRESENCE_STATUS_AVAILABLE = 0,
-   PRESENCE_STATUS_INVISIBLE,
-@@ -725,7 +733,7 @@ printer_autoconfigure (gchar *printer_name)
-                                                         "AutoConfigure",
-                                                         ("Automatic configuration"));
-                 if (response) {
--                        if (response->state == IPP_ERROR)
-+                        if (ippGetState (response) == IPP_ERROR)
-                                 g_warning ("An error has occured during automatic configuration of new printer.");
-                         ippDelete (response);
-                 }
--- 
-1.7.10.4
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-double-unref.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-double-unref.patch
deleted file mode 100644
index 8ae42e1b2393..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.2-double-unref.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f3e5a738c7d663adedb98829fb69bb389a10e775 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@unixuser.org>
-Date: Thu, 5 Apr 2012 16:41:12 +0900
-Subject: [PATCH] daemon: don't unref member objects twice on dispose
-
-https://bugzilla.gnome.org/show_bug.cgi?id=673555
----
- gnome-settings-daemon/gnome-settings-manager.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/gnome-settings-daemon/gnome-settings-manager.c b/gnome-settings-daemon/gnome-settings-manager.c
-index 13faeba..672c53f 100644
---- a/gnome-settings-daemon/gnome-settings-manager.c
-+++ b/gnome-settings-daemon/gnome-settings-manager.c
-@@ -461,11 +461,11 @@ gnome_settings_manager_stop (GnomeSettingsManager *manager)
-                 manager->priv->owner_id = 0;
-         }
- 
--        g_object_unref (manager->priv->settings);
--        manager->priv->settings = NULL;
-+        if (manager->priv->settings)
-+                g_clear_object (&manager->priv->settings);
- 
--        g_object_unref (manager->priv->pnp_ids);
--        manager->priv->pnp_ids = NULL;
-+        if (manager->priv->pnp_ids)
-+                g_clear_object (&manager->priv->pnp_ids);
- }
- 
- static void
--- 
-1.7.8.6
-
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
deleted file mode 100644
index 3605630dbb40..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-optional-color-wacom.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- 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
deleted file mode 100644
index b011009572ce..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.5.91-short-touchpad-timeout.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/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
deleted file mode 100644
index bd02900a40af..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.4-optional-color-wacom.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-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-3.6.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.4.ebuild
deleted file mode 100644
index dc17ed292987..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.4.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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/gnome-settings-daemon-3.8.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3.ebuild
index 59e1593d3c8a..42d2762a1df6 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.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.8.3.ebuild,v 1.3 2013/07/25 06:23:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3.ebuild,v 1.4 2013/11/13 19:30:31 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+colord +cups debug +i18n input_devices_wacom packagekit policykit +short-touchpad-timeout smartcard +udev"
-KEYWORDS=" ~alpha ~ia64 ~sparc"
+KEYWORDS="~ia64 ~sparc"
 REQUIRED_USE="
 	packagekit? ( udev )
 	smartcard? ( udev )
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.5.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.5.ebuild
deleted file mode 100644
index 4487e09c14c1..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.5.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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.8.5.ebuild,v 1.2 2013/09/28 09:25:35 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 systemd virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-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 +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev"
-REQUIRED_USE="
-	packagekit? ( udev )
-	smartcard? ( udev )
-"
-
-# require colord-0.1.27 dependency for connection type support
-COMMON_DEPEND="
-	>=dev-libs/glib-2.35.3:2
-	>=x11-libs/gtk+-3.7.8:3
-	>=gnome-base/gnome-desktop-3.7.90:3=
-	>=gnome-base/gsettings-desktop-schemas-3.7.2.1
-	>=gnome-base/librsvg-2.36.2
-	media-fonts/cantarell
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-2
-	>=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.7
-		x11-drivers/xf86-input-wacom )
-	packagekit? ( >=app-admin/packagekit-base-0.7.4 )
-	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
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/dconf
-	!openrc-force? ( sys-apps/systemd )
-	>=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 )
-	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.7.90-short-touchpad-timeout.patch"
-
-	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.7.90-optional-color-wacom.patch"
-
-	epatch_user
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-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 udev gudev) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	Xemake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow the this guide to migrate:"
-		ewarn "http://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.6.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.6.1.ebuild
index c4dcd7683ac0..c722f1099204 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.6.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.6.1.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.8.6.1.ebuild,v 1.1 2013/11/10 09:59:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.6.1.ebuild,v 1.2 2013/11/13 19:30:31 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev"
 REQUIRED_USE="