summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2017-04-02 13:58:47 +0300
committerMart Raudsepp <leio@gentoo.org>2017-04-02 15:57:54 +0300
commite73e24d61596635b3bc307688da3f7dbc6332bda (patch)
tree13542f6b9dc09498c42da0d5c4be601c2e26d5e8
parentnet-libs/gnome-online-accounts: remove old (diff)
downloadgentoo-e73e24d61596635b3bc307688da3f7dbc6332bda.tar.gz
gentoo-e73e24d61596635b3bc307688da3f7dbc6332bda.tar.bz2
gentoo-e73e24d61596635b3bc307688da3f7dbc6332bda.zip
gnome-base/gnome-control-center: remove old
Package-Manager: Portage-2.3.5, Repoman-2.3.1
-rw-r--r--gnome-base/gnome-control-center/Manifest1
-rw-r--r--gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch119
-rw-r--r--gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch44
-rw-r--r--gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch83
-rw-r--r--gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch39
-rw-r--r--gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch533
-rw-r--r--gnome-base/gnome-control-center/gnome-control-center-3.20.2-r1.ebuild161
7 files changed, 0 insertions, 980 deletions
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index faa79be8220..c7f6289c178 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-control-center-3.20.2.tar.xz 7103716 SHA256 ae380d9cb7a2c6f7f336718606274cd87021cbbcdf828ec67b1a420a2605776e SHA512 d68bccf16e5e854db4cd8dbb7abb64c40ad1b7370a8c71ff5e8790ef6f2eeb19cd6b2d41f5506bb4b8d956f1d65f54afb26f5d2c4c87adde6561079f1477ff41 WHIRLPOOL ccb4a35211d2fa3adca34b2897a09687bfc854f5d89a512f80d43f46d822b15f586424983df5e746771e12df36115c5b9b7eee220582c4b7042d68e48c4ccf17
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
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch
deleted file mode 100644
index 8ef4033492a..00000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 6ce180eace2bb3b9954d0b9ca74c7108e772ad68 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 8 Dec 2013 23:44:56 +0100
-Subject: [PATCH 2/2] Fix some absolute paths to be appropriate for Gentoo
-
----
- 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/cc-printers-panel.c | 4 ++--
- panels/printers/pp-host.c | 2 +-
- 7 files changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
-index fc85592..133845f 100644
---- a/panels/datetime/Makefile.am
-+++ b/panels/datetime/Makefile.am
-@@ -24,6 +24,7 @@ AM_CPPFLAGS = \
- $(DATETIME_PANEL_CFLAGS) \
- -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
- -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-+ -DREALDATADIR="\"$(datadir)\"" \
- $(NULL)
-
- noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
-diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
-index 490df17..b43fc87 100644
---- a/panels/datetime/test-endianess.c
-+++ b/panels/datetime/test-endianess.c
-@@ -38,11 +38,11 @@ int main (int argc, char **argv)
- 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;
- }
-diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
-index 5667657..8483b87 100644
---- 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,
-diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
-index 71c1c23..ca4b3c4 100644
---- 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;
-diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
-index 63a33b4..12e2e45 100644
---- a/panels/printers/Makefile.am
-+++ b/panels/printers/Makefile.am
-@@ -7,6 +7,9 @@ INCLUDES = \
- $(SMBCLIENT_CFLAGS) \
- -I$(top_srcdir)/shell/ \
- -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-+ -DREALDATADIR="\"$(datadir)\"" \
-+ -DPREFIX="\"$(prefix)\"" \
-+ -DLIBEXECDIR="\"$(libexecdir)\"" \
- $(NULL)
-
- noinst_LTLIBRARIES = libprinters.la
-diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
-index 29b8173..24bcdf8 100644
---- a/panels/printers/cc-printers-panel.c
-+++ b/panels/printers/cc-printers-panel.c
-@@ -2428,8 +2428,8 @@ test_page_cb (GtkButton *button,
-
- 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",
-diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
-index a994a61..51efe50 100644
---- a/panels/printers/pp-host.c
-+++ b/panels/printers/pp-host.c
-@@ -251,7 +251,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 */
---
-1.8.3.2
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch
deleted file mode 100644
index 38d4ccd30e4..00000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 95420469407223898564425b7622ac66e7ed70d5 Mon Sep 17 00:00:00 2001
-From: Ole Reifschneider <tranquility@gentoo.org>
-Date: Sat, 25 Apr 2015 22:22:09 +0200
-Subject: [PATCH] Make wayland support optional
-
----
- configure.ac | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9713256..6b34962 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -231,12 +231,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)
-+])
-
- PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
- libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
---
-2.0.5
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch
deleted file mode 100644
index 8f704ac988e..00000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 763cc368b529c879050ffb98340779148e152b29 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 12 May 2015 00:32:11 +0200
-Subject: [PATCH 3/3] Make network panel optional
-
----
- configure.ac | 60 ++++++++++++++++++++++++++++++++++--------------------------
- 1 file changed, 34 insertions(+), 26 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7816942..13e8f45 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -247,32 +247,40 @@ AS_IF([test "$enable_wayland" != "no"],
- PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
- ])
-
--PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
-- libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
-- libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION
-- libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
-- libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
-- mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
-- [have_networkmanager=yes], have_networkmanager=no)
--if test "x$have_networkmanager" = xno ; then
-- AC_MSG_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
--
--# Work-around for https://bugzilla.gnome.org/show_bug.cgi?id=723769
--PKG_CHECK_MODULES(NM_UNSTABLE_CHECK, libnm-util >= 0.9.9.0, nm_unstable=yes, nm_unstable=no)
--if test x$nm_unstable = xyes; then
-- AC_DEFINE(HAVE_NM_UNSTABLE, 1, [Define to 1 if NetworkManager is available])
--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, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
-+ libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
-+ libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION
-+ libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
-+ libnm-gtk >= $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])
-+ ])
-+
-+ # Work-around for https://bugzilla.gnome.org/show_bug.cgi?id=723769
-+ PKG_CHECK_MODULES(NM_UNSTABLE_CHECK, [libnm-util >= 0.9.9.0],
-+ [
-+ nm_unstable=yes
-+ AC_DEFINE(HAVE_NM_UNSTABLE, 1, [Define to 1 if NetworkManager is available])
-+ ],
-+ [nm_unstable=no])
-+ ])
-+AM_CONDITIONAL(BUILD_NETWORK, [test "$have_networkmanager" = "yes"])
- AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
-
- # Check for gnome-bluetooth
---
-2.3.6
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch
deleted file mode 100644
index 23141e44d70..00000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3b51af7de7bfe7b69bbb1a96dbbc184311281704 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Mon, 11 May 2015 23:59:03 +0200
-Subject: [PATCH 1/3] Optional gotta be optional
-
----
- configure.ac | 16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9713256..bc239de 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -508,22 +508,6 @@ else
- AC_MSG_RESULT(no)
- fi
-
--case $host_os in
-- linux*)
-- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
-- # Nothing
-- echo "USB-related panels disabled on S390"
-- else
-- if test "x$have_networkmanager" != "xyes" -o \
-- "x$have_bluetooth" != "xyes" -o \
-- "x$enable_cups" != "xyes" -o \
-- "x$have_wacom" != "xyes"; then
-- AC_MSG_ERROR([The Network, Bluetooth, Printers and Wacom panels are not optional on Linux systems])
-- fi
-- fi
-- ;;
--esac
--
- AC_CONFIG_FILES([
- Makefile
- panels/Makefile
---
-2.3.6
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch
deleted file mode 100644
index 59379a53aa6..00000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch
+++ /dev/null
@@ -1,533 +0,0 @@
-From dc62978815a12d0d0fbd97e975a612a13aff0cdc Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 25 Apr 2014 22:17:24 +0200
-Subject: [PATCH] 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: Ole Reifschneider <tranquility@gentoo.org>
----
- configure.ac | 156 ++++++++++++++++++++++++++------
- panels/Makefile.am | 10 +-
- panels/background/Makefile.am | 8 +-
- panels/background/bg-pictures-source.c | 20 ++++
- panels/user-accounts/um-realm-manager.c | 9 ++
- shell/Makefile.am | 10 +-
- shell/cc-panel-loader.c | 8 ++
- 7 files changed, 186 insertions(+), 35 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0c2a779..4dfff18 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification 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
-@@ -140,14 +136,65 @@ 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)
-+
-+build_online_accounts=false
-+background_online_accounts=
-+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
-+ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.3 >= $GRILO_REQUIRED_VERSION"
-+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(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
-+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
-+ $background_online_accounts)
-+
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
- gnome-settings-daemon >= $GSD_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_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
-+ libsoup-2.4
-+ 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)
-@@ -221,8 +268,25 @@ fi
- AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
-
- # Check for gnome-bluetooth
--PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2,
-- [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.18.2,
-+ [have_bluetooth=yes], have_bluetooth=no)
-+ 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
-@@ -307,15 +371,27 @@ 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
-- 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])
-+ 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
-+ 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])
-+ fi
- fi
- ;;
- *)
-@@ -325,15 +401,22 @@ esac
- 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_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_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)
-@@ -569,6 +652,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
-@@ -579,6 +667,16 @@ 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$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/panels/background/Makefile.am b/panels/background/Makefile.am
-index ccb8017..bde4cdf 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 de5f189..c41267d 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,
-@@ -891,6 +907,7 @@ files_changed_cb (GFileMonitor *monitor,
- }
- }
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- static void
- media_found_cb (BgPicturesSource *self, GrlMedia *media)
- {
-@@ -902,6 +919,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)
-@@ -969,9 +987,11 @@ bg_pictures_source_init (BgPicturesSource *self)
-
- g_object_unref (dir);
-
-+#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/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
-index 8a0a0e6..22c6b94 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 e9cac8b..7706437 100644
---- a/shell/Makefile.am
-+++ b/shell/Makefile.am
-@@ -58,14 +58,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 \
-@@ -91,6 +89,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
-+
- # Dbus service file
- servicefiledir = $(datadir)/dbus-1/services
- servicefile_in_files = org.gnome.ControlCenter.service.in
-diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
-index de9c5df..17503fe 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 ),
---
-2.7.4
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.20.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.20.2-r1.ebuild
deleted file mode 100644
index 5a68546a64f..00000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.20.2-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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 +cups 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)
-COMMON_DEPEND="
- >=dev-libs/glib-2.44.0:2[dbus]
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.20.3:3[X,wayland?]
- >=gnome-base/gsettings-desktop-schemas-3.19.3
- >=gnome-base/gnome-desktop-3.19.93:3=
- >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit]
-
- >=dev-libs/libpwquality-1.2.2
- dev-libs/libxml2:2
- 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.99:=
- >=x11-libs/libnotify-0.7.3:0=
-
- virtual/libgudev
- virtual/opengl
- 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 )
- 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.15.1:= )
- i18n? ( >=app-i18n/ibus-1.5.2 )
- kerberos? ( app-crypt/mit-krb5 )
- networkmanager? (
- >=gnome-extra/nm-applet-0.9.7.995
- >=net-misc/networkmanager-0.9.8:=[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 ) )
- >=sys-apps/accountsservice-0.6.39
- 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] )
- 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}"/${PN}-3.20.0-optional.patch
- eapply "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
- eapply "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch
- eapply "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
-
- # Fix some absolute paths to be appropriate for Gentoo
- eapply "${FILESDIR}"/${PN}-3.10.2-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) \
- $(use_enable cups) \
- $(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)"
-}