[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/files/, gnome-base/gnome-settings-daemon/

[Mart Raudsepp]

commit:     59d0395d06b0cbf566702184211e3c35d3fed3e2
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 28 23:46:40 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Apr 28 23:46:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d0395d

gnome-base/gnome-settings-daemon: remove old

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 gnome-base/gnome-settings-daemon/Manifest          |   1 -
 .../files/3.24.2-reduce-memory-usage.patch         | 177 ---------------------
 .../files/3.24.2-remove-unneeded-gtk-init.patch    |  77 ---------
 .../files/3.24.2-udevrulesdir-configure.patch      |  48 ------
 .../files/3.24.3-fix-wayland-build.patch           |  53 ------
 .../files/3.24.3-optional.patch                    | 169 --------------------
 .../gnome-settings-daemon-3.24.3.ebuild            | 160 -------------------
 7 files changed, 685 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 3316056fff1..9bde0ee5da1 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-settings-daemon-3.24.3.tar.xz 1583044 BLAKE2B f075abe574663cb9e6092e9698efb12d598584fe004042b5ac63df7e30ba9dfdb28ac4d0fac4148fa8fd49ccb6991414dc9a3dc49400efbe2cf4752d6295d62c SHA512 2450c3bb31746fe4883f194094cf79e94207e74d39c992107244d89f36c3ea373a33a2dca4a55af138f03fb4abd8733da4bacb215e2202bbc0976b566f8529a6
 DIST gnome-settings-daemon-3.24.4-patchset.tar.xz 5224 BLAKE2B f01db03ce3980a74324972871643e573bc51a184fe12e7a40796b7ca1bbfac37ecad1fae2f8a62fba0038a672dc4958b242316dc3dc97a59b37a2e4e4f5e9973 SHA512 fe5bf846774b126e8ed89bc8043e8c02b567cc55d602c5becd84a14c7a414fc663ae1767a552b585defb462ffe88b4838f87445c9599fda37f197e8f2eaad8cb
 DIST gnome-settings-daemon-3.24.4.tar.xz 1632700 BLAKE2B 616aad6984df726c438117ab98e8c5a35bd02a6ebbc3c24fc46b50e8b3ca3f3d5bede0588cfe9bbdfcaccc70ff5799feeabf020ec4beb03d653ae81abc6325f8 SHA512 4a3b1069d80263a92ae2c2a420f7dc70a1ff92346d5cbeb1e7dd4af0419e039ebe958550594d87929c0333c19aa9a3ef7ca9b9751109a9da64a40d81ba067cc0

diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch
deleted file mode 100644
index 9e683b06d3b..00000000000
--- a/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 386f456eda7a027dfc706ebb675602d6f067f5c6 Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@××××××.com>
-Date: Mon, 27 Mar 2017 00:17:59 -0700
-Subject: [PATCH 5/5] common: avoid loading Adwaita CSS theme into memory
-
-The various Gtk programs are not dependent on any specific theme being
-loaded. Therefore, the parsing the Adwaita CSS theme (which is quite a
-detailed theme) is unnecessary and a few MB of overhead to each gsd
-subprocess.
-
-By setting the GTK_THEME environment variable in main() and providing an
-alternate CSS file (which is empty), we can force Gtk to never load the
-default theme, but instead our empty theme. This is important as otherwise
-GtkSettings can force-load Adwaita upon first use, and that fragments the
-heap.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=780555
----
- configure.ac                          |  1 +
- plugins/common/Makefile.am            | 10 ++++++++++
- plugins/common/Makefile.am.gresources | 34 ++++++++++++++++++++++++++++++++++
- plugins/common/daemon-skeleton-gtk.h  | 28 ++++++++++++++++++++++++++++
- plugins/common/gsd.gresources.xml     |  6 ++++++
- plugins/common/gtk.css                |  0
- 6 files changed, 79 insertions(+)
- create mode 100644 plugins/common/Makefile.am.gresources
- create mode 100644 plugins/common/gsd.gresources.xml
- create mode 100644 plugins/common/gtk.css
-
-diff --git a/configure.ac b/configure.ac
-index 475821d..df86831 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -73,6 +73,7 @@ AC_SUBST([GSD_PLUGIN_LDFLAGS])
- 
- AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
- AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
-+AC_PATH_PROG([GLIB_COMPILE_RESOURCES], [glib-compile-resources])
- 
- LT_LIB_M
- AC_SUBST(LIBM)
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 239c601..706be12 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -33,6 +33,8 @@ libcommon_la_SOURCES = \
- 	gsd-device-mapper.h	\
- 	gsd-input-helper.c	\
- 	gsd-input-helper.h	\
-+	gsd-resources.c		\
-+	gsd-resources.h		\
- 	gsd-settings-migrate.c	\
- 	gsd-settings-migrate.h	\
- 	gsd-shell-helper.c	\
-@@ -68,3 +70,11 @@ EXTRA_DIST = $(scripts_DATA) daemon-skeleton.h daemon-skeleton-gtk.h
- 
- CLEANFILES = \
- 	$(GSD_COMMON_ENUM_FILES)
-+
-+DISTCLEANFILES =
-+
-+glib_resources_c = gsd-resources.c
-+glib_resources_h = gsd-resources.h
-+glib_resources_xml = gsd.gresources.xml
-+glib_resources_namespace = gsd
-+include Makefile.am.gresources
-diff --git a/plugins/common/Makefile.am.gresources b/plugins/common/Makefile.am.gresources
-new file mode 100644
-index 0000000..1441d0e
---- /dev/null
-+++ b/plugins/common/Makefile.am.gresources
-@@ -0,0 +1,34 @@
-+resources_xml=$(addprefix $(srcdir)/,$(glib_resources_xml))
-+resources_srcdir=$(dir $(resources_xml))
-+
-+DISTCLEANFILES += $(glib_resources_h) $(glib_resources_c)
-+BUILT_SOURCES += $(glib_resources_h) $(glib_resources_c)
-+CLEANFILES += stamp-resources $(glib_resources_c) $(glib_resources_h)
-+EXTRA_DIST += \
-+	$(glib_resources_xml) \
-+	$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(resources_srcdir) --generate-dependencies $(resources_xml)) \
-+	$(NULL)
-+
-+stamp-resources: $(glib_resources_c) $(resources_xml)
-+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \
-+		--target=xgen-gr.h \
-+		--sourcedir=$(resources_srcdir) \
-+		--generate-header \
-+		--c-name $(glib_resources_namespace) \
-+		$(resources_xml) \
-+	&& (cmp -s xgen-gr.h $(glib_resources_h) || cp -f xgen-gr.h $(glib_resources_h)) \
-+	&& rm -f xgen-gr.h \
-+	&& echo timestamp > $(@F)
-+
-+$(glib_resources_h): stamp-resources
-+	@true
-+
-+$(glib_resources_c): $(resources_xml) $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(resources_srcdir) --generate-dependencies $(resources_xml))
-+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \
-+		--target=xgen-gr.c \
-+		--sourcedir=$(resources_srcdir) \
-+		--generate-source \
-+		--c-name $(glib_resources_namespace) \
-+		$(resources_xml) \
-+	&& (cmp -s xgen-gr.c $(glib_resources_c) || cp -f xgen-gr.c $(glib_resources_c)) \
-+	&& rm -f xgen-gr.c
-diff --git a/plugins/common/daemon-skeleton-gtk.h b/plugins/common/daemon-skeleton-gtk.h
-index 3bfd618..3ba0422 100644
---- a/plugins/common/daemon-skeleton-gtk.h
-+++ b/plugins/common/daemon-skeleton-gtk.h
-@@ -163,6 +163,30 @@ register_with_gnome_session (void)
- 			   NULL);
- }
- 
-+static void
-+set_empty_gtk_theme (gboolean set)
-+{
-+	static char *old_gtk_theme = NULL;
-+
-+	if (set) {
-+		/* Override GTK_THEME to reduce overhead of CSS engine. By using
-+		 * GTK_THEME environment variable, GtkSettings is not allowed to
-+		 * initially parse the Adwaita theme.
-+		 *
-+		 * https://bugzilla.gnome.org/show_bug.cgi?id=780555 */
-+		old_gtk_theme = g_strdup (g_getenv ("GTK_THEME"));
-+		g_setenv ("GTK_THEME", "Disabled", TRUE);
-+	} else {
-+		/* GtkSettings has loaded, so we can drop GTK_THEME used to initialize
-+		 * our internal theme. Only the main thread accesses the GTK_THEME
-+		 * environment variable, so this is safe to release. */
-+		if (old_gtk_theme != NULL)
-+			g_setenv ("GTK_THEME", old_gtk_theme, TRUE);
-+		else
-+			g_unsetenv ("GTK_THEME");
-+	}
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -172,6 +196,8 @@ main (int argc, char **argv)
-         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-         textdomain (GETTEXT_PACKAGE);
- 
-+        set_empty_gtk_theme (TRUE);
-+
-         /* Work around https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
-         g_type_ensure (G_TYPE_DBUS_CONNECTION);
-         g_type_ensure (G_TYPE_DBUS_PROXY);
-@@ -187,6 +213,8 @@ main (int argc, char **argv)
-                 exit (1);
-         }
- 
-+        set_empty_gtk_theme (FALSE);
-+
-         if (verbose)
-                 g_setenv ("G_MESSAGES_DEBUG", "all", TRUE);
- 
-diff --git a/plugins/common/gsd.gresources.xml b/plugins/common/gsd.gresources.xml
-new file mode 100644
-index 0000000..e4ac1cd
---- /dev/null
-+++ b/plugins/common/gsd.gresources.xml
-@@ -0,0 +1,6 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<gresources>
-+  <gresource prefix="/org/gtk/libgtk/theme/Disabled">
-+    <file>gtk.css</file>
-+  </gresource>
-+</gresources>
-diff --git a/plugins/common/gtk.css b/plugins/common/gtk.css
-new file mode 100644
-index 0000000..e69de29
--- 
-2.10.2
-

diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch
deleted file mode 100644
index e47ba34c60d..00000000000
--- a/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From b567ec92d5b3004ad52fa02fb02990fcafb63373 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@××××××.net>
-Date: Mon, 27 Mar 2017 18:47:54 +0200
-Subject: [PATCH 1/3] housekeeping: Don't init GTK+
-
-We don't use it.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=780555
----
- plugins/housekeeping/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/housekeeping/main.c b/plugins/housekeeping/main.c
-index 5ccd83d..89c12f7 100644
---- a/plugins/housekeeping/main.c
-+++ b/plugins/housekeeping/main.c
-@@ -4,4 +4,4 @@
- #define MANAGER GsdHousekeepingManager
- #include "gsd-housekeeping-manager.h"
- 
--#include "daemon-skeleton-gtk.h"
-+#include "daemon-skeleton.h"
--- 
-2.10.2
-
-
-From 92d45cd2ce2c4f252db21993f30777433ed84623 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@××××××.net>
-Date: Mon, 27 Mar 2017 18:49:35 +0200
-Subject: [PATCH 2/3] print-notifications: Don't init GTK+
-
-We don't use it.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=780555
----
- plugins/print-notifications/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/print-notifications/main.c b/plugins/print-notifications/main.c
-index 57155d0..a0dd406 100644
---- a/plugins/print-notifications/main.c
-+++ b/plugins/print-notifications/main.c
-@@ -4,4 +4,4 @@
- #define MANAGER GsdPrintNotificationsManager
- #include "gsd-print-notifications-manager.h"
- 
--#include "daemon-skeleton-gtk.h"
-+#include "daemon-skeleton.h"
--- 
-2.10.2
-
-
-From e7e4b2145efebf132f1398da77790849becd7f6b Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@××××××.net>
-Date: Mon, 27 Mar 2017 18:50:01 +0200
-Subject: [PATCH 3/3] wacom: Don't init GTK+
-
-We don't use it.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=780555
----
- plugins/wacom/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/wacom/main.c b/plugins/wacom/main.c
-index a19a71b..ad1367c 100644
---- a/plugins/wacom/main.c
-+++ b/plugins/wacom/main.c
-@@ -4,4 +4,4 @@
- #define MANAGER GsdWacomManager
- #include "gsd-wacom-manager.h"
- 
--#include "daemon-skeleton-gtk.h"
-+#include "daemon-skeleton.h"
--- 
-2.10.2
-

diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
deleted file mode 100644
index 16988f945d2..00000000000
--- a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@g.o>
-Date: Mon, 29 May 2017 00:38:57 +0300
-Subject: [PATCH 1/5] build: Get udevrulesdir from pkg-config
-
-Use the standard way to find the udev rules directory via pkg-config by default,
-and support specifying it, should it be necessary.
-This is the same logic as in colord.
----
- configure.ac               | 9 +++++++++
- plugins/rfkill/Makefile.am | 1 -
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1107578..475821d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -104,6 +104,15 @@ fi
- AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
- 
- dnl ---------------------------------------------------------------------------
-+dnl - Where to install udev rules
-+dnl ---------------------------------------------------------------------------
-+AC_ARG_WITH([udevrulesdir],
-+            AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]),
-+            [],
-+            [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d])
-+AC_SUBST([udevrulesdir], [$with_udevrulesdir])
-+
-+dnl ---------------------------------------------------------------------------
- dnl - ALSA integration (default enabled)
- dnl ---------------------------------------------------------------------------
- ALSA_PKG=""
-diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
-index 3c5ec47..bfc34c6 100644
---- a/plugins/rfkill/Makefile.am
-+++ b/plugins/rfkill/Makefile.am
-@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile
- 	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
- 
--udevrulesdir = $(prefix)/lib/udev/rules.d
- udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
- 
- EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files)
--- 
-2.10.2
-

diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
deleted file mode 100644
index 4a06889aaa2..00000000000
--- a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@g.o>
-Date: Fri, 18 Aug 2017 09:42:56 +0200
-Subject: [PATCH] Fix build issue when gudev is detected in the absence of
- wayland
-
-See https://bugs.gentoo.org/show_bug.cgi?id=627966
----
- configure.ac               | 5 +++++
- plugins/common/Makefile.am | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 908b3a3a..c89d5e2d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland,
-         AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: auto)]),
-         enable_wayland=$enableval, enable_wayland=auto)
- if test x$enable_wayland != xno; then
-+        AS_IF([test "$have_udev" = no],
-+              [AC_MSG_ERROR([udev is required for Wayland support])])
-+
-         PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, have_wayland=no)
-         if test x$have_wayland = xyes; then
-                 AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is available])
-+		GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0"
-         else
-                 if test x$enable_wayland = xyes; then
-                         AC_MSG_ERROR([Wayland enabled but not found])
-                 fi
-         fi
- fi
-+AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes)
- 
- dnl ================================================================
- dnl Plugins
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 107e4d3b..760f3198 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -40,7 +40,7 @@ libcommon_la_SOURCES = \
- 	gsd-shell-helper.c	\
- 	gsd-shell-helper.h
- 
--if HAVE_GUDEV
-+if HAVE_WAYLAND
- libcommon_la_SOURCES += \
- 	gsd-device-manager-udev.c \
- 	gsd-device-manager-udev.h
--- 
-2.14.1
-

diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch
deleted file mode 100644
index 608784c43bb..00000000000
--- a/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 9116667b39f7a3ef622b0fd4e09ffa77718fa5c2 Mon Sep 17 00:00:00 2001
-From: Ole Reifschneider <mail@×××××××××××××××××.de>
-Date: Tue, 15 Aug 2017 18:51:42 +0200
-Subject: [PATCH 1/6] Make colord and wacom support optional
-
-Signed-off-by: Gilles Dartiguelongue <eva@g.o>
-Signed-off-by: Timo Tambet <ttambet@×××××.com>
-Signed-off-by: Yuh-Horng Chen <yhchens@×××××.com>
----
- configure.ac               | 54 ++++++++++++++++++++++++++++++----------------
- plugins/Makefile.am        |  9 ++++++--
- plugins/common/Makefile.am |  7 ++++--
- plugins/dummy/Makefile.am  |  5 ++++-
- 4 files changed, 52 insertions(+), 23 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 73fe91e6..d8778c93 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD,
- 		  gtk+-x11-3.0
- 		  x11)
- 
--PKG_CHECK_MODULES(COLOR,
--		  colord >= 1.0.2
--		  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
--		  libcanberra-gtk3
--		  libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
--		  lcms2 >= $LCMS_REQUIRED_VERSION
--		  libnotify)
-+AC_ARG_ENABLE([color],
-+  AS_HELP_STRING([--disable-color],
-+                 [turn off color plugin]),
-+       [],
-+       [enable_color=yes])
-+
-+AS_IF([test "$enable_color" = "yes"],
-+      [PKG_CHECK_MODULES(COLOR,
-+                         colord >= 1.0.2
-+                         gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-+                         libcanberra-gtk3
-+                         libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
-+                         lcms2 >= $LCMS_REQUIRED_VERSION
-+                         libnotify)
-+       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
-+      ])
-+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes")
- 
- PKG_CHECK_MODULES(DATETIME,
- 		  libnotify >= $LIBNOTIFY_REQUIRED_VERSION
-@@ -268,23 +278,31 @@ case $host_os in
-     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
-       have_wacom=no
-     else
--      if test x$enable_gudev != xno; then
--        LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION"
--        PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
--        PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
--        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
--      else
--        AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
--      fi
--      AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
--      have_wacom=yes
-+      have_wacom=no
-+      AS_IF([test "$enable_gudev" != "no"],
-+        [AC_ARG_ENABLE([wacom],
-+           AS_HELP_STRING([--disable-wacom],
-+                          [turn off wacom plugin]),
-+                          [],
-+                          [enable_wacom=no]) dnl Default value
-+         AS_IF([test "$enable_wacom" = "yes"],
-+               [
-+                 PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
-+                 PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION])
-+                 PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+                 have_wacom=yes
-+                 AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available])
-+               ])
-+        ], [
-+          AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
-+        ])
-     fi
-     ;;
-   *)
-     have_wacom=no
-     ;;
- esac
--AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
-+AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes)
- 
- dnl ---------------------------------------------------------------------------
- dnl - common
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 9324b406..ee78d6d0 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -4,7 +4,6 @@ enabled_plugins =	\
- 	a11y-keyboard	\
- 	a11y-settings	\
- 	clipboard	\
--	color		\
- 	datetime	\
- 	dummy		\
- 	power		\
-@@ -22,13 +21,19 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if SMARTCARD_SUPPORT
- enabled_plugins += smartcard
- else
- disabled_plugins += smartcard
- endif
- 
--if HAVE_WACOM
-+if BUILD_WACOM
- enabled_plugins += wacom
- else
- disabled_plugins += wacom
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 239c6015..65de4007 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -49,14 +49,17 @@ libcommon_la_CPPFLAGS = \
- 	-I$(top_builddir)/gnome-settings-daemon	\
- 	-I$(top_srcdir)/data/
- 
--libcommon_la_CFLAGS = $(COMMON_CFLAGS)
-+libcommon_la_CFLAGS = \
-+	$(COMMON_CFLAGS) \
-+	$(LIBWACOM_CFLAGS)
- 
- libcommon_la_LDFLAGS = \
- 	$(GSD_PLUGIN_LDFLAGS)
- 
- libcommon_la_LIBADD  = \
- 	$(top_builddir)/gnome-settings-daemon/libgsd.la \
--	$(COMMON_LIBS)
-+	$(COMMON_LIBS) \
-+	$(LIBWACOM_LIBS)
- 
- libexec_PROGRAMS = gsd-test-input-helper
- 
-diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
-index cb5856cf..d8e8bc4e 100644
---- a/plugins/dummy/Makefile.am
-+++ b/plugins/dummy/Makefile.am
-@@ -25,7 +25,10 @@ desktop_DATA =
- if !SMARTCARD_SUPPORT
- desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop
- endif
--if !HAVE_WACOM
-+if !BUILD_COLOR
-+desktop_DATA += org.gnome.SettingsDaemon.Color.desktop
-+endif
-+if !BUILD_WACOM
- desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop
- endif
- if !BUILD_PRINT_NOTIFICATIONS
--- 
-2.14.1
-

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
deleted file mode 100644
index f8ecb153f4d..00000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 systemd udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland"
-REQUIRED_USE="
-	input_devices_wacom? ( udev )
-	smartcard? ( udev )
-	wayland? ( udev )
-"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.44.0:2[dbus]
-	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
-	>=gnome-base/gnome-desktop-3.11.1:3=
-	>=gnome-base/gsettings-desktop-schemas-3.23.3
-	>=gnome-base/librsvg-2.36.2:2
-	media-fonts/cantarell
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-2
-	>=sys-power/upower-0.99:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7.3:=
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/libXxf86misc
-	x11-misc/xkeyboard-config
-
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/libgweather-3.9.5:2=
-	>=sci-geosciences/geocode-glib-3.10
-	>=sys-auth/polkit-0.103
-
-	colord? (
-		>=media-libs/lcms-2.2:2
-		>=x11-misc/colord-1.0.2:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/pango-1.20
-		x11-drivers/xf86-input-wacom
-		virtual/libgudev:= )
-	networkmanager? ( >=net-misc/networkmanager-1.0 )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( virtual/libgudev:= )
-	wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/dconf
-	!openrc-force? ( sys-apps/systemd )
-	!<gnome-base/gnome-control-center-2.22
-	!<gnome-extra/gnome-color-manager-3.1.1
-	!<gnome-extra/gnome-power-manager-3.1.3
-	!<gnome-base/gnome-session-3.23.2
-"
-# xproto-7.0.15 needed for power plugin
-DEPEND="${COMMON_DEPEND}
-	cups? ( sys-apps/sed )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
-		gnome-base/gnome-session )
-	dev-libs/libxml2:2
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-	>=x11-proto/xproto-7.0.15
-"
-
-# TypeErrors with python3; weird test errors with python2; all in power component that was made required now
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Make colord and wacom optional; requires eautoreconf
-	"${FILESDIR}"/${PV}-optional.patch
-	# Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
-	"${FILESDIR}"/3.24.2-udevrulesdir-configure.patch
-	# Reduce memory usage by not initing GTK+ where not needed
-	"${FILESDIR}"/3.24.2-remove-unneeded-gtk-init.patch
-	# Reduce memory usage by using a fake CSS theme instead of full Adwaita for GTK+ needing plugins; requires eautoreconf
-	"${FILESDIR}"/3.24.2-reduce-memory-usage.patch
-	# Fix build issue when gudev is present but not wayland, bug #627966
-	"${FILESDIR}"/3.24.3-fix-wayland-build.patch
-)
-
-python_check_deps() {
-	if use test; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-udevrulesdir="$(get_udevdir)"/rules.d \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable debug more-warnings) \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable udev gudev) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_test() {
-	virtx emake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow the this guide to migrate:"
-		ewarn "https://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}