gentoo auto-resync : 22:01:2024 - 16:48:54

5 files changed, 130 insertions, 2 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 25253eff6261..7b13a9065905 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 52433eb5c9aa..6673afdd4ce9 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -2,6 +2,8 @@ AUX colord-1.4.6-FILE_OFFSET_BITS.patch 1390 BLAKE2B 9b6050d23e5b9ee17a04c29dc59
 AUX colord-1.4.6-lcms2-corruption.patch 1183 BLAKE2B 67dae6de961d67cb7893087cf8e40a5ecbe37629decbfdb5803ae2c08078f1327ee53b5f4d61ae9d6290a87dbce19db8a26c838292f1f92fd6c66387e9b787ff SHA512 153c3cc2adacb1d9fb424f597cbfdd5c0bef80122efa00852ca26a3f3e603f977687e037f5e6afcc42b37469fd9cc5280afd8f76a772bed1d3246d9b125ccdcf
 AUX colord-1.4.6-time_t-ptr-truncation.patch 1415 BLAKE2B b5b71b785fd2c966366efa7c05322a0704f447c644fe6469600018a219414f2c51ebfbd625d08aa18ffc8b789efa8e33afa2da9a1675c4bc1fdc7bee9bdc8eae SHA512 3004a789c3e78e87457434077c6d762e824b0c4b4f0b1adf2f66373f6854b81a48697610b76f593b44e9cd8de48a37bed97659011872416d3957ec9374252931
 DIST colord-1.4.6.tar.xz 1872528 BLAKE2B bf87ed1abe0a827ad81b5467847975d70e4cb83c1973fac3bcb1650875b7a0b375d48633bb1b01c7da1e8acd62cc4cf19f0efe9722e12bde3d8ec4833800ef2c SHA512 d55d3322199d0bfee74eee9e183c9246ec33e755f0144d96087acb3c43ab5a3d872086fcef9f29cdd2295be71daac703cdf90ad10bf183622fdd84347e7af123
+DIST colord-1.4.7.tar.xz 1799168 BLAKE2B f4434ec817fc2afc1ade144f533d2c3b98117356677b5962ff95b566a8c66b6b8ce95ec8f76b3ae849a6468000dc08b8f8fc207c2cc9c85a966157fb1612078e SHA512 d8a23899c038af980f1b257eace68b682c3f5592d19e2ae1044da749371694052c00e58e4754ebb6ee2f7900b0ef44c01be5fcf857294813c07af94ffbf6d0be
 EBUILD colord-1.4.6-r1.ebuild 3484 BLAKE2B 848e36faa82117ddc33be226891dfee606eddbb55b9f707984946bd9304bf4ab31e8fca86ee26bf8e63509bf2174f809c1bf07b752b2c0f7005242d5bf2fe6fa SHA512 15f4042cc026f0443509816e689a2456aa35877969b0505924ff8783ed40a32305ce73ea6b9fd43f59dafb5c7f6d25bc198a15a9c705f9f787b77430a86d0dce
 EBUILD colord-1.4.6-r2.ebuild 3592 BLAKE2B edde23e2f473b83c623f942bf843e24236d1faf08dea9a9dd2bec576e730c333013f30aae5ba977abdaf53aa090c6b4f9c5a9b24b8a483f07df1c04dacd4bca8 SHA512 dfe492277b7a64b74bfd05c494e7003a383c40c6c9d0890500b856f3f3dbdc80ddf5ccb62c003c834c9fd82bf453e26365e297ba07d83984ba9836f921b9e114
+EBUILD colord-1.4.7.ebuild 3445 BLAKE2B 90cf02670a3baf37006f3128c5dc04dcf56aca177e09c82d5c1a2304dc3e59acb918db4a0062f171dcf885c6918e627ab4886babd56d1b29bf9e9f22f36cc745 SHA512 f8027e5c5c179e9d83bce64e875415dbd1d5d5795b859705b42d35edd3bfd01d33e779f36e05b62d7ca194856c09aeb5020167b725d039d9e01bbd371c4e74a5
 MISC metadata.xml 538 BLAKE2B 314dc50e426cb4abb2cab8ea3f1ca221d1543820587fac02747c198c034ff468d13273ae573f30ee852489c22ebabf80b5d62d409b32bcedf9de45e768d6600c SHA512 10e907a1f38a40acebfb32ff8ecb58b074147ce29947a31272fca5de1d8de99935fab05dffbaa271aea0b4981c36ce0c8ef19879d3796360ecdf3b2143f7dbd4
diff --git a/x11-misc/colord/colord-1.4.7.ebuild b/x11-misc/colord/colord-1.4.7.ebuild
new file mode 100644
index 000000000000..c5d3fb32daeb
--- /dev/null
+++ b/x11-misc/colord/colord-1.4.7.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_USE_DEPEND="vapigen"
+
+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/"
+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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+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="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}]
+
+	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.114
+	argyllcms? ( media-gfx/argyllcms )
+	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
+	>=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) )
+"
+
+pkg_setup() {
+	use vala && vala_setup
+}
+
+src_prepare() {
+	default
+
+	# 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_native_true udev_rules) # Install udev rules only from native build
+		$(meson_native_use_bool systemd)
+		-Dlibcolordcompat=true
+		$(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
+		$(meson_native_true man)
+		$(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
+}
+
+pkg_postinst() {
+	udev_reload
+	tmpfiles_process colord.conf
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index bc2a9f5b79b5..11aabe4877e9 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,7 +1,7 @@
 DIST xkeyboard-config-2.39.tar.xz 896112 BLAKE2B d1ef598a0c1993518b01e73c319147ea1f3e55e1c8040762b9e95636c89d9b719322f3f2a1a87bffc545928b2912ead37f336182ba69d692893521322f170e21 SHA512 4690a0291c1f8c2c53b84984221a60a935c9b7cfc8ae20a8740403571f3704dedf06e5755b45775a15a5df21ebd2acac3ff785ff19f54d792ae359c4c6d60756
 DIST xkeyboard-config-2.40.tar.xz 893584 BLAKE2B 79dd20e588e72c9fe65ff0885889ae3e2ad0ffbb66b27cf90db36fecfd41f24667fcc0a0a7fc96f3bc5d01502532af3e6b560719413bc16529328dd02d353c92 SHA512 00c965e747169194d9a8d1ed0dfd544988c70df6a69888c50a06b4e266ce7047a8696ce408b9a7ba91e7e6b9679ab6e5f014308dbbf0a9c6be0e948d7646f878
 EBUILD xkeyboard-config-2.39.ebuild 1003 BLAKE2B eec1fec962f65eaef104088b3a21cbaf7af9fc7156411c63ff103718103663f16d9752701be551d98d5bee8f6307f9fdf9a77845316a24c91399470c483e1479 SHA512 efbfca4459134833abc2b6d24f5e4853684cfdcff1ab720071519432da307b92f169e01ae1751ee9fa283733c3aab51c402054b6069c84c0d14ef10894f9b6e2
-EBUILD xkeyboard-config-2.40-r1.ebuild 1655 BLAKE2B 7331afe35c4959be374d731c732b34dc680e48a5ea4dc2c5bdccbecab74e158cacf62b22556bd471ebfc09f71787bfa5adb63a14f859c7b960711ecb33c6b84d SHA512 8c576cbc24f76d83fd04867d37db67952f321cc00bb6cc5007b39d09037def667f44083acc99b257df0df50f535f6bea3223aa9d9d839e9e588305ec6941f807
+EBUILD xkeyboard-config-2.40-r1.ebuild 1654 BLAKE2B 0577791689f3b49662e933adfe0e73be02566746876a62e85b952c262229fd7f9cd6b0cda7f5a82185503ce6e44f2cf45076fd8b6028c139fb4968d952726d95 SHA512 5c6ad57c4ad3a93cbfb39b7c09dee2efcec99e7a0c72cb4297d1122371a02d4fb1466a4c3dd34750b70406de0fb45d25a407a16251d321b21996553c32a81365
 EBUILD xkeyboard-config-2.40.ebuild 1102 BLAKE2B a162e4e541682b3f29c2740cf69b1ecbf8cb7d56e98c7885d0261677d53834b6591c00eda7f69a8d62c1e72d9de1be2179f737edfe586552f8c8f5be0abf1511 SHA512 db3443c0336525915f0e97732793c8bdf833027f45699701e4709365780ea78373f12a91ae3da2ea7fff43699309dc550aca8e2b6a272cd701042246f2acd155
 EBUILD xkeyboard-config-9999.ebuild 1662 BLAKE2B 778143ba8f56159c5cb6e0d18fdfa0f7204751312951a6d24fd6ae05fc7b12b610dded474a7efd2c571f823be4e3c5170b72b32f81ab2b66ac50b8ede1363ce5 SHA512 b239da0b7dcfdce69421b0a6e003daff439adcd50f5767fcdbfb159e6493e0529d030fe130cc78df298c7dadb5ff73483d1383d9177a1568514024f1943ff9c6
 MISC metadata.xml 442 BLAKE2B 3e7e6564b3aa17ef958ae6aed94b6d28156d743ad2782b0c2c08429adff128a7a7ea549e2f5fcece91cdc0f498d341790d0694b193dae16b60a63966bbb581b8 SHA512 0c32c580abc07b3141fa3b9137eba130654e0701b4c9e49be10a801c5c068d67881a74dc0e5d45dc34e8964364e0516bbc5e1b854ae0d7d8ff12bf1ec1ec2986
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild
index cedb204bb758..1cd406028116 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="MIT"