Version bump, drop old

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

12 files changed, 49 insertions, 1328 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 45125f359f24..b17cf1e439c6 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.136 2013/10/08 15:24:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.137 2013/11/10 08:59:08 pacho Exp $
+
+*gnome-control-center-3.8.6 (10 Nov 2013)
+
+  10 Nov 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-control-center-3.8.6-flickr-linking.patch,
+  +gnome-control-center-3.8.6.ebuild,
+  -files/gnome-control-center-3.5.91-gentoo-paths.patch,
+  -files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch,
+  -files/gnome-control-center-3.5.91-optional-kerberos.patch,
+  -files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch,
+  -files/gnome-control-center-3.7.4-optional-kerberos.patch,
+  -files/gnome-control-center-3.8.0-optional-r1.patch,
+  -files/gnome-control-center-3.8.1.5-optional-modemmanager.patch,
+  -files/gnome-control-center-3.8.4-optional-kerberos.patch,
+  -gnome-control-center-3.6.3-r1.ebuild, -gnome-control-center-3.8.5.ebuild:
+  Version bump, drop old
 
 *gnome-control-center-3.8.5-r1 (08 Oct 2013)
 
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch
deleted file mode 100644
index 64b992db6616..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Use Gentoo-appropriate absolute paths
-
-Original author: Alexandre Rostovtsev <tetromino@gentoo.org>
----
---- a/panels/common/Makefile.am
-+++ b/panels/common/Makefile.am
-@@ -9,7 +9,7 @@
- 	$(LIBLANGUAGE_CFLAGS)				\
- 	-DDATADIR=\""$(datadir)"\"			\
- 	-DUIDIR=\""$(pkgdatadir)/ui"\"			\
--	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"       \
-+	-DLIBLOCALEDIR=\""$(libdir)/locale"\"       \
- 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
- 	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"
- 
---- a/panels/datetime/Makefile.am
-+++ b/panels/datetime/Makefile.am
-@@ -72,6 +72,7 @@
- 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
- 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
- 	-DDATADIR="\"$(uidir)\""			\
-+	-DREALDATADIR="\"$(datadir)\""			\
- 	$(NULL)
- 
- noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
---- a/panels/datetime/test-endianess.c
-+++ b/panels/datetime/test-endianess.c
-@@ -38,11 +38,11 @@
- 		return 0;
- 	}
- 
--	dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
-+	dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
- 	if (dir == NULL) {
- 		/* Try with /usr/share/locale/
- 		 * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
--		dir = g_dir_open ("/usr/share/locale/", 0, NULL);
-+		dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
- 		if (dir == NULL) {
- 			return 1;
- 		}
---- a/panels/datetime/test-timezone.c
-+++ b/panels/datetime/test-timezone.c
-@@ -1,7 +1,7 @@
- #include <gtk/gtk.h>
- #include "cc-timezone-map.h"
- 
--#define TZ_DIR "/usr/share/zoneinfo/"
-+#define TZ_DIR REALDATADIR "/zoneinfo/"
- 
- static GList *
- get_timezone_list (GList *tzs,
---- a/panels/datetime/tz.h
-+++ b/panels/datetime/tz.h
-@@ -29,9 +29,9 @@
- #include <glib.h>
- 
- #ifndef __sun
--#  define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
-+#  define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
- #else
--#  define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
-+#  define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
- #endif
- 
- typedef struct _TzDB TzDB;
---- a/panels/printers/Makefile.am
-+++ b/panels/printers/Makefile.am
-@@ -12,6 +12,9 @@
- 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
- 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
- 	-DDATADIR="\"$(uidir)\""			\
-+	-DREALDATADIR="\"$(datadir)\""			\
-+	-DPREFIX="\"$(prefix)\""			\
-+	-DLIBEXECDIR="\"$(libexecdir)\""			\
- 	$(NULL)
- 
- ccpanelsdir = $(PANELS_DIR)
---- a/panels/printers/cc-printers-panel.c
-+++ b/panels/printers/cc-printers-panel.c
-@@ -2199,8 +2199,8 @@
- 
-   if (printer_name)
-     {
--      const gchar  *const dirs[] = { "/usr/share/cups",
--                                     "/usr/local/share/cups",
-+      const gchar  *const dirs[] = { REALDATADIR "/cups",
-+                                     PREFIX "/local/share/cups",
-                                      NULL };
-       const gchar  *testprint[] = { "%s/data/testprint",
-                                     "%s/data/testprint.ps",
---- a/panels/printers/pp-host.c
-+++ b/panels/printers/pp-host.c
-@@ -251,7 +251,7 @@
-   data->devices->devices = NULL;
- 
-   argv = g_new0 (gchar *, 3);
--  argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
-+  argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
-   argv[1] = g_strdup (priv->hostname);
- 
-   /* Use SNMP to get printer's informations */
---- a/panels/user-accounts/Makefile.am
-+++ b/panels/user-accounts/Makefile.am
-@@ -10,7 +10,7 @@
- AM_CPPFLAGS =						\
- 	-DDATADIR=\""$(datadir)"\"			\
- 	-DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\"	\
--	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"       \
-+	-DLIBLOCALEDIR=\""$(libdir)/locale"\"       \
- 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
- 	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"	\
- 	-I$(srcdir)/../common/				\
--- 
-1.7.8.6
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch
deleted file mode 100644
index aab50aa0d3ea..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-Make wacom, colord, goa optional
-
-Original author: Alexandre Rostovtsev <tetromino@gentoo.org>
---- configure.ac
-+++ configure.ac
-@@ -137,10 +137,48 @@
- PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
-                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
--PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
-+
-+build_online_accounts=false
-+AC_ARG_ENABLE(goa,
-+  AC_HELP_STRING([--disable-goa],
-+                 [disable online accounts management panel]),
-+      [case "${enableval}" in
-+              yes) WANT_ONLINE_ACCOUNTS=yes ;;
-+              no) WANT_ONLINE_ACCOUNTS=no ;;
-+              *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
-+      esac],
-+      [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
-+
-+if test x$WANT_ONLINE_ACCOUNTS = xyes; then
-+      PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
-+      build_online_accounts=true
-+fi
-+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
-+
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
-                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
-+
-+build_color=false
-+AC_ARG_ENABLE(color,
-+  AC_HELP_STRING([--disable-color],
-+                 [disable color management panel]),
-+      [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(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
-+      build_color=true
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
-+AC_SUBST(COLOR_PANEL_CFLAGS)
-+AC_SUBST(COLOR_PANEL_LIBS)
-+
- PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
-                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
- PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES
-@@ -174,10 +212,24 @@
- fi
- AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
- 
--# Check for gnome-bluetooth
--PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5,
--		  [have_bluetooth=yes], have_bluetooth=no)
--AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
-+have_bluetooth=false
-+AC_ARG_ENABLE(bluetooth,
-+  AC_HELP_STRING([--disable-bluetooth],
-+                 [disable bluetooth management panel]),
-+      [case "${enableval}" in
-+              yes) WANT_BLUETOOTH=yes ;;
-+              no) WANT_BLUETOOTH=no ;;
-+              *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
-+      esac],
-+      [WANT_BLUETOOTH=yes]) dnl Default value
-+
-+if test x$WANT_BLUETOOTH = xyes; then
-+     # Check for gnome-bluetooth
-+     PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5)
-+     have_bluetooth=true
-+fi
-+
-+AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xtrue])
- 
- # Check for CUPS 1.4 or newer
- AC_ARG_ENABLE([cups],
-@@ -237,11 +289,23 @@
-     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
-       have_wacom=no
-     else
--      PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
--                        gnome-settings-daemon >= $GSD_REQUIRED_VERSION
--                        xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
--                        gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
--      have_wacom=yes
-+      AC_ARG_ENABLE(wacom,
-+        AC_HELP_STRING([--disable-wacom],
-+                       [disable wacom management panel]),
-+            [case "${enableval}" in
-+                    yes) WANT_WACOM=yes ;;
-+                    no) WANT_WACOM=no ;;
-+                    *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
-+            esac],
-+            [WANT_WACOM=yes]) dnl Default value
-+      
-+      if test x$WANT_WACOM = xyes; then
-+            PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
-+                              gnome-settings-daemon >= $GSD_REQUIRED_VERSION
-+                              xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-+                              gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+            have_wacom=yes
-+      fi
-     fi
-     ;;
-   *)
-@@ -509,6 +573,11 @@
- else
- 	AC_MSG_NOTICE([   Bluetooth panel disabled])
- fi
-+if test "x$build_color" = "xtrue"; then
-+	AC_MSG_NOTICE([** colord (Color panel)])
-+else
-+	AC_MSG_NOTICE([   Color panel disabled])
-+fi
- if test "x$enable_cups" = "xyes"; then
- 	AC_MSG_NOTICE([** CUPS (Printers panel)])
- else
-@@ -519,6 +588,11 @@
- else
- 	AC_MSG_NOTICE([   Users panel webcam support disabled])
- fi
-+if test "x$build_online_accounts" = "xtrue"; then
-+	AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
-+else
-+	AC_MSG_NOTICE([   Online Accounts panel disabled])
-+fi
- if test "x$with_libsocialweb" = "xyes"; then
- 	AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])
- else
-@@ -529,6 +603,11 @@
- else
- 	AC_MSG_NOTICE([   Using ConsoleKit for session tracking])
- fi
-+if test "x$build_wacom" = "xtrue"; then
-+	AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
-+else
-+	AC_MSG_NOTICE([   Wacom Graphics Tablet panel disabled])
-+fi
- if test "x$have_wacom" = "xyes"; then
- 	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
- else
---- panels/Makefile.am
-+++ panels/Makefile.am
-@@ -3,10 +3,8 @@
- 	background \
- 	screen \
- 	power \
--	color \
- 	display \
- 	mouse \
--	online-accounts \
- 	region \
- 	info \
- 	sound \
-@@ -15,6 +13,10 @@
- 	user-accounts \
- 	datetime
- 
-+if BUILD_COLOR
-+SUBDIRS += color
-+endif
-+ 
- if BUILD_WACOM
- SUBDIRS += wacom
- endif
-@@ -31,4 +33,8 @@
- SUBDIRS += bluetooth
- endif
- 
-+if BUILD_ONLINE_ACCOUNTS
-+SUBDIRS += online-accounts
-+endif
-+
- -include $(top_srcdir)/git.mk
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch
deleted file mode 100644
index aba709475c52..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From 88e3f2146b0740161dc3b2095dcf05c538b67e36 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Mon, 10 Sep 2012 18:49:43 +0300
-Subject: [PATCH] Crappy patch to allow disabling kerberos requirement
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686840
----
- configure.ac                             | 22 ++++++++++++++--------
- panels/user-accounts/um-account-dialog.c | 30 ++++++++++++++++++++++++++----
- panels/user-accounts/um-realm-manager.c  |  2 ++
- 3 files changed, 42 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fa4b12f..c1e188f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -321,16 +321,22 @@ AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes
- ISO_CODES=iso-codes
- 
- # Kerberos kerberos support
--AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
--if test "$KRB5_CONFIG" = "no"; then
--  AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
--fi
- 
--AC_MSG_CHECKING(for krb5 libraries and flags)
--KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
--KRB5_LIBS="`$KRB5_CONFIG --libs`"
--AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+AC_ARG_ENABLE([kerberos],
-+              AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
-+              [enable_kerberos=yes])
-+
-+if test x"$enable_kerberos" != x"no" ; then
-+    AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
-+    if test "$KRB5_CONFIG" = "no"; then
-+      AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
-+    fi
- 
-+    AC_MSG_CHECKING(for krb5 libraries and flags)
-+    KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
-+    KRB5_LIBS="`$KRB5_CONFIG --libs`"
-+    AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+fi
- AC_SUBST(KRB5_CFLAGS)
- AC_SUBST(KRB5_LIBS)
- 
-diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c
-index 9dbda5c..6b82980 100644
---- a/panels/user-accounts/um-account-dialog.c
-+++ b/panels/user-accounts/um-account-dialog.c
-@@ -26,10 +26,13 @@
- #include <gtk/gtk.h>
- 
- #include "um-account-dialog.h"
--#include "um-realm-manager.h"
- #include "um-user-manager.h"
- #include "um-utils.h"
- 
-+#ifdef KERBEROS
-+#include "um-realm-manager.h"
-+#endif
-+
- typedef enum {
-         UM_LOCAL,
-         UM_ENTERPRISE,
-@@ -41,6 +44,7 @@ static void   mode_change          (UmAccountDialog *self,
- 
- static void   dialog_validate      (UmAccountDialog *self);
- 
-+#ifdef KERBEROS
- static void   on_join_login        (GObject *source,
-                                     GAsyncResult *result,
-                                     gpointer user_data);
-@@ -48,6 +52,7 @@ static void   on_join_login        (GObject *source,
- static void   on_realm_joined      (GObject *source,
-                                     GAsyncResult *result,
-                                     gpointer user_data);
-+#endif
- 
- #define UM_ACCOUNT_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_ACCOUNT_DIALOG, \
-                                                                     UmAccountDialogClass))
-@@ -83,6 +88,7 @@ struct _UmAccountDialog {
-         gboolean enterprise_domain_chosen;
-         GtkEntry *enterprise_login;
-         GtkEntry *enterprise_password;
-+#ifdef KERBEROS
-         UmRealmManager *realm_manager;
-         UmRealmObject *selected_realm;
- 
-@@ -92,6 +98,7 @@ struct _UmAccountDialog {
-         GtkEntry *join_name;
-         GtkEntry *join_password;
-         gboolean join_prompted;
-+#endif
- };
- 
- struct _UmAccountDialogClass {
-@@ -292,6 +299,7 @@ local_prepare (UmAccountDialog *self)
-         gtk_combo_box_set_active (GTK_COMBO_BOX (self->local_account_type), 0);
- }
- 
-+#ifdef KERBEROS
- static gboolean
- enterprise_validate (UmAccountDialog *self)
- {
-@@ -461,7 +469,6 @@ on_join_response (GtkDialog *dialog,
-                         on_join_login,
-                         g_object_ref (self));
- }
--
- static void
- join_show_prompt (UmAccountDialog *self,
-                   GError *error)
-@@ -839,6 +846,7 @@ enterprise_prepare (UmAccountDialog *self)
-         gtk_entry_set_text (GTK_ENTRY (self->enterprise_login), "");
-         gtk_entry_set_text (GTK_ENTRY (self->enterprise_password), "");
- }
-+#endif
- 
- static void
- dialog_validate (UmAccountDialog *self)
-@@ -849,9 +857,11 @@ dialog_validate (UmAccountDialog *self)
-         case UM_LOCAL:
-                 valid = local_validate (self);
-                 break;
-+#ifdef KERBEROS
-         case UM_ENTERPRISE:
-                 valid = enterprise_validate (self);
-                 break;
-+#endif
-         default:
-                 valid = FALSE;
-                 break;
-@@ -937,12 +947,14 @@ on_local_toggle (GtkToggleButton *toggle,
-         mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_LOCAL);
- }
- 
-+#ifdef KERBEROS
- static void
- on_enterprise_toggle (GtkToggleButton *toggle,
-                       gpointer user_data)
- {
-         mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_ENTERPRISE);
- }
-+#endif
- 
- static void
- mode_init (UmAccountDialog *self,
-@@ -954,15 +966,18 @@ mode_init (UmAccountDialog *self,
- 
-         widget = (GtkWidget *) gtk_builder_get_object (builder, "local-area");
-         self->mode_areas[UM_LOCAL] = widget;
-+#ifdef KERBEROS
-         widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-area");
-         self->mode_areas[UM_ENTERPRISE] = widget;
--
-+#endif
-         widget = (GtkWidget *) gtk_builder_get_object (builder, "local-button");
-         g_signal_connect (widget, "toggled", G_CALLBACK (on_local_toggle), self);
-         self->mode_buttons[UM_LOCAL] = widget;
-+#ifdef KERBEROS
-         widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-button");
-         g_signal_connect (widget, "toggled", G_CALLBACK (on_enterprise_toggle), self);
-         self->mode_buttons[UM_ENTERPRISE] = widget;
-+#endif
- }
- 
- static void
-@@ -1022,8 +1037,10 @@ um_account_dialog_init (UmAccountDialog *self)
-         self->container_widget = widget;
- 
-         local_init (self, builder);
-+#ifdef KERBEROS
-         enterprise_init (self, builder);
-         join_init (self, builder);
-+#endif
-         mode_init (self, builder);
- 
-         g_object_unref (builder);
-@@ -1041,9 +1058,11 @@ um_account_dialog_response (GtkDialog *dialog,
-                 case UM_LOCAL:
-                         local_create_user (self);
-                         break;
-+#ifdef KERBEROS
-                 case UM_ENTERPRISE:
-                         enterprise_add_user (self);
-                         break;
-+#endif
-                 default:
-                         g_assert_not_reached ();
-                 }
-@@ -1064,6 +1083,7 @@ um_account_dialog_dispose (GObject *obj)
-         if (self->cancellable)
-                 g_cancellable_cancel (self->cancellable);
- 
-+#ifdef KERBEROS
-         if (self->realmd_watch)
-                 g_bus_unwatch_name (self->realmd_watch);
-         self->realmd_watch = 0;
-@@ -1075,7 +1095,7 @@ um_account_dialog_dispose (GObject *obj)
-                 g_object_unref (self->realm_manager);
-                 self->realm_manager = NULL;
-         }
--
-+#endif
-         G_OBJECT_CLASS (um_account_dialog_parent_class)->dispose (obj);
- }
- 
-@@ -1128,7 +1148,9 @@ um_account_dialog_show (UmAccountDialog     *self,
-         self->cancellable = g_cancellable_new ();
- 
-         local_prepare (self);
-+#ifdef KERBEROS
-         enterprise_prepare (self);
-+#endif
-         mode_change (self, UM_LOCAL);
-         dialog_validate (self);
- 
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
-index 301c905..25c055c 100644
---- a/panels/user-accounts/um-realm-manager.c
-+++ b/panels/user-accounts/um-realm-manager.c
-@@ -22,6 +22,7 @@
- 
- #include "config.h"
- 
-+#ifdef KERBEROS
- #include "um-realm-manager.h"
- 
- #include <krb5/krb5.h>
-@@ -826,3 +827,4 @@ um_realm_login_finish (GAsyncResult *result,
- 
-         return TRUE;
- }
-+#endif
--- 
-1.7.12
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch
deleted file mode 100644
index 80dc65315783..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson@canonical.com>
-Date: Fri, 7 Dec 2012 16:22:09 +0530
-Subject: [PATCH] sound: Fix port handling for the unknown availability case
-
-The current code assumes that port availability transitions will be
-between YES and NO, and doesn't account for the fact that it may also be
-UNKNOWN. This causes spurious entries if the port availability
-transitions between YES and UNKNOWN.
----
- panels/sound/gvc-mixer-control.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c
-index 34ddc0c..2f6cf34 100644
---- a/panels/sound/gvc-mixer-control.c
-+++ b/panels/sound/gvc-mixer-control.c
-@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl      *control,
-                 else {
-                         for (i = 0; i < info->n_ports; i++) {
-                                 if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) {
--                                        if (card_port->available != info->ports[i]->available) {
-+                                        if ((card_port->available == PA_PORT_AVAILABLE_NO) !=  (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) {
-                                                 card_port->available = info->ports[i]->available;
-                                                 g_debug ("sync port availability on card %i, card port name '%s', new available value %i",
-                                                           gvc_mixer_card_get_index (card),
--- 
-1.8.0
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.7.4-optional-kerberos.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.7.4-optional-kerberos.patch
deleted file mode 100644
index 38088aa2425d..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.7.4-optional-kerberos.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From 75c944a788beb749a28086025876406b7864baf5 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Tue, 19 Feb 2013 16:40:37 +0330
-Subject: [PATCH] gnome-control-center-3.7.4-optional-kerberos
-originaly by Priit Laes <pleas@plaes.org>
-Crappy patch to allow disabling kerberos requirement                  
-https://bugzilla.gnome.org/show_bug.cgi?id=686840    
----
- panels/user-accounts/um-account-dialog.c | 30 ++++++++++++++++++++++++++----
- panels/user-accounts/um-realm-manager.c  |  2 ++
- 2 files changed, 28 insertions(+), 4 deletions(-)
-
-diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c
-index 88dff99..5f50087 100644
---- a/panels/user-accounts/um-account-dialog.c
-+++ b/panels/user-accounts/um-account-dialog.c
-@@ -27,9 +27,12 @@
- #include <act/act.h>
- 
- #include "um-account-dialog.h"
--#include "um-realm-manager.h"
- #include "um-utils.h"
- 
-+#ifdef KERBEROS
-+#include "um-realm-manager.h" 
-+#endif
-+
- typedef enum {
-         UM_LOCAL,
-         UM_ENTERPRISE,
-@@ -41,6 +44,7 @@ static void   mode_change          (UmAccountDialog *self,
- 
- static void   dialog_validate      (UmAccountDialog *self);
- 
-+#ifdef KERBEROS
- static void   on_join_login        (GObject *source,
-                                     GAsyncResult *result,
-                                     gpointer user_data);
-@@ -48,6 +52,7 @@ static void   on_join_login        (GObject *source,
- static void   on_realm_joined      (GObject *source,
-                                     GAsyncResult *result,
-                                     gpointer user_data);
-+#endif
- 
- #define UM_ACCOUNT_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_ACCOUNT_DIALOG, \
-                                                                     UmAccountDialogClass))
-@@ -83,6 +88,7 @@ struct _UmAccountDialog {
-         gboolean enterprise_domain_chosen;
-         GtkEntry *enterprise_login;
-         GtkEntry *enterprise_password;
-+#ifdef KERBEROS
-         UmRealmManager *realm_manager;
-         UmRealmObject *selected_realm;
- 
-@@ -92,6 +98,7 @@ struct _UmAccountDialog {
-         GtkEntry *join_name;
-         GtkEntry *join_password;
-         gboolean join_prompted;
-+#endif
- };
- 
- struct _UmAccountDialogClass {
-@@ -300,6 +307,7 @@ local_prepare (UmAccountDialog *self)
-         gtk_combo_box_set_active (GTK_COMBO_BOX (self->local_account_type), 0);
- }
- 
-+#ifdef KERBEROS
- static gboolean
- enterprise_validate (UmAccountDialog *self)
- {
-@@ -504,7 +512,6 @@ on_join_response (GtkDialog *dialog,
-                         on_join_login,
-                         g_object_ref (self));
- }
--
- static void
- join_show_prompt (UmAccountDialog *self,
-                   GError *error)
-@@ -892,6 +899,7 @@ enterprise_prepare (UmAccountDialog *self)
-         gtk_entry_set_text (GTK_ENTRY (self->enterprise_login), "");
-         gtk_entry_set_text (GTK_ENTRY (self->enterprise_password), "");
- }
-+#endif
- 
- static void
- dialog_validate (UmAccountDialog *self)
-@@ -902,9 +910,11 @@ dialog_validate (UmAccountDialog *self)
-         case UM_LOCAL:
-                 valid = local_validate (self);
-                 break;
-+#ifdef KERBEROS
-         case UM_ENTERPRISE:
-                 valid = enterprise_validate (self);
-                 break;
-+#endif
-         default:
-                 valid = FALSE;
-                 break;
-@@ -990,12 +1000,14 @@ on_local_toggle (GtkToggleButton *toggle,
-         mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_LOCAL);
- }
- 
-+#ifdef KERBEROS
- static void
- on_enterprise_toggle (GtkToggleButton *toggle,
-                       gpointer user_data)
- {
-         mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_ENTERPRISE);
- }
-+#endif
- 
- static void
- mode_init (UmAccountDialog *self,
-@@ -1007,15 +1019,18 @@ mode_init (UmAccountDialog *self,
- 
-         widget = (GtkWidget *) gtk_builder_get_object (builder, "local-area");
-         self->mode_areas[UM_LOCAL] = widget;
-+#ifdef KERBEROS
-         widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-area");
-         self->mode_areas[UM_ENTERPRISE] = widget;
--
-+#endif
-         widget = (GtkWidget *) gtk_builder_get_object (builder, "local-button");
-         g_signal_connect (widget, "toggled", G_CALLBACK (on_local_toggle), self);
-         self->mode_buttons[UM_LOCAL] = widget;
-+#ifdef KERBEROS
-         widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-button");
-         g_signal_connect (widget, "toggled", G_CALLBACK (on_enterprise_toggle), self);
-         self->mode_buttons[UM_ENTERPRISE] = widget;
-+#endif
- }
- 
- static void
-@@ -1073,8 +1088,10 @@ um_account_dialog_init (UmAccountDialog *self)
-         self->container_widget = widget;
- 
-         local_init (self, builder);
-+#ifdef KERBEROS
-         enterprise_init (self, builder);
-         join_init (self, builder);
-+#endif
-         mode_init (self, builder);
- 
-         g_object_unref (builder);
-@@ -1092,9 +1109,11 @@ um_account_dialog_response (GtkDialog *dialog,
-                 case UM_LOCAL:
-                         local_create_user (self);
-                         break;
-+#ifdef KERBEROS
-                 case UM_ENTERPRISE:
-                         enterprise_add_user (self);
-                         break;
-+#endif
-                 default:
-                         g_assert_not_reached ();
-                 }
-@@ -1115,6 +1134,7 @@ um_account_dialog_dispose (GObject *obj)
-         if (self->cancellable)
-                 g_cancellable_cancel (self->cancellable);
- 
-+#ifdef KERBEROS
-         if (self->realmd_watch)
-                 g_bus_unwatch_name (self->realmd_watch);
-         self->realmd_watch = 0;
-@@ -1126,7 +1146,7 @@ um_account_dialog_dispose (GObject *obj)
-                 g_object_unref (self->realm_manager);
-                 self->realm_manager = NULL;
-         }
--
-+#endif
-         G_OBJECT_CLASS (um_account_dialog_parent_class)->dispose (obj);
- }
- 
-@@ -1179,7 +1199,9 @@ um_account_dialog_show (UmAccountDialog     *self,
-         self->cancellable = g_cancellable_new ();
- 
-         local_prepare (self);
-+#ifdef KERBEROS
-         enterprise_prepare (self);
-+#endif
-         mode_change (self, UM_LOCAL);
-         dialog_validate (self);
- 
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
-index 59d57b3..d3390f4 100644
---- a/panels/user-accounts/um-realm-manager.c
-+++ b/panels/user-accounts/um-realm-manager.c
-@@ -21,6 +21,7 @@
- 
- #include "config.h"
- 
-+#ifdef KERBEROS
- #include "um-realm-manager.h"
- 
- #include <krb5/krb5.h>
-@@ -899,3 +900,4 @@ um_realm_login_finish (GAsyncResult *result,
- 
-         return TRUE;
- }
-+#endif
--- 
-1.8.1.2
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional-r1.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional-r1.patch
deleted file mode 100644
index e7fe8dc8d776..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional-r1.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b3df2dd..6b10ce4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -143,13 +143,57 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
-                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
- PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
--PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
-+
-+build_online_accounts=false
-+AC_ARG_ENABLE(goa,
-+	AC_HELP_STRING([--disable-goa],
-+		[disable online accounts management panel]),
-+	[case "${enableval}" in
-+		yes) WANT_ONLINE_ACCOUNTS=yes ;;
-+		no) WANT_ONLINE_ACCOUNTS=no ;;
-+		*) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
-+	esac],
-+	[WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
-+
-+if test x$WANT_ONLINE_ACCOUNTS = xyes; then
-+	PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
-+	build_online_accounts=true
-+fi
-+if test "x$build_online_accounts" = xtrue ; then
-+	AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
-+fi
-+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
-+
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
-                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
--                  colord >= $COLORD_REQUIRED_VERSION
--                  colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
--                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+
-+build_color=false
-+AC_ARG_ENABLE(color,
-+	AC_HELP_STRING([--disable-color],
-+		[disable color management panel]),
-+	[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(COLOR_PANEL, $COMMON_MODULES
-+		colord >= $COLORD_REQUIRED_VERSION
-+		colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-+		gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+	build_color=true
-+fi
-+if test "x$build_color" = xtrue ; then
-+	AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
-+AC_SUBST(COLOR_PANEL_CFLAGS)
-+AC_SUBST(COLOR_PANEL_LIBS)
-+
- PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
-                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
- PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
-@@ -210,9 +254,22 @@ else
- fi
- AM_CONDITIONAL(HAVE_MM_GLIB, test "x$have_libmm_glib" = "xyes")
- 
--# Check for gnome-bluetooth
--PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5,
--		  [have_bluetooth=yes], have_bluetooth=no)
-+have_bluetooth=no
-+AC_ARG_ENABLE(bluetooth,
-+	AC_HELP_STRING([--disable-bluetooth],
-+		[disable bluetooth management panel]),
-+	[case "${enableval}" in
-+		yes) WANT_BLUETOOTH=yes ;;
-+		no) WANT_BLUETOOTH=no ;;
-+		*) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
-+	esac],
-+	[WANT_BLUETOOTH=yes]) dnl Default value
-+
-+if test x$WANT_BLUETOOTH = xyes; then
-+	# Check for gnome-bluetooth
-+	PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5)
-+	have_bluetooth=yes
-+fi
- if test "x$have_bluetooth" = xyes ; then
- 	AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
- fi
-@@ -289,12 +346,23 @@ case $host_os in
-     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
-       have_wacom=no
-     else
--      PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
--                        gnome-settings-daemon >= $GSD_REQUIRED_VERSION
--                        xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
--                        gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
--      AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
--      have_wacom=yes
-+	AC_ARG_ENABLE(wacom,
-+		AC_HELP_STRING([--disable-wacom],
-+			[disable wacom management panel]),
-+		[case "${enableval}" in
-+			yes) WANT_WACOM=yes ;;
-+			no) WANT_WACOM=no ;;
-+			*) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
-+		esac],
-+		[WANT_WACOM=yes]) dnl Default value
-+
-+	if test x$WANT_WACOM = xyes; then
-+		PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
-+				gnome-settings-daemon >= $GSD_REQUIRED_VERSION
-+				xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-+				gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+		have_wacom=yes
-+	fi
-     fi
-     ;;
-   *)
-@@ -555,6 +623,11 @@ if test "x$have_bluetooth" = "xyes"; then
- else
- 	AC_MSG_NOTICE([   Bluetooth panel disabled])
- fi
-+if test "x$build_color" = "xtrue"; then
-+	AC_MSG_NOTICE([** colord (Color panel)])
-+else
-+	AC_MSG_NOTICE([   Color panel disabled])
-+fi
- if test "x$enable_cups" = "xyes"; then
- 	AC_MSG_NOTICE([** CUPS (Printers panel)])
- else
-@@ -565,11 +638,21 @@ if test "x$have_cheese" = "xyes"; then
- else
- 	AC_MSG_NOTICE([   Users panel webcam support disabled])
- fi
-+if test "x$build_online_accounts" = "xtrue"; then
-+	AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
-+else
-+	AC_MSG_NOTICE([   Online Accounts panel disabled])
-+fi
- if test "x$with_libsocialweb" = "xyes"; then
- 	AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])
- else
- 	AC_MSG_NOTICE([   Background panel Flickr support disabled])
- fi
-+if test "x$build_wacom" = "xtrue"; then
-+	AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
-+else
-+	AC_MSG_NOTICE([   Wacom Graphics Tablet panel disabled])
-+fi
- if test "x$have_wacom" = "xyes"; then
- 	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
- else
-diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 9961c25..0c54622 100644
---- a/panels/Makefile.am
-+++ b/panels/Makefile.am
-@@ -2,11 +2,9 @@ SUBDIRS= \
- 	common \
- 	background \
- 	power \
--	color \
- 	display \
- 	mouse \
- 	notifications \
--	online-accounts \
- 	region \
- 	info \
- 	sound \
-@@ -18,6 +16,10 @@ SUBDIRS= \
- 	privacy \
- 	sharing
- 
-+if BUILD_COLOR
-+SUBDIRS += color
-+endif
-+
- if BUILD_WACOM
- SUBDIRS += wacom
- endif
-@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
- SUBDIRS += bluetooth
- endif
- 
-+if BUILD_ONLINE_ACCOUNTS
-+SUBDIRS += online-accounts
-+endif
-+
- -include $(top_srcdir)/git.mk
-diff --git a/shell/Makefile.am b/shell/Makefile.am
-index f9f9070..094aca1 100644
---- a/shell/Makefile.am
-+++ b/shell/Makefile.am
-@@ -51,14 +51,12 @@ gnome_control_center_LDADD =						\
- 	$(top_builddir)/libgd/libgd.la					\
- 	$(top_builddir)/panels/common/liblanguage.la			\
- 	$(top_builddir)/panels/background/libbackground.la		\
--	$(top_builddir)/panels/color/libcolor.la			\
- 	$(top_builddir)/panels/datetime/libdate_time.la			\
- 	$(top_builddir)/panels/display/libdisplay.la			\
- 	$(top_builddir)/panels/info/libinfo.la				\
- 	$(top_builddir)/panels/keyboard/libkeyboard.la			\
- 	$(top_builddir)/panels/mouse/libmouse-properties.la		\
- 	$(top_builddir)/panels/notifications/libnotifications.la	\
--	$(top_builddir)/panels/online-accounts/libonline-accounts.la	\
- 	$(top_builddir)/panels/power/libpower.la			\
- 	$(top_builddir)/panels/privacy/libprivacy.la			\
- 	$(top_builddir)/panels/region/libregion.la			\
-@@ -84,6 +82,14 @@ if BUILD_BLUETOOTH
- gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
- endif
- 
-+if BUILD_COLOR
-+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
-+endif
-+
-+if BUILD_ONLINE_ACCOUNTS
-+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
-+endif
-+
- AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
- 
- sysdir = $(datadir)/applications
-diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
-index 20a5262..1cef85d 100644
---- a/shell/cc-panel-loader.c
-+++ b/shell/cc-panel-loader.c
-@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
- #ifdef BUILD_BLUETOOTH
- extern GType cc_bluetooth_panel_get_type (void);
- #endif /* BUILD_BLUETOOTH */
-+#ifdef BUILD_COLOR
- extern GType cc_color_panel_get_type (void);
-+#endif /* BUILD_COLOR */
- extern GType cc_date_time_panel_get_type (void);
- extern GType cc_display_panel_get_type (void);
- extern GType cc_info_panel_get_type (void);
-@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
- extern GType cc_network_panel_get_type (void);
- #endif /* BUILD_NETWORK */
- extern GType cc_notifications_panel_get_type (void);
-+#ifdef BUILD_ONLINE_ACCOUNTS
- extern GType cc_goa_panel_get_type (void);
-+#endif /* BUILD_ONLINE_ACCOUNTS */
- extern GType cc_power_panel_get_type (void);
- #ifdef BUILD_PRINTERS
- extern GType cc_printers_panel_get_type (void);
-@@ -77,7 +81,9 @@ static struct {
- #ifdef BUILD_BLUETOOTH
-   PANEL_TYPE("bluetooth",        cc_bluetooth_panel_get_type    ),
- #endif
-+#ifdef BUILD_COLOR
-   PANEL_TYPE("color",            cc_color_panel_get_type        ),
-+#endif
-   PANEL_TYPE("datetime",         cc_date_time_panel_get_type    ),
-   PANEL_TYPE("display",          cc_display_panel_get_type      ),
-   PANEL_TYPE("info",             cc_info_panel_get_type         ),
-@@ -87,7 +93,9 @@ static struct {
-   PANEL_TYPE("network",          cc_network_panel_get_type      ),
- #endif
-   PANEL_TYPE("notifications",    cc_notifications_panel_get_type),
-+#ifdef BUILD_ONLINE_ACCOUNTS
-   PANEL_TYPE("online-accounts",  cc_goa_panel_get_type          ),
-+#endif
-   PANEL_TYPE("power",            cc_power_panel_get_type        ),
- #ifdef BUILD_PRINTERS
-   PANEL_TYPE("printers",         cc_printers_panel_get_type     ),
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.1.5-optional-modemmanager.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.1.5-optional-modemmanager.patch
deleted file mode 100644
index cf40dca5004a..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.1.5-optional-modemmanager.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- gnome-control-center-3.8.1.5-orig/configure.ac	2013-05-06 18:32:26.000000000 +0200
-+++ gnome-control-center-3.8.1.5-dev/configure.ac	2013-05-11 22:57:47.955153458 +0200
-@@ -200,8 +200,25 @@
- fi
- 
- # Check for libmm-glib for ModemManager1 support
--PKG_CHECK_MODULES(MM_GLIB, mm-glib,
--                  [have_libmm_glib=yes], have_libmm_glib=no)
-+build_modemmanager=false
-+AC_ARG_ENABLE(modemmanager,
-+	AC_HELP_STRING([--disable-modemmanager],
-+		[disable modemmanager support]),
-+	[case "${enableval}" in
-+		yes) WANT_MODEMMANAGER=yes ;;
-+		no)  WANT_MODEMMANAGER=no ;;
-+		*) AC_MSG_ERROR(bad value ${enableval} for --disable-modemmanager) ;;
-+	esac],
-+	[WANT_MODEMMANAGER=no]) dnl Default value
-+
-+if test "x$WANT_MODEMMANAGER" = xyes ; then
-+	PKG_CHECK_MODULES(MM_GLIB, mm-glib,
-+                  [have_libmm_glib=yes],
-+		  AC_MSG_ERROR(No ModemManager1 support (libmm-glib) not found))
-+else
-+	have_libmm_glib=no
-+fi
-+
- if test "x$have_libmm_glib" = xno ; then
-   AC_MSG_WARN(*** Network panel will not be built with ModemManager1 support (libmm-glib not found) ***)
- else
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.4-optional-kerberos.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.4-optional-kerberos.patch
deleted file mode 100644
index 16c5b42e5c91..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.4-optional-kerberos.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From fd99663ac20c7c09517a316197f16fc1e2564d1b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 28 Jul 2013 14:23:39 -0400
-Subject: [PATCH] Make kerberos optional
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686840
----
- configure.ac                            | 24 +++++++++++++++---------
- panels/user-accounts/um-realm-manager.c |  9 +++++++++
- 2 files changed, 24 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0c0098c..7d09daf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -312,16 +312,22 @@ esac
- AM_CONDITIONAL(BUILD_WACOM, [test x"$have_wacom" = x"yes"])
- 
- # Kerberos kerberos support
--AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
--if test "$KRB5_CONFIG" = "no"; then
--  AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
--fi
--
--AC_MSG_CHECKING(for krb5 libraries and flags)
--KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
--KRB5_LIBS="`$KRB5_CONFIG --libs`"
--AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+AC_ARG_ENABLE([kerberos],
-+              AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
-+              [enable_kerberos=yes])
-+
-+if test x"$enable_kerberos" != x"no" ; then
-+    AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
-+    if test "$KRB5_CONFIG" = "no"; then
-+      AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
-+    fi
- 
-+    AC_MSG_CHECKING(for krb5 libraries and flags)
-+    KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
-+    KRB5_LIBS="`$KRB5_CONFIG --libs`"
-+    AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+    AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
-+fi
- AC_SUBST(KRB5_CFLAGS)
- AC_SUBST(KRB5_LIBS)
- 
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
-index 1fd41ad..ce0988e 100644
---- a/panels/user-accounts/um-realm-manager.c
-+++ b/panels/user-accounts/um-realm-manager.c
-@@ -23,7 +23,9 @@
- 
- #include "um-realm-manager.h"
- 
-+#ifdef HAVE_KERBEROS
- #include <krb5/krb5.h>
-+#endif
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -697,6 +699,7 @@ login_closure_free (gpointer data)
-         g_slice_free (LoginClosure, login);
- }
- 
-+#ifdef HAVE_KERBEROS
- static krb5_error_code
- login_perform_kinit (krb5_context k5,
-                      const gchar *realm,
-@@ -760,12 +763,14 @@ login_perform_kinit (krb5_context k5,
- 
-         return code;
- }
-+#endif /* HAVE_KERBEROS */
- 
- static void
- kinit_thread_func (GSimpleAsyncResult *async,
-                    GObject *object,
-                    GCancellable *cancellable)
- {
-+#ifdef HAVE_KERBEROS
-         LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
-         krb5_context k5 = NULL;
-         krb5_error_code code;
-@@ -843,6 +848,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
- 
-         if (k5)
-                 krb5_free_context (k5);
-+#else /* HAVE_KERBEROS */
-+        g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
-+                                         _("gnome-control-center was built without kerberos support"));
-+#endif
- }
- 
- void
--- 
-1.8.3.2
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking.patch
new file mode 100644
index 000000000000..aac9c529b4ca
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.6-flickr-linking.patch
@@ -0,0 +1,22 @@
+diff -burN gnome-control-center-3.10.1/panels/background/Makefile.am gnome-control-center-3.10.1.new/panels/background/Makefile.am
+--- gnome-control-center-3.10.1/panels/background/Makefile.am	2013-10-11 06:19:22.000000000 -0500
++++ gnome-control-center-3.10.1.new/panels/background/Makefile.am	2013-10-24 13:38:07.801957723 -0500
+@@ -38,7 +38,9 @@
+ 	bg-wallpapers-source.c		\
+ 	bg-wallpapers-source.h		\
+ 	bg-colors-source.c		\
+-	bg-colors-source.h
++	bg-colors-source.h		\
++	bg-flickr-source.c		\
++	bg-flickr-source.h
+ 
+ libbackground_la_SOURCES =		\
+ 	cc-background-panel.c		\
+@@ -47,6 +49,7 @@
+ libbackground_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) libbackground-chooser.la
+ 
+ if WITH_LIBSOCIALWEB
++libbackground_chooser_la_LIBADD = $(SOCIALWEB_LIBS)
+ libbackground_la_SOURCES += bg-flickr-source.c bg-flickr-source.h
+ INCLUDES += $(SOCIALWEB_CFLAGS)
+ libbackground_la_LIBADD += $(SOCIALWEB_LIBS)
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild
deleted file mode 100644
index 742ced54044e..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild
+++ /dev/null
@@ -1,148 +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-control-center/gnome-control-center-3.6.3-r1.ebuild,v 1.8 2013/02/02 22:33:47 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="GNOME Desktop Configuration Tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos +networkmanager +socialweb systemd v4l"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
-#
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.5.13:3
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	>=gnome-base/gnome-desktop-3.5.91:3=
-	>=gnome-base/gnome-settings-daemon-3.6[colord?,policykit]
-	>=gnome-base/libgnomekbd-2.91.91
-
-	app-text/iso-codes
-	dev-libs/libpwquality
-	dev-libs/libxml2:2
-	gnome-base/gnome-menus:3
-	gnome-base/libgtop:2
-	media-libs/fontconfig
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.9.1
-	>=x11-libs/libnotify-0.7.3
-
-	x11-apps/xmodmap
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= )
-	colord? ( >=x11-misc/colord-0.1.8 )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
-	i18n? ( >=app-i18n/ibus-1.4.99 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.6
-		>=x11-libs/libXi-1.2 )
-	kerberos? ( virtual/krb5 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-0.9.1.90
-		>=net-misc/networkmanager-0.8.997 )
-	socialweb? ( net-libs/libsocialweb )
-	systemd? ( >=sys-apps/systemd-31 )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-settings-daemon[input_devices_wacom?]
-	sys-apps/accountsservice
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		>=app-admin/system-config-printer-gnome-1.3.5
-		net-print/cups-pk-helper )
-	!systemd? (
-		app-admin/openrc-settingsd
-		sys-auth/consolekit )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	cups? ( sys-apps/sed )
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Make some panels optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.5.91-optional-bt-colord-goa-wacom.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=686840
-	epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch"
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch"
-	# Needed for g-c-c 3.6.3 and PulseAudio >2.1. Remove in 3.6.4.
-	epatch "${FILESDIR}/${P}-pulseaudio-3-fix.patch"
-	eautoreconf
-
-	gnome2_src_prepare
-
-	# panels/datetime/Makefile.am gets touched as a result of something in our
-	# src_prepare(). We need to touch timedated{c,h} to prevent them from being
-	# regenerated (bug #415901)
-	[[ -f panels/datetime/timedated.h ]] && touch panels/datetime/timedated.h
-	[[ -f panels/datetime/timedated.c ]] && touch panels/datetime/timedated.c
-}
-
-src_configure() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-static
-		--enable-documentation
-		$(use_enable bluetooth)
-		$(use_enable colord color)
-		$(use_enable cups)
-		$(use_enable gnome-online-accounts goa)
-		$(use_enable i18n ibus)
-		$(use_enable input_devices_wacom wacom)
-		$(use_with socialweb libsocialweb)
-		$(use_enable systemd)
-		$(use_with v4l cheese)"
-	# XXX: $(use_with kerberos) # for 3.7.x
-	if ! use kerberos; then
-		G2CONF+=" KRB5_CONFIG=$(type -P true)"
-	fi
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	gnome2_src_configure
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild
index 4397416df6d3..72104a39bb10 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.8.5.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.8.6.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-control-center/gnome-control-center-3.8.5.ebuild,v 1.2 2013/09/22 22:57:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.8.6.ebuild,v 1.1 2013/11/10 08:59:08 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -121,19 +121,18 @@ src_prepare() {
 	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
 		shell/Makefile.am || die "sed completiondir failed"
 
-	# Make some panels optional; requires eautoreconf
-	# https://bugzilla.gnome.org/697478
-	epatch "${FILESDIR}/${PN}-3.8.0-optional-r1.patch"
-
-	# https://bugzilla.gnome.org/686840
-	epatch "${FILESDIR}/${PN}-3.8.4-optional-kerberos.patch"
+	# Make some panels and dependencies optional; requires eautoreconf
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	epatch "${FILESDIR}/${PN}-3.8.5-optional.patch"
 
 	# Fix some absolute paths to be appropriate for Gentoo
 	epatch "${FILESDIR}/${PN}-3.8.0-paths-makefiles.patch"
 	epatch "${FILESDIR}/${PN}-3.8.0-paths.patch"
 
-	# Make modemmanager optional, bug 463852, upstream bug #700145
-	epatch "${FILESDIR}/${PN}-3.8.1.5-optional-modemmanager.patch"
+	# Fix linking, upstream bug #710829
+	epatch "${FILESDIR}"/${PN}-3.8.6-flickr-linking.patch
+
+	epatch_user
 
 	# top-level configure.ac does not use AC_CONFIG_SUBDIRS, so we need this to
 	# avoid libtoolize "We've already been run in this tree" warning, bug #484988
@@ -144,7 +143,6 @@ src_prepare() {
 		popd > /dev/null
 	done
 	elibtoolize --force
-	epatch_user
 
 	# panels/datetime/Makefile.am gets touched as a result of something in our
 	# src_prepare(). We need to touch timedated{c,h} to prevent them from being
@@ -153,6 +151,8 @@ src_prepare() {
 	# (https://bugzilla.gnome.org/704822)
 	[[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
 	[[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
+
+	gnome2_src_prepare
 }
 
 src_configure() {