gnome-base/gnome-control-center: bump to 3.24.2, make cups/smbclient optional, add back lost cups runtime deps

Package-Manager: Portage-2.3.5, Repoman-2.3.2

7 files changed, 285 insertions, 38 deletions

diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index c7f6289c178a..671574759fb5 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,2 +1,2 @@
 DIST gnome-control-center-3.22.2.tar.xz 7277380 SHA256 7512ff3e256c1d43a746752e90a8079d0b064aae35283cfe863e19706ce22f92 SHA512 a9ed72c47703fcbbd0d6f3301be7d5b3a8eff2f0c400bde19e14c5d013404fc5907765fb20af40022f7700547d06c02203a919b4db4c191f64f3ac20cb12626a WHIRLPOOL 393fa9d1752330ebac81215f35df5da6ed4b457cbc5ce56a5497191584266161c4ab0105b16535ef245be62aec27c6556fca2416ce7b91651b266f224592b686
-DIST gnome-control-center-3.23.91.tar.xz 7300216 SHA256 d8e0cfcfa43223b429aa22c7bbc47475f4763c312407a2e8256db81714c946ac SHA512 b795536afafbf87d2ecdde028651018e2c8129a89cd91077dd0a4cbeb96c2608ff7f401a2dfdf68f7b7fff4a7dfe0b95f2ebb4c6e3039d434d14850c0a76a8a0 WHIRLPOOL 1da42a542f34f6d6df626b9b1762871db5bc2679bdc9fc350ea6171f30e153a95e3c077164769a0bda2bd912af50bc695ebb25f717c127d1827316c69414d52f
+DIST gnome-control-center-3.24.2.tar.xz 7269112 SHA256 382a4b1bf54754c1f5f83adb1faeca2e9de70df5d3d85ac6b0fb192801518f2b SHA512 5041d4907cba0ea188663ad574ddaac6c341ec22b69f7a3d6332b8ae0a572fe33eb19eed758f3d593fe6224d793f2ecc3677584ebf0971f3ae145363a1769cc0 WHIRLPOOL 6e42ec6ac877eb19cc64d5d52106662a872cd4cba25bf0fb2f0fa4a4c1d82fc4149a52f7922e1e1e6dd005133cf54d5e154f75807da58d510e7d09610b41cb7b
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/3.24.2-gentoo-paths.patch
index 8bd0169df465..1c7f92783780 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-gentoo-paths.patch
+++ b/gnome-base/gnome-control-center/files/3.24.2-gentoo-paths.patch
@@ -1,7 +1,7 @@
-From d646361528717fb0a9134394c62cc2d729b69d39 Mon Sep 17 00:00:00 2001
+From 522dcaf9de0378394c4558961da99ddf0b8b87e7 Mon Sep 17 00:00:00 2001
 From: Timo Tambet <ttambet@gmail.com>
 Date: Sun, 26 Feb 2017 01:04:05 +0200
-Subject: [PATCH 4/4] Fix some absolute paths to be appropriate for Gentoo
+Subject: [PATCH 4/5] Fix some absolute paths to be appropriate for Gentoo
 
 Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
 Signed-off-by: Alexandre Rostovtsev <tetromino@gentoo.org>
@@ -17,7 +17,7 @@ Signed-off-by: Timo Tambet <ttambet@gmail.com>
  6 files changed, 10 insertions(+), 6 deletions(-)
 
 diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
-index a003f0bce..c43062e98 100644
+index a003f0b..c43062e 100644
 --- a/panels/datetime/Makefile.am
 +++ b/panels/datetime/Makefile.am
 @@ -23,6 +23,7 @@ AM_CPPFLAGS =						\
@@ -29,7 +29,7 @@ index a003f0bce..c43062e98 100644
  
  # test-timezone is still too noisy
 diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
-index 06b26131b..eb52bb637 100644
+index 06b2613..eb52bb6 100644
 --- a/panels/datetime/test-endianess.c
 +++ b/panels/datetime/test-endianess.c
 @@ -26,11 +26,11 @@ test_endianess (void)
@@ -47,7 +47,7 @@ index 06b26131b..eb52bb637 100644
  			g_assert_not_reached ();
  		}
 diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
