gentoo auto-resync : 04:04:2025 - 01:34:28

11 files changed, 510 insertions, 629 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4f8bcade036c..e0d0349fa3cd 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 0fa8ee2e4862..6c26fa7360b5 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,14 +2,17 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923
 AUX glib-2.78.4-distutils.patch 933 BLAKE2B a5416e699a8604a5f443339401bdfcc50e6631eeac82a1d4e169f450b7c15b0323d75fa337ab689a029699cf3190310539cf5f603f2262963aea8ee1d1c9b5a0 SHA512 e5cfdfa795671f2a302b0bded516086e03056ee2675df9343819efc97130fb66988bdd67341fa9678b443c750f98d3902efe87c8f7e7532babd314414d93d0d0
 AUX glib-2.80.5-gobject-introspection-1.80.patch 3942 BLAKE2B 11e9cce2031d4c796ebccebc4f6d2eb832156e58b562d810f136206452cf1d735881dc1c4aa7c1d588e4d1fcc84f76650031e7baa030dfd09dd4490dd511003e SHA512 9ad2791ab550740619723021b8e4007950071dfceebff7cd403d23726ee53da207accde8cd98e1ed517fbd6ba62368876a2f10d7c2d62e0dc909b984451b2c4a
 AUX glib-2.80.5-tests-autoptr-ffi.patch 1035 BLAKE2B 62703fe130035ce4514acaa90c4ea6873fedd2210c07846297084ca5e9735c9b9cd04f399897711d5aacb1f46b950edcb50bcb21b581b9e160f1ac0c56e8d608 SHA512 db6f8c09fc2b1ccf7dd39bbc6d3979724da1249adb568a37095468316a5c6737939f05f6cf62ed4cae951a7babbae114c0fefe954ddaa03974f276706c0fe03c
+AUX glib-2.84.1-gclosure-vs-threads.patch 2934 BLAKE2B a96fb6db02427d3bf47736c4cd122aa011557be406826bac8cf45b576f2e4acea3ec348c4a305971f5ae044cb0774ff4b7bf23d72625d77ec4d441d5865b855d SHA512 6f7ae234a138564847963373440852c49682473a8b9b4fed641473be73deb2d52a3ede3247b51a6666f09d2e9abd0ad57578fdba77b3b5f576b0f61c98d14c9c
 DIST glib-2.78.6.tar.xz 5344808 BLAKE2B d16173794c4aa019459cf8c8c84d4107fb8393828f41ec6c631b9452890f34f9022ed848a543ed134fdb8a575faef6b941cea3e05de512eb1b7a99f7601a2485 SHA512 8d75f8fd77b6309215ca86a0c7648878efe11051f18b279840c137669017ea4066388f8682367e4ea3f154333d833c9dc28ccd4a66a91f0c3854a40a2838f8da
 DIST glib-2.80.5.tar.xz 5538308 BLAKE2B 3f17ff85a85d20858b69c2dccc1e5d6ffd92661a8cfda8b8770dd391861999ff3381008f4fe382e90f0a7798fe218debda7f559f6e3ac8f9305e3be98b879969 SHA512 c9cc9f99e217fd950810fcfbfa7300c7850cae4dbfbabc03cdcadb6dcca2e51ea7979ceb68c09d8e9776fd1c04db73b89b81f748c8bd911e1f7ad9f704dff172
 DIST glib-2.82.5.tar.xz 5554704 BLAKE2B e7853034be1137f8b793483df9e9ce1465dd10a990eb9b3cb9ac76c9f8f86ccc6fda85645b04b35963b28c33e0f6c02df4f3d03e06cc278b8515e588d6bd05f6 SHA512 a6b035c32a42b9d6f4c031a29da405848002619654b58c9205f2f78dbb9698cd5866f31ab213adc04aa214d2c48840a9592c0a1e9201e6851ebd435635f393ae
 DIST glib-2.84.0.tar.xz 5613328 BLAKE2B a482076d6b0c82824179094974110dbd10d47fce93f84f4626d0d3dbea528602c41ac4a7ab8feedc3d7cc5e404ef8bef30c6c744b6f0f4f3a764644e28210e28 SHA512 72b85e30c535c5da7d8598d1cec02b1b481c467e612dbb396a0a64ad1d37cf2f1802c6fa576885c99cf8a22f4f0fc7dfdf42a3f32f7f40394f72db588fdbebb7
+DIST glib-2.84.1.tar.xz 5615396 BLAKE2B d20ade482eb95873adaefc656e22c57e6712a6263a4812e448220040e30144919331cb279566a89a2ab46495b46d6a79e3821e491317587325fa3a64b40d62cc SHA512 ee7f38a4726fd72e41ddb75c4933c7b1bb30935bb2fddc84902d0627a836af512534195132cc02e3d15f168fefc816576181a8d6e436472b582191437b79a456
 DIST gobject-introspection-1.80.1.tar.xz 1040228 BLAKE2B 7a8c1da9bc8aef293deedde1eed97536fa2f42f79a9761ac8ededb0676e46b636545a69e20e63d812844aeb626fa4fb7ce3c7922e51554fdc79560f16443acd9 SHA512 f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a
 DIST gobject-introspection-1.82.0.tar.xz 1052872 BLAKE2B 8336ae26d48a71a203655d9d268076f603055ceabb55dbfa676f2c67b4096b83afc106d485dc45d02b3a8be806f9ef50d54806a82e61f2a252ae59543c61e934 SHA512 e139fadb4174c72b648914f3774d89fc0e5eaee45bba0c13edf05de883664dad8276dbc34006217bb09871ed4bad23adab51ff232a17b9eb131329b2926cafb7
 EBUILD glib-2.78.6.ebuild 11340 BLAKE2B c53403ccbcbd18e678f8e2c6e53b39ccc6cb558be4e7f96df26f986a4c51ea86cf601bf0a122c2530dfc762af2a1cbe6e85f524687c738a8eb3940afeb6541a9 SHA512 7c1b4e8e69ca36d6b52855c7edbe4b584d549025d88783010359b96469c98b217dd50819ae971c7bfee637a30bd864b991c3a16cc538492b4c7075d719e30f4c
 EBUILD glib-2.80.5-r1.ebuild 16079 BLAKE2B a7e621a8a61467e7ec25ebeff6e8201a15fda7923ebb8a963271201e9ae25324cd2b43d218d7bd48a9ef10faf0bc4765bb385c3655b47fecf3f7c51651b0d7d0 SHA512 dbece75ccceef8f1e0be82f4fb6d4ad13f74d219b075ad19b3485ba59873248868fbe78e3c44fb6373c10d838e4694b920cd54ba79422e2754f3dd756c380c85
 EBUILD glib-2.82.5.ebuild 15665 BLAKE2B dc8bedc471d52c6dc1648a25014109bdd05e615be023c4ad843f8869e3101e795359db8283ee56f7c88e90ee4c571c15640e8e400d9c7f2a4aa4e3b5c64925e8 SHA512 6f255b1af43cab8894b27961ca1fd2bad54be948de69bc5a80db2be1b1e23e651d6c396d4e566670caa78bb6d73cb55bd69f69853748e2b84e653e57011d4be2
 EBUILD glib-2.84.0.ebuild 15867 BLAKE2B 78305cb7c13ee4d541cd9ff87550279c490f5fd5277d06140d5d4b6e5bb2655f39f26c9814b65f338ce67ed7cd0c8ad9928f7b2ff204befffc9545c52ab2ec86 SHA512 24b233b78c6fdfcb164bbc8d5df813a64ebc076bd97c403f7e103e90c5f4e930695a89a49f7a0acd663ff5776404e450d0df0e2380b61078f3f4035dfbec808c
