gentoo resync : 15.06.2021

4 files changed, 199 insertions, 22 deletions

diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 5772c4efa8b1..41af0be5d21a 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,5 +1,7 @@
 AUX 1.4.5-optional-introspection.patch 2436 BLAKE2B d2572caf95e94e12f64a1a15bdb2f686a0fc5196cd29b66f2ff7f312bd904167442b60e6cce05c738ffec0c06ed8da280e6738082afca2a9117576fcafd5f0a8 SHA512 46a0b28dccb54adfe562f3f5763ae6160588be7ce7d4bd6f691d15e4df3007d08a28c1c4f787abe05eb37ae5d07a058021553989c584180c924e6ab4a6a06016
 AUX 1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch 1768 BLAKE2B b8620120b46b9095235d33d92a862971ed6d3944ed7cdbfb44eb161104e96c571327965267ee8de10cfac71fa3956639f87c6d16dde81571f5f2e0c7db073779 SHA512 ca08f1325fde85da14f7a348df054ff47bc2a008f57f33c7cb8a8f60394bdb453da1e94402bc69cd16a9ac4899f0b75766b879b1a1cd8217b39557d4a3856158
+DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
 DIST colord-1.4.5.tar.xz 1869084 BLAKE2B 34c886bade6f71b0b81bbed216695d839873fba46423f6422b80ef2f62e88a403edd1686bb705ef78bcaeb352477e0581d784ccd388961cd42d880661b4b31ab SHA512 b6cc8087ceff4a99b7d764087208cc72e1219d9f6bb52bd3e3eb13bb62e3c1e99aefef36237dceff46925ab7680c76795f59057b7a4d1c8a123de6270708e03c
-EBUILD colord-1.4.5-r1.ebuild 3658 BLAKE2B 374af8d4a2918a98111c5cbb87444083dd0e5dbc2fbe0ce1009f4ab5a6c1f9b12dbec62ceff65d0df3ce1494c1b897e83c2e9a82281f694a2036455186dcae5b SHA512 21e5c65efb78d1b9d8b562e1404e6775f4048ad89786661d11dd0839e83ad42e47c233cfc7be63622443a7dd4451c1f9582ab17b6f5298d76749da4c7a2e0853
-MISC metadata.xml 458 BLAKE2B 3816fee30547f80623e541e6557a7b07111bdd5490a0bd39a85e0361ac1c65480d76072eb97874e77a554123867085779aeaeeda59445495801fb6de2cb6ec08 SHA512 c51de7dcc0ddbe4a4504fc2494d0c5571e662ce3bda84e8686cbef34a92f44be9c3d220cd302e7677a2d23e25a842e94fa970d378153bd56bbd919d014cd683d
+EBUILD colord-1.3.5.ebuild 5020 BLAKE2B 0bf726b3dceb24289e27ff1db60e5bf02fa350b52e271539a101cb422d2beaa4a4014e2421c8842755d65991e4c26651234ecb0e15ffe3d0659fe51d9f436e85 SHA512 7d2050a8f9bd884498770ace429edc8c3fffa556f9bcd3861e17531988112b6e461a6b76cd0a1eb2d3ad95f1e01d493416ead82faa2aefcfd3a92ce6833a2805
+EBUILD colord-1.4.5-r1.ebuild 3387 BLAKE2B ef98fae5639f7cd664aa89c871a206655d3baf243a46e647cebc301374cee84bb22d84d122fbfd3410e6d014baf3b9960a7064af69a97bf944aad330ef522795 SHA512 f6b19a52fe55567fee8bc4b9d128652202d4739ef787e425088e59f3cdda8543f80139ad3d2cf74e7fa2bdcd509551fbf0930fd5db92aa96a755995af95f22a0
+MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
new file mode 100644
index 000000000000..e8a2b5c59e3d
--- /dev/null
+++ b/x11-misc/colord/colord-1.3.5.ebuild
@@ -0,0 +1,185 @@
+# 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.5-r1.ebuild
index 16edd7929b58..6431f775af63 100644
--- a/x11-misc/colord/colord-1.4.5-r1.ebuild
+++ b/x11-misc/colord/colord-1.4.5-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 VALA_USE_DEPEND="vapigen"
 
-inherit bash-completion-r1 meson multilib-minimal systemd udev vala
+inherit bash-completion-r1 meson-multilib systemd udev vala
 
 DESCRIPTION="System service to accurately color manage input and output devices"
 HOMEPAGE="https://www.freedesktop.org/software/colord/"
@@ -83,18 +83,18 @@ src_prepare() {
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Ddaemon=$(multilib_is_native_abi && echo true || echo false)
+		$(meson_native_true daemon)
 		-Dexamples=false
 		-Dbash_completion=false
 		$(meson_use udev udev_rules)
-		-Dsystemd=$(multilib_native_usex systemd true false)
+		$(meson_native_use_bool systemd)
 		-Dlibcolordcompat=true
-		-Dargyllcms_sensor=$(multilib_native_usex argyllcms true false)
+		$(meson_native_use_bool argyllcms argyllcms_sensor)
 		-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 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
@@ -105,18 +105,6 @@ multilib_src_configure() {
 	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
 
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
index 5a2462430db0..2ca10f47e351 100644
--- a/x11-misc/colord/metadata.xml
+++ b/x11-misc/colord/metadata.xml
@@ -9,5 +9,7 @@
 		<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>
 </pkgmetadata>