-index db5c0307e..7ef5cef37 100644
+index db5c030..7ef5cef 100644
 --- a/panels/datetime/test-timezone.c
 +++ b/panels/datetime/test-timezone.c
 @@ -2,7 +2,7 @@
@@ -60,7 +60,7 @@ index db5c0307e..7ef5cef37 100644
  static GList *
  get_timezone_list (GList *tzs,
 diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
-index 93905b3ab..1ba918c74 100644
+index 93905b3..1ba918c 100644
 --- a/panels/datetime/tz.h
 +++ b/panels/datetime/tz.h
 @@ -28,9 +28,9 @@
@@ -76,7 +76,7 @@ index 93905b3ab..1ba918c74 100644
  
  typedef struct _TzDB TzDB;
 diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
-index 575cda38c..d5da0bf68 100644
+index 575cda3..d5da0bf 100644
 --- a/panels/printers/Makefile.am
 +++ b/panels/printers/Makefile.am
 @@ -9,6 +9,9 @@ AM_CPPFLAGS = 						\
@@ -90,7 +90,7 @@ index 575cda38c..d5da0bf68 100644
  
  noinst_LTLIBRARIES = libprinters.la
 diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
-index 8af77e9a9..bb6df7880 100644
+index 8af77e9..bb6df78 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,
@@ -103,5 +103,5 @@ index 8af77e9a9..bb6df7880 100644
  
    /* Use SNMP to get printer's informations */
 -- 
-2.11.1
+2.10.2
 
diff --git a/gnome-base/gnome-control-center/files/3.24.2-optional-cups.patch b/gnome-base/gnome-control-center/files/3.24.2-optional-cups.patch
new file mode 100644
index 000000000000..c634d77a53cb
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.24.2-optional-cups.patch
@@ -0,0 +1,196 @@
+From f76cc5a97dfa94b03abb878767c8dc15b4461685 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 14 Jul 2017 05:07:42 +0300
+Subject: [PATCH 5/5] Make printers panel optional
+
+---
+ configure.ac            | 96 ++++++++++++++++++++++++++++++-------------------
+ panels/Makefile.am      |  7 ++--
+ shell/Makefile.am       |  7 ++--
+ shell/cc-panel-loader.c |  4 +++
+ 4 files changed, 73 insertions(+), 41 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4af24d0..7629621 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -189,9 +189,59 @@ AS_IF([test "$enable_color" != "no"],
+       ])
+ AM_CONDITIONAL(BUILD_COLOR, test "$build_color" = "yes")
+ 
+-PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+-                  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+-                  smbclient)
++# Check for CUPS 1.4 or newer
++build_printers=no
++AC_PROG_SED
++
++AC_ARG_ENABLE([cups],
++        AS_HELP_STRING([--disable-cups], [disable printer management panel]),
++        [],
++        enable_cups=yes
++)
++
++AS_IF([test "x$enable_cups" != "xno"],
++      [
++        PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
++                          polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
++                          smbclient)
++
++        AC_PATH_PROG(CUPS_CONFIG, cups-config)
++
++        if test x$CUPS_CONFIG = x; then
++          AC_MSG_ERROR([cups-config not found])
++        fi
++
++        CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
++        CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
++        CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
++
++        AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
++                         AC_MSG_ERROR([CUPS headers not found]))
++
++        if ! test $CUPS_API_MAJOR -gt 1 -o \
++                  $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then
++          AC_MSG_ERROR([CUPS 1.4 or newer not found])
++        fi
++
++        # https://bugzilla.gnome.org/show_bug.cgi?id=696766
++        CUPS_CPPFLAGS=""
++        if test $CUPS_API_MAJOR -gt 1 -o \
++                $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then
++           CUPS_CPPFLAGS=-D_PPD_DEPRECATED=""
++        fi
++
++        CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'`
++        CUPS_LIBS=`$CUPS_CONFIG --libs`
++
++        AC_SUBST(CUPS_CPPFLAGS)
++        AC_SUBST(CUPS_CFLAGS)
++        AC_SUBST(CUPS_LIBS)
++        build_printers=yes
++        AC_DEFINE(BUILD_PRINTERS, 1, [Define to 1 to build the Printers panel])
++      ]
++)
++AM_CONDITIONAL(BUILD_PRINTERS, test "x$build_printers" = "xyes")
++
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+ PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -334,40 +384,6 @@ AS_IF([test "$enable_bluetooth" = "yes"],
+       ])
+ AM_CONDITIONAL(BUILD_BLUETOOTH, [test "$have_bluetooth" = "yes"])
+ 
+-# Check for CUPS 1.4 or newer
+-AC_PROG_SED
+-
+-AC_PATH_PROG(CUPS_CONFIG, cups-config)
+-
+-if test x$CUPS_CONFIG = x; then
+-  AC_MSG_ERROR([cups-config not found])
+-fi
+-
+-CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
+-CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
+-CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
+-
+-AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
+-                 AC_MSG_ERROR([CUPS headers not found]))
+-
+-if ! test $CUPS_API_MAJOR -gt 1 -o \
+-          $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then
+-  AC_MSG_ERROR([CUPS 1.4 or newer not found])
+-fi
+-
+-# https://bugzilla.gnome.org/show_bug.cgi?id=696766
+-CUPS_CPPFLAGS=""
+-if test $CUPS_API_MAJOR -gt 1 -o \
+-        $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then
+-   CUPS_CPPFLAGS=-D_PPD_DEPRECATED=""
+-fi
+-
+-CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'`
+-CUPS_LIBS=`$CUPS_CONFIG --libs`
+-AC_SUBST(CUPS_CPPFLAGS)
+-AC_SUBST(CUPS_CFLAGS)
+-AC_SUBST(CUPS_LIBS)
+-
+ # Optional dependency for the user accounts panel
+ AC_ARG_WITH([cheese],
+             AS_HELP_STRING([--with-cheese], [enable cheese webcam support]),,
+@@ -671,6 +687,12 @@ else
+ 	AC_MSG_NOTICE([   Color panel disabled])
+ fi
+ 
++if test "x$build_printers" = "xyes"; then
++	AC_MSG_NOTICE([** CUPS (Printers panel)])
++else
++	AC_MSG_NOTICE([   Printers panel disabled])
++fi
++
+ 
+ if test "x$have_cheese" = "xyes"; then
+ 	AC_MSG_NOTICE([** Cheese (Users panel webcam support)])
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 2806c45..b68561e 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -14,8 +14,11 @@ SUBDIRS= \
+ 	datetime \
+ 	search \
+ 	privacy \
+-	sharing \
+-	printers
++	sharing
++
++if BUILD_PRINTERS
++SUBDIRS += printers
++endif
+ 
+ if BUILD_COLOR
+ SUBDIRS += color
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index f3e49c7..af782ea 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -91,8 +91,11 @@ gnome_control_center_LDADD =						\
+ 	$(top_builddir)/panels/sharing/libsharing.la			\
+ 	$(top_builddir)/panels/sound/libsound.la			\
+ 	$(top_builddir)/panels/universal-access/libuniversal-access.la	\
+-	$(top_builddir)/panels/user-accounts/libuser-accounts.la	\
+-	$(top_builddir)/panels/printers/libprinters.la
++	$(top_builddir)/panels/user-accounts/libuser-accounts.la
++
++if BUILD_PRINTERS
++gnome_control_center_LDADD += $(top_builddir)/panels/printers/libprinters.la
++endif
+ 
+ if BUILD_WACOM
+ gnome_control_center_LDADD += $(top_builddir)/panels/wacom/libwacom-properties.la
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index 9104b45..a713079 100644
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -49,7 +49,9 @@ extern GType cc_notifications_panel_get_type (void);
+ 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);
++#endif /* BUILD_PRINTERS */
+ extern GType cc_privacy_panel_get_type (void);
+ extern GType cc_region_panel_get_type (void);
+ extern GType cc_search_panel_get_type (void);
+@@ -95,7 +97,9 @@ static struct {
+   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     ),
++#endif
+   PANEL_TYPE("privacy",          cc_privacy_panel_get_type      ),
+   PANEL_TYPE("region",           cc_region_panel_get_type       ),
+   PANEL_TYPE("search",           cc_search_panel_get_type       ),
+-- 
+2.10.2
+
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/3.24.2-optional-networkmanager.patch
index a871e4628cfc..e4efa1c7c1cc 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-make-networkmanager-optional.patch
+++ b/gnome-base/gnome-control-center/files/3.24.2-optional-networkmanager.patch
@@ -1,7 +1,7 @@
-From ef596aeb01aac8d85fd5861cff360b93cc16ef16 Mon Sep 17 00:00:00 2001
+From c19cbe68d5a4a1363b320debfc6b3e93dbb7e8ac Mon Sep 17 00:00:00 2001
 From: Timo Tambet <ttambet@gmail.com>
 Date: Sun, 26 Feb 2017 00:37:06 +0200