+EBUILD glib-2.84.1.ebuild 15921 BLAKE2B 583347c2ff08e5a4ea8358de963103a977fa39ed90b8cc240d457e30064964309c5537c16929d1fcf294745323e4b64482ab06d2bdede557131e9e46fbf902ef SHA512 bb520f9d6ecca473924387a743edaba56f752c7debf740e491eade3ed7977fefbba500985d7cee1c65f4abe26ad91bfad6cbffdab848af9fc2c8e770b99a9370
 MISC metadata.xml 1499 BLAKE2B 5a75e3b360e4656fe9127f2dc3ba7e90df3eae0586a025b4eefc2317398e53815c98a8014ea6f0dd69ae8afdafa066eec61c18e9fa86d24c78a3f11404c2a7a8 SHA512 2b12c409bf16cf9e01e80c30a6707aac5b48ca4cdeac3852028c003c6cb2d50b5e82be73adeefb8341fd4f157e0f7d22505cebfc2ee0f6d64ca77a7d3cfa8271
diff --git a/dev-libs/glib/files/glib-2.84.1-gclosure-vs-threads.patch b/dev-libs/glib/files/glib-2.84.1-gclosure-vs-threads.patch
new file mode 100644
index 000000000000..dbd83e6a47d3
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.84.1-gclosure-vs-threads.patch
@@ -0,0 +1,57 @@
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4575
+
+From d6798089d447977ef4416d124a83344241aab14b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 3 Apr 2025 19:03:27 +0100
+Subject: [PATCH] gclosure: fix ATOMIC_CHANGE_FIELD to read vint atomically
+
+Depending on luck, g_closure_ref may access closure->vint and observe
+different values between reads. This manifests as a test failure in
+signals-refcount{2,4}, properties-refcount1, and closure-refcount depending
+on timing and re-runs.
+
+Jakub Jelinek analysed this on GCC bug PR119607 after I'd reported it
+over there as a possible GCC regression.
+
+The critical part being g_closure_ref -> ATOMIC_INC_ASSIGN -> ATOMIC_CHANGE_FIELD
+where closure->vint gets re-read repeatedly, both outside and inside the retry
+loop. To fix that:
+
+1. Atomically fetch it the first time;
+2. Use the cached read, not a fresh read, of vint in the loop;
+3. Use g_atomic_int_compare_and_exchange_full in the loop so we get a freshly
+cached vint if it changed in another thread.
+
+Bug: https://gcc.gnu.org/PR119607
+Fixes: 834ddd19 ('turned all modifications to the first 32 integer bits in a closure into')
+Co-authored-by: Jakub Jelinek <jakub@redhat.com>
+---
+ gobject/gclosure.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/gobject/gclosure.c b/gobject/gclosure.c
+index 2552946e3b..e6e9769e46 100644
+--- a/gobject/gclosure.c
++++ b/gobject/gclosure.c
+@@ -110,15 +110,17 @@ typedef union {
+ G_STMT_START {                                                                          \
+   ClosureInt *cunion = (ClosureInt*) _closure;                 		                \
+   gint new_int, old_int, success;                              		                \
++  old_int = g_atomic_int_get (&cunion->vint);                   	                \
+   do                                                    		                \
+     {                                                   		                \
+       ClosureInt tmp;                                   		                \
+-      tmp.vint = old_int = cunion->vint;                		                \
++      tmp.vint = old_int;                               		                \
+       _SET_OLD tmp.closure._field;                                                      \
+       tmp.closure._field _OP _value;                      		                \
+       _SET_NEW tmp.closure._field;                                                      \
+       new_int = tmp.vint;                               		                \
+-      success = g_atomic_int_compare_and_exchange (&cunion->vint, old_int, new_int);    \
++      success = g_atomic_int_compare_and_exchange_full (&cunion->vint, old_int, new_int,\
++							&old_int);			\
+     }                                                   		                \
+   while (!success && _must_set);                                                        \
+ } G_STMT_END
+-- 
+GitLab
diff --git a/dev-libs/glib/glib-2.84.1.ebuild b/dev-libs/glib/glib-2.84.1.ebuild
new file mode 100644
index 000000000000..e5e5ff280c0f
--- /dev/null
+++ b/dev-libs/glib/glib-2.84.1.ebuild
@@ -0,0 +1,448 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit eapi9-ver gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+INTROSPECTION_PN="gobject-introspection"
+INTROSPECTION_PV="1.82.0"
+INTROSPECTION_P="${INTROSPECTION_PN}-${INTROSPECTION_PV}"
+SRC_URI="
+	${SRC_URI}
+	introspection? ( mirror://gnome/sources/gobject-introspection/${INTROSPECTION_PV%.*}/gobject-introspection-${INTROSPECTION_PV}.tar.${GNOME_TARBALL_SUFFIX} )
+"
+INTROSPECTION_SOURCE_DIR="${WORKDIR}/${INTROSPECTION_P}"
+INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-libs/gobject-introspection-1.80.1
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?]
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	introspection? (
+		>=dev-libs/gobject-introspection-common-${INTROSPECTION_PV}
+	)
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	elf? ( virtual/libelf:0= )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	>=dev-build/meson-1.4.0
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	doc? ( >=dev-util/gi-docgen-2023.1 )
+	dev-python/docutils
+	systemtap? ( >=dev-debug/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig
+
+	introspection? (
+		$(python_gen_any_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+		virtual/pkgconfig
+		sys-devel/bison
+		app-alternatives/lex
+		${PYTHON_DEPS}
+	)
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+	"${FILESDIR}"/${PN}-2.84.1-gclosure-vs-threads.patch
+)
+
+python_check_deps() {
+	if use introspection ; then
+		python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready
+		# for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Running gdb inside a test within sandbox is brittle
+		sed -i -e '/self.__gdb = shutil.which("gdb")/s:"gdb":"gdb-idonotexist":' glib/tests/assert-msg-test.py || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+	sed -i -e '/install : true/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	# make default sane for us
+	if use prefix ; then
+		sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die
+		# bug #308609, without path, bug #314057
+		export PERL=perl
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# fix standards conflicts
+		sed -i \
+			-e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \
+			-e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \
+			meson.build || die
+		sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
+			glib/giounix.c || die
+	fi
+
+	# disable native macOS integrations
+	sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \
+		meson.build || die
+	sed -i \
+		-e '/AvailabilityMacros.h/d' \
+		gio/giomodule.c || die
+
+	# Link the glib source to the introspection subproject directory so it can be built there first
+	if use introspection ; then
+		ln -s "${S}" "${INTROSPECTION_SOURCE_DIR}/subprojects/glib"
+	fi
+
+	default
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	# TODO: figure a way to pass appropriate values for all cross properties
+	# that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack'
+		# property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	# Build internal copy of gobject-introspection to avoid circular dependency (built for native abi only)
+	if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then
+		einfo "Bootstrapping gobject-introspection..."
+		INTROSPECTION_BIN_DIR="${T}/bootstrap-gi-prefix/usr/bin"
+		INTROSPECTION_LIB_DIR="${T}/bootstrap-gi-prefix/usr/$(get_libdir)"
+
+		local emesonargs=(
+			--prefix="${T}/bootstrap-gi-prefix/usr"
+			-Dpython="${EPYTHON}"
+			-Dbuild_introspection_data=true
+			# Build an internal copy of glib for the internal copy of gobject-introspection
+			--force-fallback-for=glib
+			# Make the paths in pkgconfig files relative as we used to not
+			# do a proper install here and it seems less risky to keep it
+			# this way.
+			-Dpkgconfig.relocatable=true
+
+			# We want as minimal a build as possible here to speed things up
+			# and reduce the risk of failures.
+			-Dglib:selinux=disabled
+			-Dglib:xattr=false
+			-Dglib:libmount=disabled
+			-Dglib:man-pages=disabled
+			-Dglib:dtrace=disabled
+			-Dglib:systemtap=disabled
+			-Dglib:sysprof=disabled
+			-Dglib:documentation=false
+			-Dglib:tests=false
+			-Dglib:installed_tests=false
+			-Dglib:nls=disabled
+			-Dglib:oss_fuzz=disabled
+			-Dglib:libelf=disabled
+			-Dglib:multiarch=false
+		)
+
+		ORIG_SOURCE_DIR=${EMESON_SOURCE}
+		EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR}
+
+		# g-ir-scanner has some relocatable logic but it searches
+		# for 'lib', not 'lib64', so it can't find itself and eventually
+		# falls back to the system installation. See bug #946221.
+		sed -i -e "/^pylibdir =/s:'lib:'$(get_libdir):" "${EMESON_SOURCE}"/tools/g-ir-tool-template.in || die
+
+		ORIG_BUILD_DIR=${BUILD_DIR}
+		BUILD_DIR=${INTROSPECTION_BUILD_DIR}
+
+		pushd ${INTROSPECTION_SOURCE_DIR} || die
+
+		meson_src_configure
+		meson_src_compile
+		# We already provide a prefix in ${T} above. Blank DESTDIR
+		# as it may be set in the environment by Portage (though not
+		# guaranteed in src_configure).
+		meson_src_install --destdir ""
+
+		popd || die
+
+		EMESON_SOURCE=${ORIG_SOURCE_DIR}
+		BUILD_DIR=${ORIG_BUILD_DIR}
+
+		# Add gobject-introspection binaries and pkgconfig files to path
+		export PATH="${INTROSPECTION_BIN_DIR}:${PATH}"
+
+		# Override primary pkgconfig search paths to prioritize our internal copy
+		export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private"
+
+		# Set the normal primary pkgconfig search paths as secondary
+		# (We also need to prepend our just-built one for later use of
+		# g-ir-scanner to use the new one and to help workaround bugs like
+		# bug #946221.)
+		export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)"
+
+		# Add the paths to the built glib libraries to the library path so that gobject-introspection can load them
+		for gliblib in glib gobject gthread gmodule gio girepository; do
+			export LD_LIBRARY_PATH="${BUILD_DIR}/${gliblib}:${LD_LIBRARY_PATH}"
+		done
+
+		# Add the path to introspection libraries so that glib can call gir utilities
+		export LD_LIBRARY_PATH="${INTROSPECTION_LIB_DIR}:${LD_LIBRARY_PATH}"
+
+		# Add the paths to the gobject-introspection python modules to python path so they can be imported
+		export PYTHONPATH="${INTROSPECTION_LIB_DIR}/gobject-introspection:${PYTHONPATH}"
+	fi
+
+	# TODO: Can this be cleaned up now we have -Dglib_debug? (bug #946485)
+	use debug && EMESON_BUILD_TYPE=debug
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Druntime_dir="${EPREFIX}"/run
+		$(meson_feature debug glib_debug)
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=enabled # only used if host_system == 'linux'
+		-Dman-pages=enabled
+		$(meson_feature systemtap dtrace)
+		$(meson_feature systemtap)
+		$(meson_feature sysprof)
+		$(meson_use doc documentation)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+		$(meson_native_use_feature elf libelf)
+		-Dmultiarch=false
+		$(meson_native_use_feature introspection)
+	)
+
+	# Workaround for bug #938302
+	if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+		local native_file="${T}"/meson.${CHOST}.ini.local
+		cat >> ${native_file} <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+		emesonargs+=( --native-file "${native_file}" )
+	fi
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	# TODO: Use ${ABI} here to be unique for multilib?
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	export TZ=UTC
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# https://bugs.gentoo.org/839807
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /usr/b
+
+	# Related test is a bit nitpicking
+	mkdir -p "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die
+
+	meson_src_test --timeout-multiplier 20 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps
+	# and removals, and test depend on glib-utils instead; revisit now with
+	# meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+
+	if ver_replacing "-lt" "2.63.6"; then
+		ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+		ewarn "to restart your session for \"Open With\" dialogs to work."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache || die
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+	fi
+}
diff --git a/dev-libs/libei/Manifest b/dev-libs/libei/Manifest
index d394adfe72e8..be88333bf1b7 100644
--- a/dev-libs/libei/Manifest
+++ b/dev-libs/libei/Manifest
@@ -1,10 +1,7 @@
-AUX 1.3.0-scanner-switch-to-using-dataclasses.patch 14276 BLAKE2B f187335730f31476cc42850741c36ab81f41df6298d370cdcc727a5ec4c2afcd3fb1f448cef7bcf5e369a88ace61bbf8e71f66acd933a0d4b43ece1e1baf8b18 SHA512 92c3710e38b06e0c40f01d8a1a46181f8ea500b61a69fd6105cd992ad6b33cd5fec1259b660dd1bb3befa96cfb905d1e701b8fbeedce02c2222f1fc37e400c56
 AUX 1.3.0-skip-protocol-test.patch 675 BLAKE2B 1519b464a2322ab7c46ab449ccc0fb3f1e962b86f97151cefa56d43af2e0727768d58b730486ea2272e76c0d2cbbf2c02152bcf2b6ae615060900458a8df81bb SHA512 62086e3bb62538616eebba7e9e356df79f8c148280b0338557a8fd52a9134257c6d74a6ee11a3788b4da0c44242a65473559fb0d8a8ab3fae8cba8222896ef13
