Update to 3.4.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16765 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 169 insertions, 37 deletions

diff --git a/sysutils/gnome-settings-daemon3/Makefile b/sysutils/gnome-settings-daemon3/Makefile
index 1762e9ccb..69a9f5de6 100644
--- a/sysutils/gnome-settings-daemon3/Makefile
+++ b/sysutils/gnome-settings-daemon3/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-settings-daemon3/Makefile,v 1.31 2011/11/09 02:51:26 avl Exp $
+#   $MCom: ports/sysutils/gnome-settings-daemon3/Makefile,v 1.32 2012/04/13 02:18:06 mezz Exp $
 #
 
 PORTNAME=	gnome-settings-daemon
-PORTVERSION=	3.2.3
+PORTVERSION=	3.4.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	gnome-session>=2.91.0:${PORTSDIR}/x11/gnome-session3 \
 LIB_DEPENDS=	canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \
 		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
 		colord.1:${PORTSDIR}/graphics/colord \
+		pulse.0:${PORTSDIR}/audio/pulseaudio \
 		gdbm.4:${PORTSDIR}/databases/gdbm \
 		notify.4:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	gnome-session>=2.91.0:${PORTSDIR}/x11/gnome-session3 \
@@ -31,21 +32,23 @@ LATEST_LINK=	gnome-settings-daemon3
 USE_XORG=	xxf86misc
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gnomedesktop3 libgnomekbd3
+USE_GNOME=	gnomeprefix intlhack gnomehack gnomedesktop3 libgnomekbd3 \
+		gnomehier
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ARGS=	--with-pnpids=${LOCALBASE}/share/libgnome-desktop-3.0/pnp.ids
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--disable-gudev \
+		--disable-systemd \
+		--disable-packagekit
+#--with-pnpids=${LOCALBASE}/share/libgnome-desktop-3.0/pnp.ids
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	PULSEAUDIO "Enable Pulseaudio support" On \
-		CUPS "Enable cups (printing) support" On \
+OPTIONS=	CUPS "Enable cups (printing) support" On \
 		SMARTCARD "Enable smartcard support" On
 
 GLIB_SCHEMAS=	org.gnome.settings-daemon.enums.xml \
 		org.gnome.settings-daemon.peripherals.gschema.xml \
-		org.gnome.settings-daemon.peripherals.wacom.gschema.xml \
 		org.gnome.settings-daemon.plugins.color.gschema.xml \
 		org.gnome.settings-daemon.plugins.gschema.xml \
 		org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
@@ -60,15 +63,6 @@ MAN1=		gnome-settings-daemon.1
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_PULSEAUDIO)
-CONFIGURE_ARGS+=--disable-pulse
-PLIST_SUB+=	PULSEAUDIO="@comment "
-.else
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
-CONFIGURE_ARGS+=--enable-pulse
-PLIST_SUB+=	PULSEAUDIO=""
-.endif
-
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
 PLIST_SUB+=	CUPS=""