-Subject: [PATCH 3/4] Make network panel optional
+Subject: [PATCH 3/5] Make network panel optional
 
 Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
 [Updated for 3.23.90]
@@ -11,7 +11,7 @@ Signed-off-by: Timo Tambet <ttambet@gmail.com>
  1 file changed, 25 insertions(+), 18 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index edbf657f4..248db379e 100644
+index b47dbc8..4af24d0 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -275,24 +275,31 @@ linux_usb_error_or_warn()
@@ -65,5 +65,5 @@ index edbf657f4..248db379e 100644
  # Check for power panel
  if test x${have_networkmanager} = xyes; then
 -- 
-2.11.1
+2.10.2
 
diff --git a/gnome-base/gnome-control-center/files/3.24.2-optional-wayland.patch b/gnome-base/gnome-control-center/files/3.24.2-optional-wayland.patch
new file mode 100644
index 000000000000..21d4a45b8f16
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.24.2-optional-wayland.patch
@@ -0,0 +1,46 @@
+From e18ff93353a432867e373e549206928d3ced04cc Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider <tranquility@gentoo.org>
+Date: Sat, 25 Apr 2015 22:22:09 +0200
+Subject: [PATCH 2/5] Make wayland support optional
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+Signed-off-by: Mart Raudsepp <leio@gentoo.org>
+---
+ configure.ac | 21 +++++++++++++++------
+ 1 file changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9566fb7..b47dbc8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -227,12 +227,21 @@ if test "x$have_udev" = xyes ; then
+ fi
+ AM_CONDITIONAL(HAVE_UDEV, [test "x$have_udev" = "xyes"])
+ 
+-PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no)
+-if test "x$have_wayland" = xyes ; then
+-	if test "x$have_udev" != xyes ; then
+-		AC_MSG_ERROR([udev is required for Wayland support])
+-	fi
+-fi
++AC_ARG_ENABLE(
++  [wayland],
++  AS_HELP_STRING([--disable-wayland], [disable wayland support]),
++  [],
++  enable_wayland=auto
++)
++
++AS_IF([test "$enable_wayland" != "no"],
++      [
++        AS_IF([test "x$have_udev" = xno],
++              [AC_MSG_ERROR([udev is required for Wayland support])],
++              [AC_DEFINE(HAVE_UDEV, 1, [System has udev])])
++
++        PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
++])
+ 
+ # Panels that must be built on Linux systems
+ linux_error_or_warn()
+-- 
+2.10.2
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-optional.patch b/gnome-base/gnome-control-center/files/3.24.2-optional.patch
index f4bd22245d9d..54e3f65f568e 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-optional.patch
+++ b/gnome-base/gnome-control-center/files/3.24.2-optional.patch
@@ -1,13 +1,13 @@
-From 5ad997775501a1172846bccdf56aad6c9c4bcb1f Mon Sep 17 00:00:00 2001
+From c3b0d1123cae5a895452d2a8d75e663e76cbf5bd Mon Sep 17 00:00:00 2001
 From: Timo Tambet <ttambet@gmail.com>
 Date: Sat, 25 Feb 2017 23:29:10 +0200
