gistfile0.txt

diff --git graphics/colord/Makefile graphics/colord/Makefile
index 453e8ae729ca..dd5138608834 100644
--- graphics/colord/Makefile
+++ graphics/colord/Makefile
@@ -12,8 +12,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libgusb.so:devel/libgusb \
 		libgudev-1.0.so:devel/libgudev \
-		liblcms2.so:graphics/lcms2 \
-		libpolkit-gobject-1.so:sysutils/polkit
+		liblcms2.so:graphics/lcms2
 RUN_DEPENDS=	hwdata>0:misc/hwdata
 
 USERS=		colord
@@ -36,12 +35,13 @@ INSTALL_TARGET=	install-strip
 GLIB_SCHEMAS=	org.freedesktop.ColorHelper.gschema.xml
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	DOCS COMPLETION MANPAGES PPROFILES SANE SENSOR TESTS VALA
-OPTIONS_DEFAULT=COMPLETION MANPAGES VALA TESTS
+OPTIONS_DEFINE=	DOCS COMPLETION MANPAGES POLKIT PPROFILES SANE SENSOR TESTS VALA
+OPTIONS_DEFAULT=COMPLETION MANPAGES POLKIT VALA TESTS
 
 COMPLETION_DESC=Build and install shell completions
 PPROFILES_DESC=	Build extra print profiles (long build time)
 SANE_DESC=	Enable SANE support
+POLKIT_DESC=	Build with Polkit support
 SENSOR_DESC=	Enable ArgyllCMS sensor
 TESTS_DESC=	Build self tests
 VALA_DESC=	Build Vala language bindings
@@ -54,11 +54,11 @@ SANE_MESON_TRUE=		sane
 SENSOR_MESON_TRUE=		argyllcms_sensor
 TESTS_MESON_TRUE=		tests
 VALA_MESON_TRUE=		vapi
+POLKIT_MESON_TRUE=		daemon
 
 COMPLETION_BUILD_DEPENDS=	bash-completion>=2.0:shells/bash-completion
 DOCS_BUILD_DEPENDS=		gtkdoc-scan:textproc/gtk-doc
 POLKIT_LIB_DEPENDS=		libpolkit-gobject-1.so:sysutils/polkit
-POLKIT_CONFIGURE_ENABLE=	polkit
 MANPAGES_BUILD_DEPENDS=		xsltproc:textproc/libxslt \
 				docbook-xsl-ns>0:textproc/docbook-xsl-ns
 SANE_LIB_DEPENDS=		libsane.so:graphics/sane-backends
diff --git graphics/colord/pkg-plist graphics/colord/pkg-plist
index dec0bdf7279a..d690f70cdfbb 100644
--- graphics/colord/pkg-plist
+++ graphics/colord/pkg-plist
@@ -43,13 +43,13 @@ include/colord-1/colorhug/ch-version.h
 include/colord-1/colorhug/colorhug.h
 %%SENSOR%%lib/colord-sensors/libcolord_sensor_argyll.a
 %%SENSOR%%lib/colord-sensors/libcolord_sensor_argyll.so
-lib/colord-plugins/libcolord_sensor_camera.so
-lib/colord-plugins/libcolord_sensor_scanner.so
+%%POLKIT%%lib/colord-plugins/libcolord_sensor_camera.so
+%%POLKIT%%lib/colord-plugins/libcolord_sensor_scanner.so
 %%SANE%%lib/colord-plugins/libcolord_sensor_sane.so
-lib/colord-sensors/libcolord_sensor_dtp94.so
-lib/colord-sensors/libcolord_sensor_colorhug.so
-lib/colord-sensors/libcolord_sensor_dummy.so
-lib/colord-sensors/libcolord_sensor_huey.so
+%%POLKIT%%lib/colord-sensors/libcolord_sensor_colorhug.so
+%%POLKIT%%lib/colord-sensors/libcolord_sensor_dtp94.so
+%%POLKIT%%lib/colord-sensors/libcolord_sensor_dummy.so
+%%POLKIT%%lib/colord-sensors/libcolord_sensor_huey.so
 lib/girepository-1.0/Colord-1.0.typelib
 lib/girepository-1.0/Colorhug-1.0.typelib
 lib/libcolord.so
@@ -65,7 +65,7 @@ lib/libcolordprivate.so.2.0.5
 @comment lib/systemd/user/colord-session.service
 libdata/pkgconfig/colord.pc
 libdata/pkgconfig/colorhug.pc
-libexec/colord
+%%POLKIT%%libexec/colord
 libexec/colord-session
 %%SANE%%libexec/colord-sane
 %%MANPAGES%%man/man1/cd-create-profile.1.gz
@@ -160,10 +160,10 @@ share/color/icc/colord/x11-colors.icc
 %%DATADIR%%/ti1/printer-normal.ti1
 %%DATADIR%%/ti1/printer-short.ti1
 share/dbus-1/interfaces/org.freedesktop.ColorHelper.xml
-share/dbus-1/interfaces/org.freedesktop.ColorManager.Device.xml
-share/dbus-1/interfaces/org.freedesktop.ColorManager.Profile.xml
-share/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml
-share/dbus-1/interfaces/org.freedesktop.ColorManager.xml
+%%POLKIT%%share/dbus-1/interfaces/org.freedesktop.ColorManager.Device.xml
+%%POLKIT%%share/dbus-1/interfaces/org.freedesktop.ColorManager.Profile.xml
+%%POLKIT%%share/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml
+%%POLKIT%%share/dbus-1/interfaces/org.freedesktop.ColorManager.xml
 share/dbus-1/services/org.freedesktop.ColorHelper.service
 share/dbus-1/system-services/org.freedesktop.ColorManager.service
 share/dbus-1/system.d/org.freedesktop.ColorManager.conf
@@ -221,7 +221,7 @@ share/locale/tr/LC_MESSAGES/colord.mo
 share/locale/uk/LC_MESSAGES/colord.mo
 share/locale/zh_CN/LC_MESSAGES/colord.mo
 share/locale/zh_TW/LC_MESSAGES/colord.mo
-share/polkit-1/actions/org.freedesktop.color.policy
+%%POLKIT%%share/polkit-1/actions/org.freedesktop.color.policy
 %%VALA%%share/vala/vapi/colord.vapi
 %%VALA%%share/vala/vapi/colord.deps
 @dir(colord,colord,0755) /var/db/colord/icc