diff --git a/sysutils/gnome-settings-daemon3/distinfo b/sysutils/gnome-settings-daemon3/distinfo
index 0af08f14d..35a5e7d40 100644
--- a/sysutils/gnome-settings-daemon3/distinfo
+++ b/sysutils/gnome-settings-daemon3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-settings-daemon-3.2.3.tar.xz) = 53c4d642ec8a4b812ad35c1b4cba7d33e9e4dc90ab135b726219ad9adc4a94b9
-SIZE (gnome3/gnome-settings-daemon-3.2.3.tar.xz) = 1418144
+SHA256 (gnome3/gnome-settings-daemon-3.4.2.tar.xz) = 00499118c80474981f3389ef518e2d001f1b1a3b1fb78e54859d59f3bee38ff4
+SIZE (gnome3/gnome-settings-daemon-3.4.2.tar.xz) = 1430872
diff --git a/sysutils/gnome-settings-daemon3/files/patch-configure b/sysutils/gnome-settings-daemon3/files/patch-configure
new file mode 100644
index 000000000..33634babc
--- /dev/null
+++ b/sysutils/gnome-settings-daemon3/files/patch-configure
@@ -0,0 +1,127 @@
+--- configure.orig	2012-05-17 19:12:52.000000000 +0200
++++ configure	2012-05-17 19:14:21.000000000 +0200
+@@ -19120,99 +19120,6 @@
+ fi
+ 
+ 
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WACOM" >&5
+-$as_echo_n "checking for WACOM... " >&6; }
+-
+-if test -n "$WACOM_CFLAGS"; then
+-    pkg_cv_WACOM_CFLAGS="$WACOM_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwacom >= \$LIBWACOM_REQUIRED_VERSION x11 xi xtst \$GUDEV_PKG gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_WACOM_CFLAGS=`$PKG_CONFIG --cflags "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$WACOM_LIBS"; then
+-    pkg_cv_WACOM_LIBS="$WACOM_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwacom >= \$LIBWACOM_REQUIRED_VERSION x11 xi xtst \$GUDEV_PKG gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_WACOM_LIBS=`$PKG_CONFIG --libs "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        WACOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom" 2>&1`
+-        else
+-	        WACOM_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$WACOM_PKG_ERRORS" >&5
+-
+-	as_fn_error $? "Package requirements (libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom) were not met:
+-
+-$WACOM_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables WACOM_CFLAGS
+-and WACOM_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
+-
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables WACOM_CFLAGS
+-and WACOM_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
+-else
+-	WACOM_CFLAGS=$pkg_cv_WACOM_CFLAGS
+-	WACOM_LIBS=$pkg_cv_WACOM_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-fi
+-
+-
+ have_packagekit=false
+ # Check whether --enable-packagekit was given.
+ if test "${enable_packagekit+set}" = set; then :
+@@ -20045,7 +19952,7 @@
+ fi
+ 
+ 
+-ac_config_files="$ac_config_files Makefile gnome-settings-daemon/Makefile plugins/Makefile plugins/a11y-keyboard/Makefile plugins/a11y-settings/Makefile plugins/automount/Makefile plugins/background/Makefile plugins/clipboard/Makefile plugins/color/Makefile plugins/common/Makefile plugins/cursor/Makefile plugins/dummy/Makefile plugins/power/Makefile plugins/housekeeping/Makefile plugins/keyboard/Makefile plugins/media-keys/Makefile plugins/media-keys/cut-n-paste/Makefile plugins/mouse/Makefile plugins/orientation/Makefile plugins/print-notifications/Makefile plugins/smartcard/Makefile plugins/sound/Makefile plugins/updates/Makefile plugins/wacom/Makefile plugins/xrandr/Makefile plugins/xsettings/Makefile data/Makefile data/gnome-settings-daemon.pc data/gnome-settings-daemon-uninstalled.pc data/org.gnome.settings-daemon.plugins.gschema.xml.in data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in data/org.gnome.settings-daemon.plugins.power.gschema.xml.in data/org.gnome.settings-daemon.plugins.color.gschema.xml.in data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in data/org.gnome.settings-daemon.peripherals.gschema.xml.in data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in po/Makefile.in"
++ac_config_files="$ac_config_files Makefile gnome-settings-daemon/Makefile plugins/Makefile plugins/a11y-keyboard/Makefile plugins/a11y-settings/Makefile plugins/automount/Makefile plugins/background/Makefile plugins/clipboard/Makefile plugins/color/Makefile plugins/common/Makefile plugins/cursor/Makefile plugins/dummy/Makefile plugins/power/Makefile plugins/housekeeping/Makefile plugins/keyboard/Makefile plugins/media-keys/Makefile plugins/media-keys/cut-n-paste/Makefile plugins/mouse/Makefile plugins/orientation/Makefile plugins/print-notifications/Makefile plugins/smartcard/Makefile plugins/sound/Makefile plugins/updates/Makefile plugins/xrandr/Makefile plugins/xsettings/Makefile data/Makefile data/gnome-settings-daemon.pc data/gnome-settings-daemon-uninstalled.pc data/org.gnome.settings-daemon.plugins.gschema.xml.in data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in data/org.gnome.settings-daemon.plugins.keyboard.gschema.xml.in data/org.gnome.settings-daemon.plugins.power.gschema.xml.in data/org.gnome.settings-daemon.plugins.color.gschema.xml.in data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in data/org.gnome.settings-daemon.peripherals.gschema.xml.in data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in po/Makefile.in"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -21211,7 +21118,6 @@
+     "plugins/smartcard/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/smartcard/Makefile" ;;
+     "plugins/sound/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/sound/Makefile" ;;
+     "plugins/updates/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/updates/Makefile" ;;
+-    "plugins/wacom/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/wacom/Makefile" ;;
+     "plugins/xrandr/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/xrandr/Makefile" ;;
+     "plugins/xsettings/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/xsettings/Makefile" ;;
+     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
+@@ -21228,7 +21134,6 @@
+     "data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES data/org.gnome.settings-daemon.plugins.orientation.gschema.xml.in" ;;
+     "data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in" ;;
+     "data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in" ;;
+-    "data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in" ;;
+     "data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES data/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml.in" ;;
+     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
diff --git a/sysutils/gnome-settings-daemon3/files/patch-data_Makefile.in b/sysutils/gnome-settings-daemon3/files/patch-data_Makefile.in
new file mode 100644
index 000000000..563472492
--- /dev/null
+++ b/sysutils/gnome-settings-daemon3/files/patch-data_Makefile.in
@@ -0,0 +1,10 @@
+--- data/Makefile.in.orig	2012-05-17 19:14:40.000000000 +0200
++++ data/Makefile.in	2012-05-17 19:15:36.000000000 +0200
+@@ -347,7 +347,6 @@
+ 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml \
+ 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
+ 	org.gnome.settings-daemon.plugins.print-notifications.gschema.xml \
+-	org.gnome.settings-daemon.peripherals.wacom.gschema.xml \
+ 	org.gnome.settings-daemon.plugins.xrandr.gschema.xml \
+ 	$(am__append_1) $(am__append_3)
+ all_schemas = $(gsettings_SCHEMAS) $(am__append_2) $(am__append_4)
diff --git a/sysutils/gnome-settings-daemon3/files/patch-plugins_Makefile.in b/sysutils/gnome-settings-daemon3/files/patch-plugins_Makefile.in
new file mode 100644
index 000000000..b5587982a
--- /dev/null
+++ b/sysutils/gnome-settings-daemon3/files/patch-plugins_Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/Makefile.in.orig	2012-05-17 19:16:15.000000000 +0200
++++ plugins/Makefile.in	2012-05-17 19:16:25.000000000 +0200
+@@ -314,7 +314,7 @@
+ NULL = 
+ enabled_plugins = a11y-keyboard a11y-settings automount background \
+ 	clipboard color cursor dummy power housekeeping keyboard \
+-	media-keys mouse sound wacom xrandr xsettings $(NULL) \
++	media-keys mouse sound xrandr xsettings $(NULL) \
+ 	$(am__append_1) $(am__append_3) $(am__append_5) \
+ 	$(am__append_7)
+ disabled_plugins = $(NULL) $(am__append_2) $(am__append_4) \
diff --git a/sysutils/gnome-settings-daemon3/pkg-plist b/sysutils/gnome-settings-daemon3/pkg-plist
index 7cb9cbaa0..a548d9640 100644
--- a/sysutils/gnome-settings-daemon3/pkg-plist
+++ b/sysutils/gnome-settings-daemon3/pkg-plist
@@ -1,4 +1,3 @@
-etc/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
 etc/xdg/autostart/gnome-fallback-mount-helper.desktop
 etc/xdg/autostart/gnome-settings-daemon.desktop
 include/gnome-settings-daemon-3.0/gnome-settings-daemon/gnome-settings-plugin.h