-DIST libei-1.3.0.tar.bz2 175492 BLAKE2B cc5b0ae228a7282e0b5890280cab15cbb4c9179aa40140d6d01dc0d650bc1a646efd3d07dc6db0b501c3d203480d2df2bf3107e8b07e13b49eef8dcea59dd011 SHA512 a63b52c7251660404b307dba82ee24e31b64aaff7140acb174a33aeb60a07e59391522e2a5c56cd7bbdc45ab5e4a0e6111e214f2f1b79834b152e6ebc3e5e0c1
 DIST libei-1.4.0.tar.bz2 182498 BLAKE2B 251c35b0ad0b21896cf5600206646e904c508813bcfa9344954922b7b0156dd528987b9d3678edaf3fac14952996dc98fb1a07e8703ce7fde676e63d27a12553 SHA512 c5ac78687b8cbc174406d9b176968416496cd354a20b5861e2959be0cb361edc9437acad46de0013f78b204ec28594d044f79b00a6442e7bda513e283968270b
 DIST libei-1.4.1.tar.bz2 182255 BLAKE2B 1665ba934de0f70744e41427499d7cf712cd2d7a2b38954e4a8edc22abc82ab195e3b37175438236f354e642121acd1aac8342e31d37c50f1da7358682bde122 SHA512 c95c48d78fd93fe304e4e3f88edf3cae1ad2110ada7ffa4d5cd6c49b41e88a76de6d6804d2957376cd8dda4f2bb57967ebf19b2dcf4a0409fa455dfdae43408d
 DIST munit-fbbdf1467eb0d04a6ee465def2e529e4c87f2118.tar.gz 27724 BLAKE2B 9670c9b7a0b5d9ee6ec8df2dea9e241b043964ecf1fa3f6060ad1d16c40ab6afe47f53c6d4a791003e101a0b363263b858e6e4e445f868292753dd1ee7f7e3ce SHA512 26b5599fd12be627a692823ebf496fa446be7ed04a1233fb42e0667c05109b0f804f76646e289ac660fc815baf45f77ec8caf0ff2ea7fb0b4f87f0038a2b971c
-EBUILD libei-1.3.0-r2.ebuild 2516 BLAKE2B 5d5a1a75aa0db093971032f7b3b5176dd9015274c889e3416bbb735d47d973ddd9300ef397323ab49569344e2b2d1848ac7cc379cfd6ade36d5ac8f0f92ab0c3 SHA512 18ecaad4e2d66c63dc12478adca668dc9baff5f6fc4a6e55268020786eb51d5025344237c4f43acfdfc0e8b2e89a8daf2f1190eb5591e65ca6518994152c9abb
 EBUILD libei-1.4.0.ebuild 2375 BLAKE2B ccbc8257352622394cf672a8b203c9164ddecb3dce18928a35bec2dcbbe96df143d40f1509dcb396cfe1b9df87d13562f98c1895d1e6fadc24ed5d250a5aaa70 SHA512 d99d8f94a330c7e6268bfbe29af8b0954a32c7fbf8930a80b9f7effcebbb24889cff201b55e1303b816e1a0efb09184b4873416de3027fd7f2e0b29cab8a6fdd
 EBUILD libei-1.4.1.ebuild 2381 BLAKE2B 5f419e621e4459f694d006aaa95a1a320a6efdc7756f9b129cf975f66b8fcd282acb237576df8d2ac8e360dcf790ca6724dcd0c86cc41912f943aa3b4f4e7404 SHA512 423e3ee4e288187ccb355d1d4b631756b21f3dbb389c390b7073fe0adc5e67af94a7bf960d9012b4ea7250f075d300d7e372d9722a9ffe8dc58148f6742c7321
 MISC metadata.xml 336 BLAKE2B 2fd4200876fa044f3563b0eea2096214af92fed1a8db009cf4885a7cf32f303b0a6911dba18cc8fac942348dbe2668ea2d50fabedd235e33be0793076ab0e5be SHA512 a26feb7d41edc6f728bfbaf805cfefa6bba4c5161e70785e7de5f389492f405f7cd6f2c55cce1d2c6bdf9af3aba17e1e51254d9e4421c4fab2e61f2c563c8f3f
