[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/

[Mart Raudsepp]

commit:     bb44e2b116d7e9e72759664e28fbed14ceb17a68
Author:     Timo Tambet <ttambet <AT> gmail <DOT> com>
AuthorDate: Sun Feb 26 00:33:21 2017 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Mar  8 12:11:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb44e2b1

gnome-base/gnome-control-center: bump to 3.23.91

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 gnome-base/gnome-control-center/Manifest           |   1 +
 ...gnome-control-center-3.23.91-gentoo-paths.patch | 107 ++++
 ...nter-3.23.91-make-networkmanager-optional.patch |  69 +++
 .../gnome-control-center-3.23.91-optional.patch    | 556 +++++++++++++++++++++
 .../gnome-control-center-3.23.91.ebuild            | 158 ++++++
 5 files changed, 891 insertions(+)

diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index d517a636010..d898426541d 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-control-center-3.20.2.tar.xz 7103716 SHA256 ae380d9cb7a2c6f7f336718606274cd87021cbbcdf828ec67b1a420a2605776e SHA512 d68bccf16e5e854db4cd8dbb7abb64c40ad1b7370a8c71ff5e8790ef6f2eeb19cd6b2d41f5506bb4b8d956f1d65f54afb26f5d2c4c87adde6561079f1477ff41 WHIRLPOOL ccb4a35211d2fa3adca34b2897a09687bfc854f5d89a512f80d43f46d822b15f586424983df5e746771e12df36115c5b9b7eee220582c4b7042d68e48c4ccf17
 DIST gnome-control-center-3.22.1.tar.xz 7206136 SHA256 5d69295bc43176392d65b3bdbe60eb85cdcac95b1ef76b86933f3ba9cf48091a SHA512 7c1bc17844f1b9ef2ca2b94fb36c3a64cbe88561cc2388e5fa26405dff73f3033dea49bf1aab8a85ee9d9680a8816913a0339855a5b09a8033cdaef5ebbb5c63 WHIRLPOOL 5f4cc4a6c75956a5bf05000d76a0b040b4fd9d6e0b416eaa2e12522f2dcde3506501022432ca8436e3435782ee537e560a30642d330ab66175f4ea44100f287b
+DIST gnome-control-center-3.23.91.tar.xz 7300216 SHA256 d8e0cfcfa43223b429aa22c7bbc47475f4763c312407a2e8256db81714c946ac SHA512 b795536afafbf87d2ecdde028651018e2c8129a89cd91077dd0a4cbeb96c2608ff7f401a2dfdf68f7b7fff4a7dfe0b95f2ebb4c6e3039d434d14850c0a76a8a0 WHIRLPOOL 1da42a542f34f6d6df626b9b1762871db5bc2679bdc9fc350ea6171f30e153a95e3c077164769a0bda2bd912af50bc695ebb25f717c127d1827316c69414d52f

diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-gentoo-paths.patch
new file mode 100644
index 00000000000..8bd0169df46
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-gentoo-paths.patch
@@ -0,0 +1,107 @@
+From d646361528717fb0a9134394c62cc2d729b69d39 Mon Sep 17 00:00:00 2001
+From: Timo Tambet <ttambet@×××××.com>
+Date: Sun, 26 Feb 2017 01:04:05 +0200
+Subject: [PATCH 4/4] Fix some absolute paths to be appropriate for Gentoo
+
+Signed-off-by: Gilles Dartiguelongue <eva@g.o>
+Signed-off-by: Alexandre Rostovtsev <tetromino@g.o>
+[Updated for 3.23.90; printer panel /usr/share path went away with print testpage button]
+Signed-off-by: Timo Tambet <ttambet@×××××.com>
+---
+ panels/datetime/Makefile.am      | 1 +
+ panels/datetime/test-endianess.c | 4 ++--
+ panels/datetime/test-timezone.c  | 2 +-
+ panels/datetime/tz.h             | 4 ++--
+ panels/printers/Makefile.am      | 3 +++
+ panels/printers/pp-host.c        | 2 +-
+ 6 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
+index a003f0bce..c43062e98 100644
+--- a/panels/datetime/Makefile.am
++++ b/panels/datetime/Makefile.am
+@@ -23,6 +23,7 @@ AM_CPPFLAGS =						\
+ 	$(DATETIME_PANEL_CFLAGS)			\
+ 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+ 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
++	-DREALDATADIR="\"$(datadir)\""                  \
+ 	$(NULL)
+ 
+ # test-timezone is still too noisy
+diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
+index 06b26131b..eb52bb637 100644
+--- a/panels/datetime/test-endianess.c
++++ b/panels/datetime/test-endianess.c
+@@ -26,11 +26,11 @@ test_endianess (void)
+ 	GDir *dir;
+ 	const char *name;
+ 
+-	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) {
+ 			g_assert_not_reached ();
+ 		}
+diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
+index db5c0307e..7ef5cef37 100644
+--- a/panels/datetime/test-timezone.c
++++ b/panels/datetime/test-timezone.c
+@@ -2,7 +2,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,
+diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
+index 93905b3ab..1ba918c74 100644
+--- a/panels/datetime/tz.h
++++ b/panels/datetime/tz.h
+@@ -28,9 +28,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;
+diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
+index 575cda38c..d5da0bf68 100644
+--- a/panels/printers/Makefile.am
++++ b/panels/printers/Makefile.am
+@@ -9,6 +9,9 @@ AM_CPPFLAGS = 						\
+ 	-I$(top_srcdir)/shell/				\
+ 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+ 	-DTEST_SRCDIR=\""$(srcdir)/"\"			\
++	-DREALDATADIR="\"$(datadir)\""                  \
++	-DPREFIX="\"$(prefix)\""                        \
++	-DLIBEXECDIR="\"$(libexecdir)\""                \
+ 	$(NULL)
+ 
+ noinst_LTLIBRARIES = libprinters.la
+diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
+index 8af77e9a9..bb6df7880 100644
+--- a/panels/printers/pp-host.c
++++ b/panels/printers/pp-host.c
+@@ -267,7 +267,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res,
+   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 */
+-- 
+2.11.1
+

diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-make-networkmanager-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-make-networkmanager-optional.patch
new file mode 100644
index 00000000000..a871e4628cf
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-make-networkmanager-optional.patch
@@ -0,0 +1,69 @@
+From ef596aeb01aac8d85fd5861cff360b93cc16ef16 Mon Sep 17 00:00:00 2001
+From: Timo Tambet <ttambet@×××××.com>
+Date: Sun, 26 Feb 2017 00:37:06 +0200
+Subject: [PATCH 3/4] Make network panel optional
+
+Signed-off-by: Gilles Dartiguelongue <eva@g.o>
+[Updated for 3.23.90]
+Signed-off-by: Timo Tambet <ttambet@×××××.com>
+---
+ configure.ac | 43 +++++++++++++++++++++++++------------------
+ 1 file changed, 25 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index edbf657f4..248db379e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -275,24 +275,31 @@ linux_usb_error_or_warn()
+ 	esac
+ }
+ 
+-PKG_CHECK_MODULES(NETWORK_MANAGER,
+-                  libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
+-                  libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
+-                  mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
+-                  [have_networkmanager=yes], have_networkmanager=no)
+-if test "x$have_networkmanager" = xno ; then
+-        linux_error_or_warn "*** Network panel will not be built (NetworkManager or ModemManager not found) ***"
+-else
+-	AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
+-fi
+-AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
+-if test x${have_networkmanager} = xyes; then
+-  AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
+-  NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
+-  NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
+-  AC_SUBST(NM_VPN_CONFIG_DIR)
+-  AC_SUBST(NM_VPN_MODULE_DIR)
+-fi
++AC_ARG_ENABLE([networkmanager],
++              AS_HELP_STRING([--disable-networkmanager], [Disable network panel]),
++              [],
++              [enable_networkmanager=auto])
++AS_IF([test "$enable_networkmanager" != "no"],
++      [
++        PKG_CHECK_MODULES(NETWORK_MANAGER,
++                          libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
++                          libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
++                          mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
++                          [have_networkmanager=yes], [have_networkmanager=no])
++
++        AS_IF([test "$have_networkmanager" = "no"],
++              [
++                AC_MSG_WARN([*** Network panel will not be built (NetworkManager or ModemManager not found) ***])
++              ], [
++                AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
++                AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
++                NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
++                NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
++                AC_SUBST([NM_VPN_CONFIG_DIR])
++                AC_SUBST([NM_VPN_MODULE_DIR])
++              ])
++      ])
++AM_CONDITIONAL(BUILD_NETWORK, [test "$have_networkmanager" = "yes"])
+ 
+ # Check for power panel
+ if test x${have_networkmanager} = xyes; then
+-- 
+2.11.1
+

diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-optional.patch
new file mode 100644
index 00000000000..f4bd22245d9
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-optional.patch
@@ -0,0 +1,556 @@
+From 5ad997775501a1172846bccdf56aad6c9c4bcb1f Mon Sep 17 00:00:00 2001
+From: Timo Tambet <ttambet@×××××.com>
+Date: Sat, 25 Feb 2017 23:29:10 +0200
+Subject: [PATCH 1/4] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Signed-off-by: Ole Reifschneider <tranquility@g.o>
+Signed-off-by: Gilles Dartiguelongue <eva@g.o>
+Signed-off-by: Alexandre Rostovtsev <tetromino@g.o>
+---
+ configure.ac                            | 171 ++++++++++++++++++++++++--------
+ panels/Makefile.am                      |  10 +-
+ panels/background/Makefile.am           |   8 +-
+ panels/background/bg-pictures-source.c  |  20 ++++
+ panels/power/cc-power-panel.c           |   2 +-
+ panels/user-accounts/um-realm-manager.c |   9 ++
+ shell/Makefile.am                       |  10 +-
+ shell/cc-panel-loader.c                 |   8 ++
+ 8 files changed, 188 insertions(+), 50 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 12a8adee6..022635d34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -120,10 +120,6 @@ LIBGD_INIT([_view-common static])
+ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
+ PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
+ PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
+-                  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
+-                  goa-1.0 >= $GOA_REQUIRED_VERSION
+-                  grilo-0.3 >= $GRILO_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
+                   gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -141,12 +137,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+-                  colord >= $COLORD_REQUIRED_VERSION
+-                  colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+-                  libsoup-2.4
+-                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++
++build_online_accounts=no
++background_online_accounts=
++AC_ARG_ENABLE([goa],
++              AS_HELP_STRING([--disable-goa],
++                             [disable online accounts management panel]),
++              [],
++              [enable_goa=auto])
++
++AS_IF([test "$enable_goa" != "no"],
++      [PKG_CHECK_MODULES([ONLINE_ACCOUNTS_PANEL],
++                         [$COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION],
++                         [
++                           AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
++                           build_online_accounts=yes
++                           background_goa_dependencies="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.3 >= $GRILO_REQUIRED_VERSION"
++                         ], [
++                           AS_IF([test "$enable_goa" = "yes"],
++                                 [AC_MSG_ERROR([gnome-online-accounts support requested but not found])])
++                         ])
++       ])
++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "$build_online_accounts" = "yes")
++
++PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
++                  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
++                  $background_goa_dependencies)
++
++build_color=no
++AC_ARG_ENABLE([color],
++              AS_HELP_STRING([--disable-color],
++                             [disable color management panel]),
++              [],
++              [enable_color=auto])
++
++AS_IF([test "$enable_color" != "no"],
++      [PKG_CHECK_MODULES([COLOR_PANEL],
++                         [
++                           $COMMON_MODULES
++                           colord >= $COLORD_REQUIRED_VERSION
++                           colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++                           libsoup-2.4
++                           gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
++                         ], [
++                           AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++                           build_color=yes
++                         ], [
++                           AS_IF([test "$enable_color" = "yes"],
++                                 [AC_MSG_ERROR([colord support requested but not found])])
++                         ])
++      ])
++AM_CONDITIONAL(BUILD_COLOR, test "$build_color" = "yes")
++
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+                   smbclient)
+@@ -254,17 +296,27 @@ else
+ fi
+ 
+ # Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2,
+-		  [have_bluetooth=yes], have_bluetooth=no)
+-if test "x$have_bluetooth" = xyes ; then
+-	AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
+-else
+-	linux_usb_error_or_warn "*** Bluetooth panel will not be built"
+-fi
+-AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
+-if test x${have_bluetooth} = xyes; then
+-  AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available])
+-fi
++have_bluetooth=no
++AC_ARG_ENABLE([bluetooth],
++              AS_HELP_STRING([--disable-bluetooth],
++                             [disable bluetooth management panel]),
++              [],
++              [enable_bluetooth=auto])
++
++AS_IF([test "$enable_bluetooth" = "yes"],
++      [PKG_CHECK_MODULES([BLUETOOTH],
++                         [$COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2],
++                         [
++                           AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
++                           have_bluetooth=yes
++                         ],
++                         [
++                           have_bluetooth=no
++                           AS_IF([test "$enable_bluetooth" = "yes"],
++                                 [AC_MSG_ERROR([bluetooth support requested but not found])])
++                         ])
++      ])
++AM_CONDITIONAL(BUILD_BLUETOOTH, [test "$have_bluetooth" = "yes"])
+ 
+ # Check for CUPS 1.4 or newer
+ AC_PROG_SED
+@@ -319,32 +371,52 @@ fi
+ AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
+ 
+ # Wacom
+-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
+-                  clutter-gtk-1.0
+-                  clutter-1.0 >= $CLUTTER_REQUIRED_VERSION,
+-                  [have_wacom=yes], [have_wacom=no])
++AC_ARG_ENABLE([wacom],
++              AS_HELP_STRING([--disable-wacom],
++                             [disable wacom management panel]),
++              [],
++              [enable_wacom=yes])
++AS_IF([test "x$enable_wacom" = "xyes"],
++      [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
++                           clutter-gtk-1.0
++                           clutter-1.0 >= $CLUTTER_REQUIRED_VERSION
++                         ], [
++                           have_wacom=yes
++                           AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
++                           AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++                         ], [
++                           have_wacom=no
++                           AC_MSG_ERROR([wacom support requested but not found])
++                         ])
++      ])
+ 
+-if test "x$have_wacom" = xyes ; then
+-	AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+-	AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
+-else
+-	linux_usb_error_or_warn "*** Wacom panel will not be built"
+-fi
+ AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
+ 
+ # 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])
++
++AS_IF([test "$enable_kerberos" != "no"],
++      [
++        AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
++
++        AS_IF([test "$KRB5_CONFIG" = "no"],
++              AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]))
++
++        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])
++      ])
+ 
+ AC_SUBST(KRB5_CFLAGS)
+ AC_SUBST(KRB5_LIBS)
+@@ -576,11 +648,24 @@ if test "x$have_bluetooth" = "xyes"; then
+ else
+ 	AC_MSG_NOTICE([   Bluetooth panel disabled])
+ fi
++
++if test "x$build_color" = "xyes"; then
++	AC_MSG_NOTICE([** colord (Color panel)])
++else
++	AC_MSG_NOTICE([   Color panel disabled])
++fi
++
++
+ if test "x$have_cheese" = "xyes"; then
+ 	AC_MSG_NOTICE([** Cheese (Users panel webcam support)])
+ else
+ 	AC_MSG_NOTICE([   Users panel webcam support disabled])
+ fi
++if test "x$build_online_accounts" = "xyes"; then
++       AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
++else
++       AC_MSG_NOTICE([   Online Accounts 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 507cd2f54..2806c4555 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 \
+@@ -19,6 +17,10 @@ SUBDIRS= \
+ 	sharing \
+ 	printers
+ 
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_WACOM
+ SUBDIRS += wacom
+ endif
+@@ -31,4 +33,8 @@ if BUILD_BLUETOOTH
+ SUBDIRS += bluetooth
+ endif
+ 
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
+ -include $(top_srcdir)/git.mk
+diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
+index ccb80172f..bde4cdf43 100644
+--- a/panels/background/Makefile.am
++++ b/panels/background/Makefile.am
+@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES =	\
+ 	$(BUILT_SOURCES)		\
+ 	cc-background-chooser-dialog.c	\
+ 	cc-background-chooser-dialog.h	\
+-	cc-background-grilo-miner.c	\
+-	cc-background-grilo-miner.h	\
+ 	cc-background-item.c		\
+ 	cc-background-item.h		\
+ 	cc-background-xml.c		\
+@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES =	\
+ 	bg-colors-source.c		\
+ 	bg-colors-source.h
+ 
++if BUILD_ONLINE_ACCOUNTS
++libbackground_chooser_la_SOURCES +=	\
++	cc-background-grilo-miner.c	\
++	cc-background-grilo-miner.h
++endif
++
+ libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
+ 
+ libbackground_la_SOURCES =		\
+diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
+index a33cee7f3..408359cba 100644
+--- a/panels/background/bg-pictures-source.c
++++ b/panels/background/bg-pictures-source.c
+@@ -23,13 +23,17 @@
+ 
+ #include "bg-pictures-source.h"
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include "cc-background-grilo-miner.h"
++#endif
+ #include "cc-background-item.h"
+ 
+ #include <string.h>
+ #include <cairo-gobject.h>
+ #include <gio/gio.h>
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include <grilo.h>
++#endif
+ #include <libgnome-desktop/gnome-desktop-thumbnail.h>
+ #include <gdesktop-enums.h>
+ 
+@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate
+ {
+   GCancellable *cancellable;
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+   CcBackgroundGriloMiner *grl_miner;
++#endif
+ 
+   GnomeDesktopThumbnailFactory *thumb_factory;
+ 
+@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object)
+       g_clear_object (&priv->cancellable);
+     }
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+   g_clear_object (&priv->grl_miner);
++#endif
+   g_clear_object (&priv->thumb_factory);
+ 
+   G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
+@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource     *bg_source,
+   gboolean needs_download;
+   gboolean retval = FALSE;
+   GFile *pictures_dir, *cache_dir;
++#ifdef BUILD_ONLINE_ACCOUNTS
+   GrlMedia *media;
++#else
++  gpointer media = NULL;
++#endif
+ 
+   /* find png and jpeg files */
+   if (!content_type)
+@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource     *bg_source,
+ 
+  read_file:
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+   media = g_object_get_data (G_OBJECT (file), "grl-media");
++#endif
+   if (media == NULL)
+     {
+       g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
+@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource     *bg_source,
+   return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
+ }
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static gboolean
+ add_single_file_from_media (BgPicturesSource *bg_source,
+                             GFile            *file,
+@@ -580,6 +595,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
+ 
+   return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ 
+ gboolean
+ bg_pictures_source_add (BgPicturesSource     *bg_source,
+@@ -923,6 +939,7 @@ monitor_path (BgPicturesSource *self,
+   return monitor;
+ }
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static void
+ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ {
+@@ -934,6 +951,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+   g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
+   add_single_file_from_media (self, file, media);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ 
+ static void
+ bg_pictures_source_init (BgPicturesSource *self)
+@@ -961,9 +979,11 @@ bg_pictures_source_init (BgPicturesSource *self)
+   priv->cache_dir_monitor = monitor_path (self, cache_path);
+   g_free (cache_path);
+ 
++#ifdef BUILD_ONLINE_ACCOUNTS
+   priv->grl_miner = cc_background_grilo_miner_new ();
+   g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
+   cc_background_grilo_miner_start (priv->grl_miner);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ 
+   priv->thumb_factory =
+     gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
+diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
+index db4e69a26..7677b58c4 100644
+--- a/panels/power/cc-power-panel.c
++++ b/panels/power/cc-power-panel.c
+@@ -1882,7 +1882,7 @@ add_power_saving_section (CcPowerPanel *self)
+                     G_CALLBACK (wifi_switch_changed), self);
+ #endif
+ 
+-#ifdef HAVE_BLUETOOTH
++#ifdef BUILD_BLUETOOTH
+   priv->bt_rfkill = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+ 						   G_DBUS_PROXY_FLAGS_NONE,
+ 						   NULL,
+diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
+index 26391486f..977dab1d6 100644
+--- a/panels/user-accounts/um-realm-manager.c
++++ b/panels/user-accounts/um-realm-manager.c
+@@ -22,7 +22,9 @@
+ 
+ #include "um-realm-manager.h"
+ 
++#ifdef HAVE_KERBEROS
+ #include <krb5/krb5.h>
++#endif
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -698,6 +700,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,
+@@ -761,12 +764,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;
+@@ -844,6 +849,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
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index 6af3199d8..f3e49c7d9 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -78,14 +78,12 @@ gnome_control_center_LDADD =						\
+ 	$(top_builddir)/panels/common/liblanguage.la			\
+ 	$(top_builddir)/panels/common/libdevice.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			\
+@@ -108,6 +106,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
++
+ gnome_control_center_alt_LDADD = 					\
+ 	$(gnome_control_center_LDADD)					\
+ 	alt/libshell_alt.la
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index 20ebb85d5..9104b45ba 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);
+ extern GType cc_printers_panel_get_type (void);
+ extern GType cc_privacy_panel_get_type (void);
+@@ -75,7 +79,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         ),
+@@ -85,7 +91,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        ),
+   PANEL_TYPE("printers",         cc_printers_panel_get_type     ),
+   PANEL_TYPE("privacy",          cc_privacy_panel_get_type      ),
+-- 
+2.11.1
+

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild
new file mode 100644
index 00000000000..c7cd92d87db
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord debug +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# 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
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+# udev could be made optional, only conditions gsd-device-panel
+# (mouse, keyboards, touchscreen, etc)
+# display panel requires colord
+# printer panel is not optional and not yet patched
+COMMON_DEPEND="
+	>=dev-libs/glib-2.44.0:2[dbus]
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.22.0:3[X,wayland?]
+	>=gnome-base/gsettings-desktop-schemas-3.21.4
+	>=gnome-base/gnome-desktop-3.21.2:3=
+	>=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit]
+	>=x11-misc/colord-0.1.34:0=
+
+	>=dev-libs/libpwquality-1.2.2
+	dev-libs/libxml2:2
+	gnome-base/libgtop:2=
+	media-libs/fontconfig
+	>=sys-apps/accountsservice-0.6.39
+
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-2[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.99:=
+
+	virtual/libgudev
+	x11-apps/xmodmap
+	x11-libs/cairo
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
+	colord? (
+		net-libs/libsoup:2.4
+		>=x11-misc/colord-0.1.34:0=
+		>=x11-libs/colord-gtk-0.1.24 )
+
+	>=net-print/cups-1.4[dbus]
+	>=net-fs/samba-4.0.0[client]
+
+	gnome-online-accounts? (
+		>=media-libs/grilo-0.3.0:0.3=
+		>=net-libs/gnome-online-accounts-3.21.5:= )
+	i18n? ( >=app-i18n/ibus-1.5.2 )
+	kerberos? ( app-crypt/mit-krb5 )
+	networkmanager? (
+		>=gnome-extra/nm-applet-1.2.0
+		>=net-misc/networkmanager-1.2.0:=[modemmanager]
+		>=net-misc/modemmanager-0.7.990 )
+	v4l? (
+		media-libs/clutter-gtk:1.0
+		>=media-video/cheese-3.5.91 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=media-libs/clutter-1.11.3:1.0
+		media-libs/clutter-gtk:1.0
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+#
+# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
+# Also we need newer driver versions to allow wacom and libinput drivers to
+# not collide
+RDEPEND="${COMMON_DEPEND}
+	|| ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
+	x11-themes/adwaita-icon-theme
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+	i18n? ( >=gnome-base/libgnomekbd-3 )
+	wayland? ( dev-libs/libinput )
+	!wayland? (
+		>=x11-drivers/xf86-input-libinput-0.19.0
+		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
+
+	!<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
+
+	gnome-base/gnome-common
+	sys-devel/autoconf-archive
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+#	sys-devel/autoconf-archive
+
+src_prepare() {
+	# Make some panels and dependencies optional; requires eautoreconf
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	eapply "${FILESDIR}"/${P}-optional.patch
+	eapply "${FILESDIR}"/${PN}-3.22.0-make-wayland-optional.patch
+	eapply "${FILESDIR}"/${P}-make-networkmanager-optional.patch
+
+	# Fix some absolute paths to be appropriate for Gentoo
+	eapply "${FILESDIR}"/${P}-gentoo-paths.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-update-mimedb \
+		--disable-static \
+		--enable-documentation \
+		$(use_enable bluetooth) \
+		$(use_enable colord color) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable i18n ibus) \
+		$(use_enable kerberos) \
+		$(use_enable networkmanager) \
+		$(use_with v4l cheese) \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable wayland)
+}
+
+src_install() {
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+}