@@ -10,7 +9,6 @@ lib/gnome-settings-daemon-3.0/clipboard.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/color.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/cursor.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/keybindings.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/keyboard.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/liba11y-keyboard.a
 lib/gnome-settings-daemon-3.0/liba11y-keyboard.la
@@ -30,18 +28,18 @@ lib/gnome-settings-daemon-3.0/libcolor.so
 lib/gnome-settings-daemon-3.0/libcursor.a
 lib/gnome-settings-daemon-3.0/libcursor.la
 lib/gnome-settings-daemon-3.0/libcursor.so
+lib/gnome-settings-daemon-3.0/libgsd.a
+lib/gnome-settings-daemon-3.0/libgsd.la
+lib/gnome-settings-daemon-3.0/libgsd.so
 lib/gnome-settings-daemon-3.0/libhousekeeping.a
 lib/gnome-settings-daemon-3.0/libhousekeeping.la
 lib/gnome-settings-daemon-3.0/libhousekeeping.so
-lib/gnome-settings-daemon-3.0/libkeybindings.a
-lib/gnome-settings-daemon-3.0/libkeybindings.la
-lib/gnome-settings-daemon-3.0/libkeybindings.so
 lib/gnome-settings-daemon-3.0/libkeyboard.a
 lib/gnome-settings-daemon-3.0/libkeyboard.la
 lib/gnome-settings-daemon-3.0/libkeyboard.so