diff --git a/dev-libs/libei/files/1.3.0-scanner-switch-to-using-dataclasses.patch b/dev-libs/libei/files/1.3.0-scanner-switch-to-using-dataclasses.patch
deleted file mode 100644
index 08d192f52a5d..000000000000
--- a/dev-libs/libei/files/1.3.0-scanner-switch-to-using-dataclasses.patch
+++ /dev/null
@@ -1,417 +0,0 @@
-From dbc06510a115241fcfd07de49c0b991cad633721 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 11 Sep 2024 10:50:26 +1000
-Subject: [PATCH] scanner: switch to using dataclasses
-
-This drops one dependency that we're not fully using anyway. Except for
-the per-attribute validators that can be done in __post_init() we're not
-using attrs for anything that dataclasses cannot do.
----
- .gitlab-ci.yml         |   9 ++-
- .gitlab-ci/ci.template |   1 +
- .gitlab-ci/config.yml  |   4 +-
- proto/ei-scanner       | 164 ++++++++++++++++++++---------------------
- proto/meson.build      |   2 +-
- 5 files changed, 90 insertions(+), 90 deletions(-)
-
-diff --git ./.gitlab-ci.yml ./.gitlab-ci.yml
-index 1e5d956..caeedfa 100644
---- ./.gitlab-ci.yml
-+++ ./.gitlab-ci.yml
-@@ -40,9 +40,9 @@ variables:
-   # See the documentation here:                                                 #
-   # https://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html  #
-   ###############################################################################
--  FEDORA_PACKAGES: 'git diffutils gcc gcc-c++ pkgconf-pkg-config systemd-devel libxkbcommon-devel libxml2 doxygen python3-attrs python3-pytest python3-dbusmock python3-jinja2 python3-pip python3-pyyaml golang libabigail '
-+  FEDORA_PACKAGES: 'git diffutils gcc gcc-c++ pkgconf-pkg-config systemd-devel libxkbcommon-devel libxml2 doxygen python3-pytest python3-dbusmock python3-jinja2 python3-pip python3-pyyaml golang libabigail '
-   FEDORA_PIP_PACKAGES: 'meson ninja structlog strenum '
--  DEBIAN_PACKAGES: 'git gcc g++ pkg-config libsystemd-dev libxkbcommon-dev libxml2 doxygen python3-attr python3-pytest python3-dbusmock python3-jinja2 python3-pip python3-yaml '
-+  DEBIAN_PACKAGES: 'git gcc g++ pkg-config libsystemd-dev libxkbcommon-dev libxml2 doxygen python3-pytest python3-dbusmock python3-jinja2 python3-pip python3-yaml '
-   DEBIAN_PIP_PACKAGES: 'meson ninja structlog strenum '
-   ############################ end of package lists #############################
- 
-@@ -50,8 +50,8 @@ variables:
-   # changing these will force rebuilding the associated image
-   # Note: these tags have no meaning and are not tied to a particular
-   # libinput version
--  FEDORA_TAG:  '2024-07-24.3'
--  DEBIAN_TAG:  '2024-07-24.3'
-+  FEDORA_TAG:  '2024-09-11.0'
-+  DEBIAN_TAG:  '2024-09-11.0'
- 
-   FDO_UPSTREAM_REPO: libinput/libei
- 
-@@ -285,6 +285,7 @@ abicheck@fedora:40:
-       meson compile -C _build
-       meson install -C _build
-       popd
-+    - pip install attrs
-   script:
-     - git remote add upstream$CI_JOB_ID https://gitlab.freedesktop.org/$FDO_UPSTREAM_REPO
-     - git fetch --tags upstream$CI_JOB_ID
-diff --git ./.gitlab-ci/ci.template ./.gitlab-ci/ci.template
-index 0c8aeb2..7e7cad5 100644
---- ./.gitlab-ci/ci.template
-+++ ./.gitlab-ci/ci.template
-@@ -285,6 +285,7 @@ abicheck@{{distro.name}}:{{version}}:
-       meson compile -C _build
-       meson install -C _build
-       popd
-+    - pip install attrs
-   script:
-     - git remote add upstream$CI_JOB_ID https://gitlab.freedesktop.org/$FDO_UPSTREAM_REPO
-     - git fetch --tags upstream$CI_JOB_ID
-diff --git ./.gitlab-ci/config.yml ./.gitlab-ci/config.yml
-index d89d0fd..42db0bc 100644
---- ./.gitlab-ci/config.yml
-+++ ./.gitlab-ci/config.yml
-@@ -3,7 +3,7 @@
- #
- 
- # We're happy to rebuild all containers when one changes.
--.default_tag: &default_tag '2024-07-24.3'
-+.default_tag: &default_tag '2024-09-11.0'
- 
- last_abi_break: abe85e051e7029bfd2e7913ab980a9e0042b6d0d
- minimum_meson_version: 0.57.0
-@@ -24,7 +24,6 @@ distributions:
-       - libxkbcommon-devel
-       - libxml2
-       - doxygen
--      - python3-attrs
-       - python3-pytest
-       - python3-dbusmock
-       - python3-jinja2
-@@ -51,7 +50,6 @@ distributions:
-       - libxkbcommon-dev
-       - libxml2
-       - doxygen
--      - python3-attr
-       - python3-pytest
-       - python3-dbusmock
-       - python3-jinja2
-diff --git ./proto/ei-scanner ./proto/ei-scanner
-index 11edb85..d23fea7 100755
---- ./proto/ei-scanner
-+++ ./proto/ei-scanner
-@@ -20,9 +20,9 @@ appear in the XML file.
- from typing import Any, Dict, List, Optional, Tuple, Union
- from pathlib import Path
- from textwrap import dedent
-+from dataclasses import dataclass, field
- 
- import argparse
--import attr
- import jinja2
- import jinja2.environment
- import os
-@@ -55,48 +55,54 @@ def snake2camel(s: str) -> str:
-     return s.replace("_", " ").title().replace(" ", "")
- 
- 
--@attr.s
-+@dataclass
- class Description:
--    summary: str = attr.ib(default="")
--    text: str = attr.ib(default="")
-+    summary: str = ""
-+    text: str = ""
- 
- 
--@attr.s
-+@dataclass
- class Argument:
-     """
-     Argument to a request or a reply
-     """
- 
--    name: str = attr.ib()
--    protocol_type: str = attr.ib()
--    summary: str = attr.ib()
--    enum: Optional["Enum"] = attr.ib()
--    interface: Optional["Interface"] = attr.ib()
--    interface_arg: Optional["Argument"] = attr.ib(default=None)
-+    name: str
-+    protocol_type: str
-+    summary: str
-+    enum: Optional["Enum"]
-+    interface: Optional["Interface"]
-+    interface_arg: Optional["Argument"] = None
-     """
-     For an argument with "interface_arg", this field points to the argument that
-     contains the interface name.
-     """
--    interface_arg_for: Optional["Argument"] = attr.ib(default=None)
-+    interface_arg_for: Optional["Argument"] = None
-     """
-     For an argument referenced by another argument through "interface_name", this field
-     points to the other argument that references this argument.
-     """
--    version_arg: Optional["Argument"] = attr.ib(default=None)
-+    version_arg: Optional["Argument"] = None
-     """
-     For an argument with type "new_id", this field points to the argument that
-     contains the version for this new object.
-     """
--    version_arg_for: Optional["Argument"] = attr.ib(default=None)
-+    version_arg_for: Optional["Argument"] = None
-     """
-     For an argument referenced by another argument of type "new_id", this field
-     points to the other argument that references this argument.
-     """
--    allow_null: bool = attr.ib(default=False)
-+    allow_null: bool = False
-     """
-     For an argument of type string, specify if the argument may be NULL.
-     """
- 
-+    def __post_init(self):
-+        if self.protocol_type is None or self.protocol_type not in PROTOCOL_TYPES:
-+            raise ValueError(f"Failed to parse protocol_type {self.protocol_type}")
-+        if self.interface is not None and self.signature not in ["n", "o"]:
-+            raise ValueError("Interface may only be set for object types")
-+
-     @property
-     def signature(self) -> str:
-         """
-@@ -104,11 +110,6 @@ class Argument:
-         """
-         return PROTOCOL_TYPES[self.protocol_type]
- 
--    @interface.validator  # type: ignore
--    def _validate_interface(self, attribute, value):
--        if value is not None and self.signature not in ["n", "o"]:
--            raise ValueError("Interface may only be set for object types")
--
-     @property
-     def as_c_arg(self) -> str:
-         return f"{self.c_type} {self.name}"
-@@ -127,12 +128,6 @@ class Argument:
-             "new_id": "new_id_t",
-         }[self.protocol_type]
- 
--    @protocol_type.validator  # type: ignore
--    def _validate_protocol_type(self, attribute, value):
--        assert (
--            value is not None and value in PROTOCOL_TYPES
--        ), f"Failed to parse protocol_type {value}"
--
-     @classmethod
-     def create(
-         cls,
-@@ -153,26 +148,25 @@ class Argument:
-         )
- 
- 
--@attr.s
-+@dataclass
- class Message:
-     """
-     Parent class for a wire message (Request or Event).
-     """
- 
--    name: str = attr.ib()
--    since: int = attr.ib()
--    opcode: int = attr.ib()
--    interface: "Interface" = attr.ib()
--    description: Optional[Description] = attr.ib(default=None)
--    is_destructor: bool = attr.ib(default=False)
--    context_type: Optional[str] = attr.ib(default=None)
-+    name: str
-+    since: int
-+    opcode: int
-+    interface: "Interface"
-+    description: Optional[Description] = None
-+    is_destructor: bool = False
-+    context_type: Optional[str] = None
- 
--    arguments: List[Argument] = attr.ib(init=False, factory=list)
-+    arguments: List[Argument] = field(init=False, default_factory=list)
- 
--    @context_type.validator  # type: ignore
--    def _context_type_validate(self, attr, value):
--        if value not in [None, "sender", "receiver"]:
--            raise ValueError(f"Invalid context type {value}")
-+    def __post_init(self):
-+        if self.context_type not in [None, "sender", "receiver"]:
-+            raise ValueError(f"Invalid context type {self.context_type}")
- 
-     def add_argument(self, arg: Argument) -> None:
-         if arg.name in [a.name for a in self.arguments]:
-@@ -198,7 +192,7 @@ class Message:
-         return None
- 
- 
--@attr.s
-+@dataclass
- class Request(Message):
-     @classmethod
-     def create(
-@@ -225,7 +219,7 @@ class Request(Message):
-         return f"{self.interface.name}_request_{self.name}"
- 
- 
--@attr.s
-+@dataclass
- class Event(Message):
-     @classmethod
-     def create(
-@@ -252,17 +246,17 @@ class Event(Message):
-         return f"{self.interface.name}_event_{self.name}"
- 
- 
--@attr.s
-+@dataclass
- class Entry:
-     """
-     An enum entry
-     """
- 
--    name: str = attr.ib()
--    value: int = attr.ib()
--    enum: "Enum" = attr.ib()
--    summary: str = attr.ib()
--    since: int = attr.ib()
-+    name: str
-+    value: int
-+    enum: "Enum"
-+    summary: str
-+    since: int
- 
-     @classmethod
-     def create(
-@@ -278,15 +272,15 @@ class Entry:
-         return f"{self.enum.fqdn}_{self.name}"
- 
- 
--@attr.s
-+@dataclass
- class Enum:
--    name: str = attr.ib()
--    since: int = attr.ib()
--    interface: "Interface" = attr.ib()
--    is_bitfield: bool = attr.ib(default=False)
--    description: Optional[Description] = attr.ib(default=None)
-+    name: str
-+    since: int
-+    interface: "Interface"
-+    is_bitfield: bool = False
-+    description: Optional[Description] = None
- 
--    entries: List[Entry] = attr.ib(init=False, factory=list)
-+    entries: List[Entry] = field(init=False, default_factory=list)
- 
-     @classmethod
-     def create(
-@@ -329,16 +323,20 @@ class Enum:
-         return snake2camel(self.name)
- 
- 
--@attr.s
-+@dataclass
- class Interface:
--    protocol_name: str = attr.ib()  # name as in the XML, e.g. ei_pointer
--    version: int = attr.ib()
--    requests: List[Request] = attr.ib(init=False, factory=list)
--    events: List[Event] = attr.ib(init=False, factory=list)
--    enums: List[Enum] = attr.ib(init=False, factory=list)
-+    protocol_name: str  # name as in the XML, e.g. ei_pointer
-+    version: int
-+    requests: List[Request] = field(init=False, default_factory=list)
-+    events: List[Event] = field(init=False, default_factory=list)
-+    enums: List[Enum] = field(init=False, default_factory=list)
-+
-+    mode: str
-+    description: Optional[Description] = None
- 
--    mode: str = attr.ib(validator=attr.validators.in_(["ei", "eis", "brei"]))
--    description: Optional[Description] = attr.ib(default=None)
-+    def __post_init(self):
-+        if self.mode not in ["ei", "eis", "brei"]:
-+            raise ValueError(f"Invalid mode {self.mode}")
- 
-     @property
-     def name(self) -> str:
-@@ -444,11 +442,11 @@ class Interface:
-         return cls(protocol_name=protocol_name, version=version, mode=mode)
- 
- 
--@attr.s
-+@dataclass
- class XmlError(Exception):
--    line: int = attr.ib()
--    column: int = attr.ib()
--    message: str = attr.ib()
-+    line: int
-+    column: int
-+    message: str
- 
-     def __str__(self) -> str:
-         return f"line {self.line}:{self.column}: {self.message}"
-@@ -458,32 +456,34 @@ class XmlError(Exception):
-         return cls(line=location[0], column=location[1], message=message)
- 
- 
--@attr.s
-+@dataclass
- class Copyright:
--    text: str = attr.ib(default="")
--    is_complete: bool = attr.ib(init=False, default=False)
-+    text: str = ""
-+    is_complete: bool = field(init=False, default=False)
- 
- 
--@attr.s
-+@dataclass
- class Protocol:
--    copyright: Optional[str] = attr.ib(default=None)
--    interfaces: List[Interface] = attr.ib(factory=list)
-+    copyright: Optional[str] = None
-+    interfaces: List[Interface] = field(default_factory=list)
- 
- 
--@attr.s
-+@dataclass
- class ProtocolParser(xml.sax.handler.ContentHandler):
--    component: str = attr.ib()
--    interfaces: List[Interface] = attr.ib(factory=list)
--    copyright: Optional[Copyright] = attr.ib(init=False, default=None)
-+    component: str
-+    interfaces: List[Interface] = field(default_factory=list)
-+    copyright: Optional[Copyright] = field(init=False, default=None)
- 
--    current_interface: Optional[Interface] = attr.ib(init=False, default=None)
--    current_message: Optional[Union[Message, Enum]] = attr.ib(init=False, default=None)
--    current_description: Optional[Description] = attr.ib(init=False, default=None)
-+    current_interface: Optional[Interface] = field(init=False, default=None)
-+    current_message: Optional[Union[Message, Enum]] = field(init=False, default=None)
-+    current_description: Optional[Description] = field(init=False, default=None)
-     # A dict of arg name to interface_arg name mappings
--    current_interface_arg_names: Dict[str, str] = attr.ib(init=False, default=attr.Factory(dict))  # type: ignore
--    current_new_id_arg: Optional[Argument] = attr.ib(init=False, default=None)
-+    current_interface_arg_names: Dict[str, str] = field(
-+        init=False, default_factory=dict
-+    )
-+    current_new_id_arg: Optional[Argument] = field(init=False, default=None)
- 
--    _run_counter: int = attr.ib(init=False, default=0, repr=False)
-+    _run_counter: int = field(init=False, default=0, repr=False)
- 
-     @property
-     def location(self) -> Tuple[int, int]:
-diff --git ./proto/meson.build ./proto/meson.build
-index 95e9d07..db01a8b 100644
---- ./proto/meson.build
-+++ ./proto/meson.build
-@@ -13,7 +13,7 @@ if xmllint.found()
- endif
- 
- pymod = import('python')
--required_python_modules = ['attr', 'jinja2']
-+required_python_modules = ['jinja2']
- python = pymod.find_installation('python3', modules: required_python_modules)
- if python.language_version().version_compare('<3.9')
-     error('Python 3.9 or later required')
--- 
-2.45.2
-
diff --git a/dev-libs/libei/libei-1.3.0-r2.ebuild b/dev-libs/libei/libei-1.3.0-r2.ebuild
deleted file mode 100644
index 66a6bcf87938..000000000000
--- a/dev-libs/libei/libei-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit meson python-any-r1
-
-DESCRIPTION="Library for Emulated Input, primarily aimed at the Wayland stack"
-HOMEPAGE="https://gitlab.freedesktop.org/libinput/libei"
-SRC_URI="https://gitlab.freedesktop.org/libinput/${PN}/-/archive/${PV}/${P}.tar.bz2"
-MUNIT_COMMIT="fbbdf1467eb0d04a6ee465def2e529e4c87f2118"
-SRC_URI+=" https://github.com/nemequ/munit/archive/${MUNIT_COMMIT}.tar.gz -> munit-${MUNIT_COMMIT}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="elogind systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libevdev-1.9.902
-	|| (
-		systemd? ( >=sys-apps/systemd-237 )
-		elogind? ( >=sys-auth/elogind-237 )
-		sys-libs/basu
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	$(python_gen_any_dep '
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/jinja2[${PYTHON_USEDEP}]
-	')
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-			dev-python/pyyaml[${PYTHON_USEDEP}]
-			dev-python/structlog[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/1.3.0-skip-protocol-test.patch
-	"${FILESDIR}"/1.3.0-scanner-switch-to-using-dataclasses.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version \
-			"dev-python/pytest[${PYTHON_USEDEP}]" \
-			"dev-python/python-dbusmock[${PYTHON_USEDEP}]" \
-			"dev-python/pyyaml[${PYTHON_USEDEP}]" \
-			"dev-python/structlog[${PYTHON_USEDEP}]" \
-			|| return 1
-	fi
-	python_has_version \
-		"dev-python/attrs[${PYTHON_USEDEP}]" \
-		"dev-python/jinja2[${PYTHON_USEDEP}]" \
-		|| return 1
-}
-
-src_unpack() {
-	if [[ -n ${A} ]]; then
-		unpack ${A}
-		mv "${WORKDIR}"/munit-${MUNIT_COMMIT} "${WORKDIR}"/${P}/subprojects/munit || die
-		rm "${WORKDIR}"/${P}/subprojects/munit.wrap || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's:^valgrind = .*:valgrind = disabler():g' test/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=""
-		-Dliboeffis=enabled
-		$(meson_feature test tests)
-	)
-	if use systemd; then
-		emesonargs+=(-Dsd-bus-provider=libsystemd)
-	elif use elogind; then
-		emesonargs+=(-Dsd-bus-provider=libelogind)
-	else
-		emesonargs+=(-Dsd-bus-provider=basu)
-	fi
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# munit subproject is installed but not wanted
-	if use test; then
-		rm "${ED}"/usr/lib*/libmunit.so || die
-	fi
-}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 10adbc7db2cf..d0853f73f4a4 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,5 @@
 DIST libinput-1.27.1.tar.bz2 844741 BLAKE2B 816977ea6fdc84c160523ad574801f818cdf9f8da5b0ebe30e04a71c2d1ebd15e1530cacf4d56893ef3e23fa14cd7bcd25b6ce6661adf291e8d7a9d4ab2b7752 SHA512 c8312000d7ce8c6f209b233177358c53dc830769cf2a80bd23ceebb408a0371de668846a5d1321b6ef803b3c17af5c0aba941ce5a2dc1fac6a0d5d791a13088b
-DIST libinput-1.28.0.tar.bz2 863909 BLAKE2B 545e38f34be0ada14535f5928fa0863eedee5109f2aa191d780bdbfb4d67f81a1b6cb05ffdb39dc19d3f5e598e491acc4d1b91ddbf84ad69940c1988ff0d8f57 SHA512 2665fbfbf47f8ef329e387841ff9542b6191925d2fb46a19be64ef0b2e274db3b9ce8b42652ccdeb18c66e3a3c748ff576b313ecb8f7f6b4a01102bfb3e999e3
 DIST libinput-1.28.1.tar.bz2 864820 BLAKE2B fe245274951e8a010abfcd72722f8b5f96f9d879535374ee5180da56c575ca511c2007058a584d2b2336941f4242125876132a3bf398ccf2c855fb7a6ea69865 SHA512 354a91f2239da5e5bbb12bb7473bd1fb7adf69e6243e8da786ace9e80eda6c8f733620b5f1e20411c732fcfa4dedf5ccd2e722a78693e564a24771e80f1c72aa
 EBUILD libinput-1.27.1.ebuild 2373 BLAKE2B c009882ac5c3bae6e7a06654658f56eddb7e09519b6a186ac1cef70f02933f10266411dfd31d8f684a018f970ad3a40d32915df5475daffbe0bf132fd632745a SHA512 c3ad9e952b1ab6fe2de559c4aab5254fa9ecb0fd65d863b620304fc0bc5b4a8b7020eb052b6a4d324c00d10b51a4f57d45b8692475fc22ce6c0541a6a8bb49a4
-EBUILD libinput-1.28.0.ebuild 2380 BLAKE2B 979af13fca07832ef74589cd275a268f7a04f16d90576613a4c60ba4e3b540ca9ab6e597b1e73b88e1be67efd0168784a351bb49331001ffc78b4d4090bc3cd7 SHA512 1845cf1bc55e7a8c2aa707a85805dd5992a9105d6c311cbdf56392012360d96959ccfc87c71753e0dafc41aa973c5720ee2b441327d3541f1cfb31582090c44e
 EBUILD libinput-1.28.1.ebuild 2380 BLAKE2B 35fabdd52c867c388f9a4359c736cafc2fa08decf78c78807345a3ffbe73df7b0e6ae00e730bf2984eb9e298db078b6ed26e51e668e1fe29b9b8e6ff6bbc025d SHA512 ed7e9e95bb3d7f6dca11e632c37e47c1671fa2ed3d2ebc3c859d57f3d27ffaabd2bd28971c0d98a171d8a95079c891a0b2304456869d74633d95793adb728ce3
 MISC metadata.xml 339 BLAKE2B c649f0ffaad1b1dc76c3d3184d95356b2925f642ff6b96c3eba0c31a1d96c3d9b741c1348f8ec90d02428c30a836872fe4e42e7ab5f5e5197f4a787f9147a1a8 SHA512 e9aeca6cc4451ab5b622f597f8debaecfdc672244e5e0b687ac294c20009ba42fb2ccc45e7016a2427312e1c768259005e0a7ff53026087570382652ec23cb60
diff --git a/dev-libs/libinput/libinput-1.28.0.ebuild b/dev-libs/libinput/libinput-1.28.0.ebuild
deleted file mode 100644
index 3b150a3add3f..000000000000
--- a/dev-libs/libinput/libinput-1.28.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2014-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit meson optfeature python-any-r1 udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/10"
-if [[ $(ver_cut 3) -lt 900 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-IUSE="doc input_devices_wacom test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.27:= )
-	>=dev-libs/libevdev-1.9.902
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="
-	${RDEPEND}
-	test? ( >=dev-libs/check-0.9.10 )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-rtd-theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=app-text/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)
-"
-#	test? ( dev-debug/valgrind )
-
-python_check_deps() {
-	if use doc; then
-		python_has_version \
-			"dev-python/commonmark[${PYTHON_USEDEP}]" \
-			"dev-python/recommonmark[${PYTHON_USEDEP}]" \
-			"dev-python/sphinx[${PYTHON_USEDEP}]" \
-			">=dev-python/sphinx-rtd-theme-0.2.4[${PYTHON_USEDEP}]" \
-		|| return
-	fi
-	if use test; then
-		python_has_version \
-			"dev-python/pytest[${PYTHON_USEDEP}]" \
-			"dev-python/pytest-xdist[${PYTHON_USEDEP}]" \
-		|| return
-	fi
-}
-
-src_prepare() {
-	default
-	sed "s@, '-Werror'@@" -i meson.build || die #744250
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		$(meson_use test tests)
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	optfeature "measure and replay tools" dev-python/libevdev
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 3dcb304fab6c..16769098c828 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -49,6 +49,6 @@ EBUILD protobuf-27.5.ebuild 4098 BLAKE2B ebac46fe3198ada4f12aa5965c74a143a0526d3
 EBUILD protobuf-28.0.ebuild 4116 BLAKE2B bbf35a188a559c2ce720d502befb96c85ffb44a889d70d09c959bb292eb7ee6d1516f07389554ebc1ae2fa37a2d990a7be3275332d7ff388429e54d10aefa5e7 SHA512 7dbe1d3a031cee32ef793c1a535ac47bc12d108029b451394446b7fe9d62b9b83bc88c1dc8d8094d4698a6942ef7573119b4a5423a49c6ac8663cc1778d05626
 EBUILD protobuf-28.3-r1.ebuild 4278 BLAKE2B bb02aee6792a9773ae311add71bc8492cf33f3e38a30fc4799b7e0a462d82668c5ce5a62f299e778321b8a5f704b25cd51b97fee660bd879f8a6fc6505ce30c6 SHA512 c47411af0a205592f5cb42f62322525e4ae0ee70d523dd5d9f4d78e223288829949b3c2642d5e7b8e4380a1da12945258cc6fc3946f3cd2f49ce8a9ee6b01e64
 EBUILD protobuf-29.2.ebuild 4231 BLAKE2B ab642a2831834f9b42b1e63950c749966d0f863d1b091ef055f8d46970393f9fbc4b0f6d5341887df2ae30e7d61505c4c3cc0701bc468f73184b7381049f6f0c SHA512 a4fc31009bf9061fbc1c20eeffe6f49a702b7c8b0900e5899b03c229b372786e41caa63646a3ffb2a78db4b6da387e18c9e9045ca16e8b14eb8b731f75688018
-EBUILD protobuf-29.4.ebuild 4231 BLAKE2B ab642a2831834f9b42b1e63950c749966d0f863d1b091ef055f8d46970393f9fbc4b0f6d5341887df2ae30e7d61505c4c3cc0701bc468f73184b7381049f6f0c SHA512 a4fc31009bf9061fbc1c20eeffe6f49a702b7c8b0900e5899b03c229b372786e41caa63646a3ffb2a78db4b6da387e18c9e9045ca16e8b14eb8b731f75688018
+EBUILD protobuf-29.4.ebuild 4236 BLAKE2B 3096af820c8b24efac366b6487b5ea5996adc20995e697b71cf258e9411f595b272d18d457b2eebbdbe9cfb18225ab254f829f409c9897b5e7d984f6a9533444 SHA512 a46e6129a84e4f09503adc21abe4b62435c9193003984e0ad5f2747e8faefdddc3d2f9655a685e72ed21afe052c3a2501edccd5981ec46cc4c4f798f5e15ed11
 EBUILD protobuf-9999.ebuild 4211 BLAKE2B b6d9e27a8be5aa00ce1d2fd41be35c81b8f4e96128fc5b7eb8c6a8d36457331b265d6af411cff046d7704c0c7b0d65616feeda7f1dc98b38d1630fc1026e1666 SHA512 59c71d4607ef0818ca51683b6b8b4ccee4cc731427615fe2e06397645e1ea692432dc0f346240b2cf54f3d1b029606ba6f1b505daab0499a6303714d794a9ac7
 MISC metadata.xml 917 BLAKE2B c25c810e47e764843ad71be5eb5ebe617d881e7363ce3206401eb59c6df12969bc22bbedc34f08b0a2fbcf955de5b85aa8e4d3a964c1349f07ed1d0eb344a915 SHA512 baa5737981669f1b28ce32884698a4d91e0f1fbdde6056779307e1a6c85dde8ca36ee47ca3ce8794b996934dfafc5482afbe9532a7f3e17c833c3aef0a330376
diff --git a/dev-libs/protobuf/protobuf-29.4.ebuild b/dev-libs/protobuf/protobuf-29.4.ebuild
index 90c31cdfe7a2..92bb4f6121b5 100644
--- a/dev-libs/protobuf/protobuf-29.4.ebuild
+++ b/dev-libs/protobuf/protobuf-29.4.ebuild
@@ -19,7 +19,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 	MY_SLOT=$(ver_cut 1-2)
 fi