gentoo resync : 02.02.2022

5 files changed, 4 insertions, 313 deletions

diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 47a0428514f2..7335542e447f 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,8 +1,5 @@
 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.3.5.ebuild 5020 BLAKE2B 0bf726b3dceb24289e27ff1db60e5bf02fa350b52e271539a101cb422d2beaa4a4014e2421c8842755d65991e4c26651234ecb0e15ffe3d0659fe51d9f436e85 SHA512 7d2050a8f9bd884498770ace429edc8c3fffa556f9bcd3861e17531988112b6e461a6b76cd0a1eb2d3ad95f1e01d493416ead82faa2aefcfd3a92ce6833a2805
-EBUILD colord-1.4.5-r1.ebuild 3362 BLAKE2B fac295c2ae929d47d80b426043ac8ebcd30d29461f6032414af3d5d2404e487fc252041a503a7018e38941fd05b21a5a09db93d10093a59bbee6df0415f0ae19 SHA512 521c737cfc88d5808b64cf9128f4e057e22a94d1d9f7d0075f4e25545606ba0a21ded58197c44969a659b34a63460dec957f5b4a57c6191a9f90a2b68a6f5178
-EBUILD colord-1.4.5-r3.ebuild 3513 BLAKE2B 7bc4901e195a307e70ddc3062ecdf2d8a36df449417045bb915098b2ed758628e05073f596bc7c405caef982a683c111a7acb7a5f37eb540e75d5781e230dcc0 SHA512 b541e4f8a89bea8aa5fb956d4e767d28f4ca30b19cafefaa0b0b158d15b78af9bae504bae864554d9bb0ea5639231efb65744e37adc8733e14689e556ec32bad
-MISC metadata.xml 564 BLAKE2B 6c9696bb5409ed3921ad80067ffbc00b3c01467d97febf58ca776e1f2edb8d58db07578008dc22d6d2670b2647cb4b95310db7333a868e6d7bdd4ba01e89efba SHA512 de1e9a83f335943a893d56d894a46a15739e61123a08808c7a9b5425a419d1f5ca59494297ccab77d68545ef98a65adca10c6715173936db5787f0f49b7faeca
+EBUILD colord-1.4.5-r3.ebuild 3507 BLAKE2B bd33e247057ab3c9327a0d51b56ca3df0136f394807efffa9a7bec3d4d55aef9248b871569a9b39411ba50c01c32add0ffc9b993e68dfba07b15ae376b0a8dee SHA512 685c91b42fbca3b72f5acf39f1e1539bfbd7ade5606711ad998145040833bbc6ffdde94aeeedf604bfeeaa1771d60e5bded2c135d9a2ea57706d1a6dc12bd39e
+MISC metadata.xml 459 BLAKE2B 6d8217206edfdae4ed92783b04004d62c6eed7c8d684ad6b921d44c8830fee2aeb5480de68fbbe78535e4825333b1c312bb70196e18102e62d696e26597e8441 SHA512 4f255205fc902918b48a3c653e5c732a117df2e5a8f7ce6e4a7517b03694e14882e484440fce98e9c4cc13aa62739e01666d969e19947a5ae6e3b37130260508
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.5-r1.ebuild
deleted file mode 100644
index 53a2909463e1..000000000000
--- a/x11-misc/colord/colord-1.4.5-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit bash-completion-r1 meson-multilib vala
-
-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 ~riscv ~sparc x86"
-
-IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner systemd test +udev vala"
-RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp
-REQUIRED_USE="
-	scanner? ( udev )
-	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
-	)
-	systemd? ( >=sys-apps/systemd-44:0= )
-	scanner? (
-		media-gfx/sane-backends
-		sys-apps/dbus
-	)
-	>=sys-auth/polkit-0.104
-	argyllcms? ( media-gfx/argyllcms )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
-"
-RDEPEND="${DEPEND}
-	acct-group/colord
-	acct-user/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 )
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-tests-Don-t-use-exact-floating-point-comparisons.patch
-	"${FILESDIR}"/${PV}-optional-introspection.patch
-)
-
-src_prepare() {
-	default
-	use vala && vala_src_prepare
-
-	# Test requires a running session
-	# https://github.com/hughsie/colord/issues/94
-	sed -i -e "/test('colord-test-daemon'/d" lib/colord/meson.build || die
-
-	# Adapt to Gentoo paths
-	sed -i \
-		-e "s|find_program('spotread'|find_program('argyll-spotread'|" \
-		-e "s|find_program('colprof'|find_program('argyll-colprof'|" \
-		meson.build || die
-
-	# meson gnome.generate_vapi properly handles VAPIGEN and other vala
-	# environment variables. It is counter-productive to check for an
-	# unversioned vapigen, as that breaks versioned VAPIGEN usages.
-	sed -i -e "/find_program('vapigen')/d" meson.build || die
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_native_true daemon)
-		-Dbash_completion=false
-		$(meson_use udev udev_rules)
-		$(meson_native_use_bool systemd)
-		-Dlibcolordcompat=true
-		$(meson_native_use_bool argyllcms argyllcms_sensor)
-		-Dreverse=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
-		-Dman=true
-		$(meson_use gtk-doc docs)
-		--localstatedir="${EPREFIX}"/var
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	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-r3.ebuild b/x11-misc/colord/colord-1.4.5-r3.ebuild
index 33836fa71439..2533c35c3049 100644
--- a/x11-misc/colord/colord-1.4.5-r3.ebuild
+++ b/x11-misc/colord/colord-1.4.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 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 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner systemd test vala"
 RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
index 70d3bf455086..d0fe4e35f081 100644
--- a/x11-misc/colord/metadata.xml
+++ b/x11-misc/colord/metadata.xml
@@ -9,7 +9,5 @@
 		<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>