-%%PULSEAUDIO%%lib/gnome-settings-daemon-3.0/libmedia-keys.a
-%%PULSEAUDIO%%lib/gnome-settings-daemon-3.0/libmedia-keys.la
-%%PULSEAUDIO%%lib/gnome-settings-daemon-3.0/libmedia-keys.so
+lib/gnome-settings-daemon-3.0/libmedia-keys.a
+lib/gnome-settings-daemon-3.0/libmedia-keys.la
+lib/gnome-settings-daemon-3.0/libmedia-keys.so
 lib/gnome-settings-daemon-3.0/libmouse.a
 lib/gnome-settings-daemon-3.0/libmouse.la
 lib/gnome-settings-daemon-3.0/libmouse.so
@@ -57,34 +55,27 @@ lib/gnome-settings-daemon-3.0/libpower.so
 lib/gnome-settings-daemon-3.0/libsound.a
 lib/gnome-settings-daemon-3.0/libsound.la
 lib/gnome-settings-daemon-3.0/libsound.so
-lib/gnome-settings-daemon-3.0/libwacom.a
-lib/gnome-settings-daemon-3.0/libwacom.la
-lib/gnome-settings-daemon-3.0/libwacom.so
 lib/gnome-settings-daemon-3.0/libxrandr.a
 lib/gnome-settings-daemon-3.0/libxrandr.la
 lib/gnome-settings-daemon-3.0/libxrandr.so
 lib/gnome-settings-daemon-3.0/libxsettings.a
 lib/gnome-settings-daemon-3.0/libxsettings.la
 lib/gnome-settings-daemon-3.0/libxsettings.so
-%%PULSEAUDIO%%lib/gnome-settings-daemon-3.0/media-keys.gnome-settings-plugin
+lib/gnome-settings-daemon-3.0/media-keys.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/power.gnome-settings-plugin
 %%CUPS%%lib/gnome-settings-daemon-3.0/print-notifications.gnome-settings-plugin
 %%SMARTCARD%%lib/gnome-settings-daemon-3.0/smartcard.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/sound.gnome-settings-plugin
-lib/gnome-settings-daemon-3.0/wacom.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/xrandr.gnome-settings-plugin
 lib/gnome-settings-daemon-3.0/xsettings.gnome-settings-plugin
 libdata/pkgconfig/gnome-settings-daemon.pc
 libexec/gnome-fallback-mount-helper
 libexec/gnome-settings-daemon
-libexec/gsd-backlight-helper
-libexec/gsd-datetime-mechanism
 libexec/gsd-locate-pointer
 libexec/gsd-printer
 share/GConf/gsettings/gnome-settings-daemon.convert
 share/dbus-1/services/org.gnome.SettingsDaemon.service
-share/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
 share/gnome-settings-daemon-3.0/input-device-example.sh
 %%DATADIR%%/gsd-a11y-preferences-dialog.ui
 %%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-off.png
@@ -190,7 +181,6 @@ share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
 share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
 share/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
-share/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES