summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc/colord')
-rw-r--r--x11-misc/colord/Manifest3
-rw-r--r--x11-misc/colord/colord-1.3.5.ebuild185
-rw-r--r--x11-misc/colord/colord-1.4.7-r1.ebuild (renamed from x11-misc/colord/colord-1.4.5-r1.ebuild)84
-rw-r--r--x11-misc/colord/files/1.4.5-optional-introspection.patch64
-rw-r--r--x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch39
-rw-r--r--x11-misc/colord/files/colord-1.4.7-systemd-permissions.patch51
-rw-r--r--x11-misc/colord/metadata.xml7
7 files changed, 97 insertions, 336 deletions
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index b954e9b2b184..d4d19bcb59ed 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,2 +1 @@
-DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
-DIST colord-1.4.5.tar.xz 1869084 BLAKE2B 34c886bade6f71b0b81bbed216695d839873fba46423f6422b80ef2f62e88a403edd1686bb705ef78bcaeb352477e0581d784ccd388961cd42d880661b4b31ab SHA512 b6cc8087ceff4a99b7d764087208cc72e1219d9f6bb52bd3e3eb13bb62e3c1e99aefef36237dceff46925ab7680c76795f59057b7a4d1c8a123de6270708e03c
+DIST colord-1.4.7.tar.xz 1799168 BLAKE2B f4434ec817fc2afc1ade144f533d2c3b98117356677b5962ff95b566a8c66b6b8ce95ec8f76b3ae849a6468000dc08b8f8fc207c2cc9c85a966157fb1612078e SHA512 d8a23899c038af980f1b257eace68b682c3f5592d19e2ae1044da749371694052c00e58e4754ebb6ee2f7900b0ef44c01be5fcf857294813c07af94ffbf6d0be
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
deleted file mode 100644
index e8a2b5c59e3d..000000000000
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit bash-completion-r1 check-reqs gnome2 systemd udev vala multilib-minimal toolchain-funcs
-
-DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="https://www.freedesktop.org/software/colord/"
-SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-
-# We prefer policykit enabled by default, bug #448058
-IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
-REQUIRED_USE="
- gusb? ( udev )
- scanner? ( udev )
- vala? ( introspection )
-"
-
-DEPEND="
- dev-db/sqlite:3=[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
- >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
- argyllcms? ( media-gfx/argyllcms )
- gusb? ( >=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
- policykit? ( >=sys-auth/polkit-0.104 )
- scanner? (
- media-gfx/sane-backends
- sys-apps/dbus
- )
- systemd? ( >=sys-apps/systemd-44:0= )
- udev? (
- dev-libs/libgudev:=[${MULTILIB_USEDEP}]
- virtual/libudev:=[${MULTILIB_USEDEP}]
- virtual/udev
- )
-"
-RDEPEND="${DEPEND}
- acct-group/colord
- acct-user/colord
- !<=media-gfx/colorhug-client-0.1.13
- !media-gfx/shared-color-profiles
-"
-BDEPEND="
- acct-group/colord
- acct-user/colord
- dev-libs/libxslt
- >=dev-util/gtk-doc-am-1.9
- >=dev-util/intltool-0.35
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- extra-print-profiles? ( media-gfx/argyllcms )
- vala? ( $(vala_depend) )
-"
-# These dependencies are required to build native build-time programs.
-BDEPEND="${BDEPEND}
- dev-libs/glib:2
- media-libs/lcms
-"
-
-# FIXME: needs pre-installed dbus service files
-RESTRICT="test"
-
-# According to upstream comment in colord.spec.in, building the extra print
-# profiles requires >=4G of memory
-CHECKREQS_MEMORY="4G"
-
-pkg_pretend() {
- use extra-print-profiles && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- use extra-print-profiles && check-reqs_pkg_setup
-}
-
-src_prepare() {
- # Adapt to Gentoo paths
- sed -i -e 's/spotread/argyll-spotread/' \
- src/sensors/cd-sensor-argyll.c \
- configure.ac || die
-
- use vala && vala_src_prepare
- gnome2_src_prepare
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- if multilib_is_native_abi && tc-is-cross-compiler; then
- mkdir -p "${S}-native"
- pushd "${S}-native" >/dev/null 2>&1 || die
- ECONF_SOURCE="${S}" econf_build --enable-static \
- --disable-{argyllcms-sensor,print-profiles,shared,udev} \
- {BASH_COMPLETION,GUDEV,GUSB,POLKIT,SQLITE,UDEV}_{CFLAG,LIB}S=-DSKIP
- popd >/dev/null 2>&1 || die
- fi
-
- # Reverse tools require gusb
- # bash-completion test does not work on gentoo
- local myconf=(
- --disable-bash-completion
- --disable-examples
- --disable-static
- --enable-libcolordcompat
- --with-daemon-user=colord
- --localstatedir="${EPREFIX}"/var
- $(multilib_native_use_enable argyllcms argyllcms-sensor)
- $(multilib_native_use_enable extra-print-profiles print-profiles)
- $(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
- $(use_enable gusb)
- $(multilib_native_use_enable gusb reverse)
- $(multilib_native_use_enable introspection)
- $(multilib_native_use_enable policykit polkit)
- $(multilib_native_use_enable scanner sane)
- $(multilib_native_use_enable systemd systemd-login)
- $(use_enable udev)
- --with-udevrulesdir="$(get_udevdir)"/rules.d
- $(multilib_native_use_enable vala)
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- )
-
- ECONF_SOURCE=${S} \
- gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- if tc-is-cross-compiler; then
- emake -C "${S}-native/lib/colord" libcolord.la
- emake -C "${S}-native/client" cd-create-profile cd-it8
- emake \
- CD_CREATE_PROFILE="${S}-native/client/cd-create-profile" \
- CD_IT8="${S}-native/client/cd-it8"
- else
- emake
- fi
- else
- emake -C lib/colord
- use gusb && emake -C lib/colorhug
- emake -C lib/compat
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi; then
- default
- else
- emake -C lib/colord check
- use gusb && emake -C lib/colorhug check
- emake -C lib/compat check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- gnome2_src_install
- else
- gnome2_src_install -j1 -C lib/colord
- use gusb && gnome2_src_install -j1 -C lib/colorhug
- gnome2_src_install -j1 -C lib/compat
- gnome2_src_install -j1 -C contrib/session-helper install-libcolord_includeHEADERS
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- newbashcomp data/colormgr colormgr
-
- # Ensure config and profile directories exist and /var/lib/colord/*
- # is writable by colord user
- keepdir /var/lib/color{,d}/icc
- fowners colord:colord /var/lib/colord{,/icc}
-
- if use examples; then
- docinto examples
- dodoc examples/*.c
- fi
-}
diff --git a/x11-misc/colord/colord-1.4.5-r1.ebuild b/x11-misc/colord/colord-1.4.7-r1.ebuild
index a3b707ebd6d4..ed40a24f368b 100644
--- a/x11-misc/colord/colord-1.4.5-r1.ebuild
+++ b/x11-misc/colord/colord-1.4.7-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
VALA_USE_DEPEND="vapigen"
-inherit bash-completion-r1 meson multilib-minimal systemd udev vala
+inherit bash-completion-r1 meson-multilib tmpfiles udev vala
DESCRIPTION="System service to accurately color manage input and output devices"
HOMEPAGE="https://www.freedesktop.org/software/colord/"
@@ -12,58 +12,61 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner systemd test +udev vala"
+IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner selinux systemd test vala"
RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp
-REQUIRED_USE="
- scanner? ( udev )
- vala? ( introspection )
-"
+REQUIRED_USE="vala? ( introspection )"
DEPEND="
>=dev-libs/glib-2.58.0:2[${MULTILIB_USEDEP}]
>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
dev-db/sqlite:3=[${MULTILIB_USEDEP}]
>=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}]
- udev? (
- dev-libs/libgudev:=[${MULTILIB_USEDEP}]
- virtual/libudev:=[${MULTILIB_USEDEP}]
- virtual/udev
- )
+
+ dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+ virtual/libudev:=[${MULTILIB_USEDEP}]
+ virtual/udev
+
systemd? ( >=sys-apps/systemd-44:0= )
scanner? (
media-gfx/sane-backends
sys-apps/dbus
)
- >=sys-auth/polkit-0.104
+ >=sys-auth/polkit-0.114
argyllcms? ( media-gfx/argyllcms )
- introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+ introspection? ( >=dev-libs/gobject-introspection-1.56:= )
"
RDEPEND="${DEPEND}
acct-group/colord
acct-user/colord
+ selinux? ( sec-policy/selinux-colord )
"
BDEPEND="
acct-group/colord
acct-user/colord
app-text/docbook-xsl-ns-stylesheets
dev-libs/libxslt
- >=dev-util/intltool-0.35
>=sys-devel/gettext-0.17
virtual/pkgconfig
extra-print-profiles? ( media-gfx/argyllcms )
+ gtk-doc? (
+ dev-util/gtk-doc
+ app-text/docbook-xml-dtd:4.1.2
+ )
vala? ( $(vala_depend) )
"
PATCHES=(
- "${FILESDIR}"/${PV}-tests-Don-t-use-exact-floating-point-comparisons.patch
- "${FILESDIR}"/${PV}-optional-introspection.patch
+ "${FILESDIR}"/${PN}-1.4.7-systemd-permissions.patch
)
+pkg_setup() {
+ use vala && vala_setup
+}
+
src_prepare() {
default
- use vala && vala_src_prepare
# Test requires a running session
# https://github.com/hughsie/colord/issues/94
@@ -83,40 +86,26 @@ src_prepare() {
multilib_src_configure() {
local emesonargs=(
- -Ddaemon=$(multilib_is_native_abi && echo true || echo false)
- -Dexamples=false
+ $(meson_native_true daemon)
-Dbash_completion=false
- $(meson_use udev udev_rules)
- -Dsystemd=$(multilib_native_usex systemd true false)
+ $(meson_native_true udev_rules) # Install udev rules only from native build
+ $(meson_native_use_bool systemd)
-Dlibcolordcompat=true
- -Dargyllcms_sensor=$(multilib_native_usex argyllcms true false)
- -Dreverse=false
- -Dsane=$(multilib_native_usex scanner true false)
- -Dintrospection=$(multilib_native_usex introspection true false)
- -Dvapi=$(multilib_native_usex vala true false)
- -Dprint_profiles=$(multilib_native_usex extra-print-profiles true false)
+ $(meson_native_use_bool argyllcms argyllcms_sensor)
+ $(meson_native_use_bool scanner sane)
+ $(meson_native_use_bool introspection)
+ $(meson_native_use_bool vala vapi)
+ $(meson_native_use_bool extra-print-profiles print_profiles)
$(meson_use test tests)
-Dinstalled_tests=false
-Ddaemon_user=colord
- -Dman=true
+ $(meson_native_true man)
$(meson_use gtk-doc docs)
--localstatedir="${EPREFIX}"/var
)
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_test() {
- meson_src_test
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
multilib_src_install_all() {
newbashcomp data/colormgr colormgr
@@ -130,3 +119,12 @@ multilib_src_install_all() {
dodoc examples/*.c
fi
}
+
+pkg_postinst() {
+ udev_reload
+ tmpfiles_process colord.conf
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/x11-misc/colord/files/1.4.5-optional-introspection.patch b/x11-misc/colord/files/1.4.5-optional-introspection.patch
deleted file mode 100644
index 8bc4580bebe3..000000000000
--- a/x11-misc/colord/files/1.4.5-optional-introspection.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From e73723cabe4d5a2e2b281d2f1ea751b2d75bccc6 Mon Sep 17 00:00:00 2001
-From: David Michael <fedora.dm0@gmail.com>
-Date: Fri, 30 Apr 2021 16:28:17 -0400
-Subject: [PATCH] build: Make introspection optional in meson
-
-It defaults to enabled to preserve existing behavior.
----
- lib/colord/meson.build | 2 ++
- lib/colorhug/meson.build | 2 ++
- meson_options.txt | 1 +
- 3 files changed, 5 insertions(+)
-
-diff --git a/lib/colord/meson.build b/lib/colord/meson.build
-index dbb3d196..fe9d1cdb 100644
---- a/lib/colord/meson.build
-+++ b/lib/colord/meson.build
-@@ -146,6 +146,7 @@ pkgg.generate(
- description : 'colord is a system daemon for managing color devices',
- )
-
-+if get_option('introspection')
- libcolord_girtarget = gnome.generate_gir(colord,
- sources : [
- 'cd-client.c',
-@@ -202,6 +203,7 @@ libcolord_girtarget = gnome.generate_gir(colord,
- )
- libcolord_gir = libcolord_girtarget[0]
- libcolord_typelib = libcolord_girtarget[1]
-+endif
-
- if get_option('vapi')
- gnome.generate_vapi('colord',
-diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build
-index 9526ea4d..c0ce2887 100644
---- a/lib/colorhug/meson.build
-+++ b/lib/colorhug/meson.build
-@@ -73,6 +73,7 @@ pkgg.generate(
- description : 'ColorHug is a simple display hardware colorimeter',
- )
-
-+if get_option('introspection')
- libcolorhug_gir = gnome.generate_gir(colorhug,
- sources : [
- 'ch-common.c',
-@@ -107,6 +108,7 @@ libcolorhug_gir = gnome.generate_gir(colorhug,
- ],
- install : true
- )
-+endif
-
- if get_option('tests')
- e = executable(
-diff --git a/meson_options.txt b/meson_options.txt
-index c184898e..10517622 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -7,6 +7,7 @@ option('systemd', type : 'boolean', value : true, description : 'Enable systemd
- option('argyllcms_sensor', type : 'boolean', value : true, description : 'Enable ArgllCMS sensor')
- option('reverse', type : 'boolean', value : false, description : 'Enable reverse engineering tools')
- option('sane', type : 'boolean', value : false, description : 'Enable SANE support')
-+option('introspection', type : 'boolean', value : true, description : 'Build gobject-introspection typelib files')
- option('vapi', type : 'boolean', value : false, description : 'Build vala bindings')
- option('print_profiles', type : 'boolean', value : false, description : 'Build extra print profiles')
- option('tests', type : 'boolean', value : true, description : 'Build self tests')
diff --git a/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch b/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch
deleted file mode 100644
index de56fe145440..000000000000
--- a/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d68cd11cd31d379e4f3bb4c964b17fd50c8c54a6 Mon Sep 17 00:00:00 2001
-From: Christopher James Halse Rogers <raof@ubuntu.com>
-Date: Wed, 11 Nov 2020 17:13:19 +1100
-Subject: [PATCH] tests: Don't use exact floating point comparisons.
-
-The tests asserting that cd_icc_get_version are exactly equal to 3.4 or
-2.09 fail on (at least) i386, armel, and s390x because floating point is
-hateful.
-
-Signed-off-by: Christopher James Halse Rogers <raof@ubuntu.com>
----
- lib/colord/cd-test-private.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/colord/cd-test-private.c b/lib/colord/cd-test-private.c
-index 4b16ca5..231c4ae 100644
---- a/lib/colord/cd-test-private.c
-+++ b/lib/colord/cd-test-private.c
-@@ -1494,7 +1494,7 @@ colord_icc_func (void)
- /* check profile properties */
- g_assert_cmpint (cd_icc_get_size (icc), ==, 25244);
- g_assert_cmpstr (cd_icc_get_checksum (icc), ==, "9ace8cce8baac8d492a93a2a232d7702");
-- g_assert_cmpfloat (cd_icc_get_version (icc), ==, 3.4);
-+ g_assert_cmpfloat_with_epsilon (cd_icc_get_version (icc), 3.4, 0.01);
- g_assert (g_str_has_suffix (cd_icc_get_filename (icc), "ibm-t61.icc"));
- g_assert_cmpint (cd_icc_get_kind (icc), ==, CD_PROFILE_KIND_DISPLAY_DEVICE);
- g_assert_cmpint (cd_icc_get_colorspace (icc), ==, CD_COLORSPACE_RGB);
-@@ -1727,7 +1727,7 @@ colord_icc_save_func (void)
- g_object_unref (file);
-
- /* verify changed values */
-- g_assert_cmpfloat (cd_icc_get_version (icc), ==, 2.09);
-+ g_assert_cmpfloat_with_epsilon (cd_icc_get_version (icc), 2.09, 0.001);
- g_assert_cmpint (cd_icc_get_kind (icc), ==, CD_PROFILE_KIND_OUTPUT_DEVICE);
- g_assert_cmpint (cd_icc_get_colorspace (icc), ==, CD_COLORSPACE_XYZ);
- g_assert_cmpstr (cd_icc_get_metadata_item (icc, "SelfTest"), ==, "true");
---
-2.26.3
-
diff --git a/x11-misc/colord/files/colord-1.4.7-systemd-permissions.patch b/x11-misc/colord/files/colord-1.4.7-systemd-permissions.patch
new file mode 100644
index 000000000000..0a97d8ac579d
--- /dev/null
+++ b/x11-misc/colord/files/colord-1.4.7-systemd-permissions.patch
@@ -0,0 +1,51 @@
+https://github.com/hughsie/colord/commit/08a32b2379fb5582f4312e59bf51a2823df56276
+https://github.com/hughsie/colord/commit/9283abd9c00468edb94d2a06d6fa3681cae2700d
+
+From 08a32b2379fb5582f4312e59bf51a2823df56276 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 29 Jan 2024 10:37:11 +0000
+Subject: [PATCH] Fix writing to the database with ProtectSystem=strict
+
+Fixes https://github.com/hughsie/colord/issues/166
+--- a/data/colord.service.in
++++ b/data/colord.service.in
+@@ -17,6 +17,10 @@ ProtectControlGroups=true
+ RestrictRealtime=true
+ RestrictAddressFamilies=AF_UNIX
+
++ConfigurationDirectory=colord
++StateDirectory=colord
++CacheDirectory=colord
++
+ # drop all capabilities
+ CapabilityBoundingSet=~CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_IPC_OWNER CAP_NET_ADMIN CAP_SYS_RAWIO CAP_SYS_TIME CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE CAP_KILL CAP_MKNOD CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_RESOURCE CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_SYS_BOOT CAP_LINUX_IMMUTABLE CAP_IPC_LOCK CAP_SYS_CHROOT CAP_BLOCK_SUSPEND CAP_LEASE CAP_SYS_PACCT CAP_SYS_TTY_CONFIG CAP_WAKE_ALARM
+
+
+From 9283abd9c00468edb94d2a06d6fa3681cae2700d Mon Sep 17 00:00:00 2001
+From: Ferdinand Bachmann <ferdinand.bachmann@yrlf.at>
+Date: Tue, 30 Jan 2024 12:44:18 +0100
+Subject: [PATCH] Fix USB scanners not working with RestrictAddressFamilies
+
+colord-sane scanner drivers using libusb can't initialize properly with
+RestrictAddressFamilies set to AF_UNIX. Remove that line to ensure those
+can work properly.
+
+This also avoids a crash in HPLIP due to unchecked calls to libusb_init().
+
+Fixes #165
+---
+ data/colord.service.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/colord.service.in b/data/colord.service.in
+index c358dc4b..45ec5811 100644
+--- a/data/colord.service.in
++++ b/data/colord.service.in
+@@ -15,7 +15,6 @@ ProtectKernelModules=true
+ ProtectKernelLogs=true
+ ProtectControlGroups=true
+ RestrictRealtime=true
+-RestrictAddressFamilies=AF_UNIX
+
+ ConfigurationDirectory=colord
+ StateDirectory=colord
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
index 2ca10f47e351..3e7d77091c27 100644
--- a/x11-misc/colord/metadata.xml
+++ b/x11-misc/colord/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
@@ -9,7 +9,8 @@
<flag name="argyllcms">Enable ArgyllCMS sensor</flag>
<flag name="extra-print-profiles">Generate extra print profiles.
Warning: significant build time and memory requirements.</flag>
- <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support, needed for
- colorimeter drivers</flag>
</use>
+ <upstream>
+ <remote-id type="github">hughsie/colord</remote-id>
+ </upstream>
</pkgmetadata>