gentoo resync : 22.01.2021

2 files changed, 38 insertions, 14 deletions

diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 5bae2ef20dd6..ca1481185270 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,3 @@
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
-EBUILD colord-1.3.5.ebuild 4321 BLAKE2B 4b9ba5bc30c9f42704592e76f1f602be29ac070e882599966489f70e3ad3462d7672603a0d1b5dc5c4bd612dc8a566b2643bc64aa1fef6fd2ad452a572256814 SHA512 8d35d6d714b1992d316fcf11cbe0ad4020efa8b09741a3577daf3012b64f628e175cc2e2900d86465327417687604a1cdf885d0a065201f9db79de0b4bbf490d
+EBUILD colord-1.3.5.ebuild 5021 BLAKE2B 9e9b880d6dbc6dead5a179d1e45c8ffef2289b9598c1b3184bb0a7c3411fc038620b50f5cba33c90318a83e49986c2b2cabf4a3f1b707f100cad8224ef639fd7 SHA512 140f21ccfc2195226b35a225c97d03ecaf8622bc7b1c4f650a2a7885a96bee6d5b5f0d6369d1bd81c6d959c53514b3a6c102e8261ec5ff5176f77cd8baa027af
 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
index ad4394daeb79..a58726ebee66 100644
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ b/x11-misc/colord/colord-1.3.5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
+GNOME2_EAUTORECONF="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 check-reqs gnome2 user systemd udev vala multilib-minimal
+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/"
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	vala? ( introspection )
 "
 
-COMMON_DEPEND="
+DEPEND="
 	dev-db/sqlite:3=[${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
 	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
@@ -33,19 +33,24 @@ COMMON_DEPEND="
 	policykit? ( >=sys-auth/polkit-0.104 )
 	scanner? (
 		media-gfx/sane-backends
-		sys-apps/dbus )
+		sys-apps/dbus
+	)
 	systemd? ( >=sys-apps/systemd-44:0= )
 	udev? (
 		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
-		virtual/udev
 		virtual/libudev:=[${MULTILIB_USEDEP}]
+		virtual/udev
 	)
 "
-RDEPEND="${COMMON_DEPEND}
-	!media-gfx/shared-color-profiles
+RDEPEND="${DEPEND}
+	acct-group/colord
+	acct-user/colord
 	!<=media-gfx/colorhug-client-0.1.13
+	!media-gfx/shared-color-profiles
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
+	acct-group/colord
+	acct-user/colord
 	dev-libs/libxslt
 	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.35
@@ -54,6 +59,11 @@ DEPEND="${COMMON_DEPEND}
 	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"
@@ -68,8 +78,6 @@ pkg_pretend() {
 
 pkg_setup() {
 	use extra-print-profiles && check-reqs_pkg_setup
-	enewgroup colord
-	enewuser colord -1 -1 /var/lib/colord colord
 }
 
 src_prepare() {
@@ -78,13 +86,21 @@ src_prepare() {
 		src/sensors/cd-sensor-argyll.c \
 		configure.ac || die
 
-	eautoreconf
 	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=(
@@ -115,7 +131,15 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	if multilib_is_native_abi; then
-		gnome2_src_compile
+		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