-Subject: [PATCH 1/4] Make bluetooth/colord/goa/kerberos/wacom optional
+Subject: [PATCH 1/5] 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
+https://bugzilla.gnome.org/686840
+https://bugzilla.gnome.org/697478
+https://bugzilla.gnome.org/700145
 
 Signed-off-by: Ole Reifschneider <tranquility@gentoo.org>
 Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
@@ -24,7 +24,7 @@ Signed-off-by: Alexandre Rostovtsev <tetromino@gentoo.org>
  8 files changed, 188 insertions(+), 50 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 12a8adee6..022635d34 100644
+index 11fc9fc..9566fb7 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -120,10 +120,6 @@ LIBGD_INIT([_view-common static])
@@ -243,7 +243,7 @@ index 12a8adee6..022635d34 100644
  	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
  else
 diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 507cd2f54..2806c4555 100644
+index 507cd2f..2806c45 100644
 --- a/panels/Makefile.am
 +++ b/panels/Makefile.am
 @@ -2,11 +2,9 @@ SUBDIRS= \
@@ -279,7 +279,7 @@ index 507cd2f54..2806c4555 100644
 +
  -include $(top_srcdir)/git.mk
 diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
-index ccb80172f..bde4cdf43 100644
+index ccb8017..bde4cdf 100644
 --- a/panels/background/Makefile.am
 +++ b/panels/background/Makefile.am
 @@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES =	\
@@ -305,7 +305,7 @@ index ccb80172f..bde4cdf43 100644
  
  libbackground_la_SOURCES =		\
 diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
-index a33cee7f3..408359cba 100644
+index a33cee7..408359c 100644
 --- a/panels/background/bg-pictures-source.c
 +++ b/panels/background/bg-pictures-source.c
 @@ -23,13 +23,17 @@
@@ -413,7 +413,7 @@ index a33cee7f3..408359cba 100644
    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
+index db4e69a..7677b58 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)
@@ -426,7 +426,7 @@ index db4e69a26..7677b58c4 100644
  						   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
+index 2639148..977dab1 100644
 --- a/panels/user-accounts/um-realm-manager.c
 +++ b/panels/user-accounts/um-realm-manager.c
 @@ -22,7 +22,9 @@
@@ -474,7 +474,7 @@ index 26391486f..977dab1d6 100644
  
  void
 diff --git a/shell/Makefile.am b/shell/Makefile.am
-index 6af3199d8..f3e49c7d9 100644
+index 6af3199..f3e49c7 100644
 --- a/shell/Makefile.am
 +++ b/shell/Makefile.am
 @@ -78,14 +78,12 @@ gnome_control_center_LDADD =						\
@@ -508,7 +508,7 @@ index 6af3199d8..f3e49c7d9 100644
  	$(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
+index 20ebb85..9104b45 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);
@@ -552,5 +552,5 @@ index 20ebb85d5..9104b45ba 100644
    PANEL_TYPE("printers",         cc_printers_panel_get_type     ),
    PANEL_TYPE("privacy",          cc_privacy_panel_get_type      ),
 -- 
-2.11.1
+2.10.2
 
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.24.2.ebuild
index 8435c4ea60c1..ac0ba4552990 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
 
 LICENSE="GPL-2+"
 SLOT="2"
-IUSE="+bluetooth +colord debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
+IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus 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
@@ -24,7 +24,7 @@ QA_CONFIGURE_OPTIONS=".*"
 # 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
+# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional)
 COMMON_DEPEND="
 	>=dev-libs/glib-2.44.0:2[dbus]
 	>=x11-libs/gdk-pixbuf-2.23.0:2
@@ -57,10 +57,10 @@ COMMON_DEPEND="
 		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]
-
+	cups? (
+		>=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:= )
@@ -92,6 +92,9 @@ 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 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
 	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
 	>=gnome-base/libgnomekbd-3
 	wayland? ( dev-libs/libinput )
@@ -129,11 +132,12 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# Make some panels and dependencies optional; requires eautoreconf
 	# https://bugzilla.gnome.org/686840, 697478, 700145
-	"${FILESDIR}"/${P}-optional.patch
-	"${FILESDIR}"/${PN}-3.22.0-make-wayland-optional.patch
-	"${FILESDIR}"/${P}-make-networkmanager-optional.patch
+	"${FILESDIR}"/${PV}-optional.patch
+	"${FILESDIR}"/${PV}-optional-wayland.patch
+	"${FILESDIR}"/${PV}-optional-networkmanager.patch
+	"${FILESDIR}"/${PV}-optional-cups.patch
 	# Fix some absolute paths to be appropriate for Gentoo
-	"${FILESDIR}"/${P}-gentoo-paths.patch
+	"${FILESDIR}"/${PV}-gentoo-paths.patch
 )
 
 src_configure() {
@@ -143,6 +147,7 @@ src_configure() {
 		--enable-documentation \
 		$(use_enable bluetooth) \
 		$(use_enable colord color) \
+		$(use_enable cups) \
 		$(usex debug --enable-debug=yes ' ') \
 		$(use_enable gnome-online-accounts goa) \
 		$(use_enable ibus) \