Adding metadata

9 files changed, 236 insertions, 405 deletions

diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 144f62adb755..0b1124d9299a 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1 +1,2 @@
 DIST accountsservice-23.13.9.tar.xz 636064 BLAKE2B 74dbbe816937e626ba0f6524b4293466ac2905f474396f5d23633e966d46e013de110671abcbfe2911fffa1e98872e2525b61594a967f917975ebf18d39b8547 SHA512 c6eb543ce2e07b61bbdfa454e388949bc688517be0536b14f30c66383ed105b15d3fab8b6c62b1eaa08f67d9bdc29b928729d9f7c704f47de4decf0de8e12f89
+DIST accountsservice-26.27.3.tar.bz2 671850 BLAKE2B 3609f7b3845d98d5e1c3f2303cb4f300d1fe4d5124f857a08105d6b4d5cb6b175ff22b7d77d86732759eb0b9a9d078578161ef7e4cb5baa354a0f9dbf7fbfeaf SHA512 443cb2f3e418ea028828a7ac53b101c9888ba4750d053e11a3d0678f7269dcba0f1d8f2426e772c0795ee15622953692893eaec92667f217c9caa57bbc4a0c8d
diff --git a/sys-apps/accountsservice/accountsservice-23.13.9-r1.ebuild b/sys-apps/accountsservice/accountsservice-23.13.9-r1.ebuild
new file mode 100644
index 000000000000..c547ae0558ae
--- /dev/null
+++ b/sys-apps/accountsservice/accountsservice-23.13.9-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2011-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{13..14} )
+inherit meson python-any-r1 systemd vala
+
+DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/AccountsService/ https://gitlab.freedesktop.org/accountsservice/accountsservice"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="doc elogind gtk-doc +introspection selinux systemd test vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="^^ ( elogind systemd )"
+
+CDEPEND="
+	>=dev-libs/glib-2.63.5:2
+	sys-auth/polkit
+	virtual/libcrypt:=
+	elogind? ( >=sys-auth/elogind-229.4 )
+	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
+	systemd? ( >=sys-apps/systemd-186:0= )
+"
+DEPEND="${CDEPEND}
+	sys-apps/dbus
+"
+BDEPEND="
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.80.5-r1
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	)
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-accountsd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-22.04.62-gentoo-system-users.patch
+	"${FILESDIR}"/${PN}-23.13.9-generate-version.patch #905770
+	"${FILESDIR}"/${PN}-23.13.9-test-languages.patch #903347
+	# From Alpine Linux
+	# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/97
+	"${FILESDIR}"/${PN}-23.13.9-musl-fixes.patch
+	"${FILESDIR}"/${PN}-23.13.9-c99-fixes.patch #930715
+	"${FILESDIR}"/${PN}-23.13.9-test-fix.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	default
+
+	use vala && vala_setup
+}
+
+src_configure() {
+	# No option to disable tests
+	if ! use test; then
+		sed -e "/subdir('tests')/d" -i meson.build || die
+	fi
+
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dadmin_group="wheel"
+		$(meson_use elogind)
+		$(meson_use introspection)
+		$(meson_use doc docbook)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/90
+	if use doc; then
+		mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# This directories are created at runtime when needed
+	rm -r "${ED}"/var/lib || die
+
+	newinitd "${FILESDIR}"/accounts-daemon.initd accounts-daemon
+}
diff --git a/sys-apps/accountsservice/accountsservice-26.27.3.ebuild b/sys-apps/accountsservice/accountsservice-26.27.3.ebuild
new file mode 100644
index 000000000000..d46116d97d99
--- /dev/null
+++ b/sys-apps/accountsservice/accountsservice-26.27.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2011-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{13..14} )
+inherit meson python-any-r1 systemd vala
+
+DESCRIPTION="D-Bus interfaces for querying and manipulating user account information"
+HOMEPAGE="https://gitlab.freedesktop.org/accountsservice/accountsservice"
+SRC_URI="https://gitlab.freedesktop.org/accountsservice/accountsservice/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="doc elogind gtk-doc +introspection selinux systemd test vala xcrypt"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="^^ ( elogind systemd )"
+
+CDEPEND="
+	>=dev-libs/glib-2.70:2
+	sys-auth/polkit
+	>=dev-libs/json-c-0.15
+	virtual/libcrypt:=
+	elogind? ( >=sys-auth/elogind-229.4 )
+	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2:= )
+	systemd? ( >=sys-apps/systemd-186:0= )
+	xcrypt? ( sys-libs/libxcrypt )
+"
+DEPEND="${CDEPEND}
+	sys-apps/dbus
+"
+BDEPEND="
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.80.5-r1
+	dev-util/glib-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	)
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-accountsd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-22.04.62-gentoo-system-users.patch
+	"${FILESDIR}"/${PN}-23.13.9-test-languages.patch #903347
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	default
+
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dadmin_group="wheel"
+		-Dcreate_homed=false
+		$(meson_use elogind)
+		$(meson_use introspection)
+		$(meson_use doc docbook)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use test tests)
+		$(meson_use vala vapi)
+		$(meson_use xcrypt libxcrypt)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/90
+	if use doc; then
+		mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# This directories are created at runtime when needed
+	rm -r "${ED}"/var/lib || die
+
+	newinitd "${FILESDIR}"/accounts-daemon.initd accounts-daemon
+}
diff --git a/sys-apps/accountsservice/files/accounts-daemon.initd b/sys-apps/accountsservice/files/accounts-daemon.initd
new file mode 100644
index 000000000000..874eb3a6e1c2
--- /dev/null
+++ b/sys-apps/accountsservice/files/accounts-daemon.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+
+# systemd service file
+
+GVFS_DISABLE_FUSE=1
+GIO_USE_VFS=local
+GVFS_REMOTE_VOLUME_MONITOR_IGNORE=1
+
+supervisor=supervise-daemon
+
+command="/usr/libexec/accounts-daemon"
+no_new_privs=1
+
+depend() {
+	need dbus elogind
+}
+
+start_pre() {
+	checkpath -d -m 775 /var/lib/AccountsService
+}
diff --git a/sys-apps/accountsservice/metadata.xml b/sys-apps/accountsservice/metadata.xml
index 19f586417b4a..126dd12b4b8c 100644
--- a/sys-apps/accountsservice/metadata.xml
+++ b/sys-apps/accountsservice/metadata.xml
@@ -8,6 +8,7 @@
   <use>
     <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
     <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> for session tracking</flag>
+    <flag name="xcrypt">Enable crypt through <pkg>sys-libs/libxcrypt</pkg> package</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:freedesktop:accountsservice</remote-id>
diff --git a/sys-apps/portage/files/0001-estrip-silence-noise-from-objcopy-if-build-ID-sectio.patch b/sys-apps/portage/files/0001-estrip-silence-noise-from-objcopy-if-build-ID-sectio.patch
deleted file mode 100644
index 5afac81af8f8..000000000000
--- a/sys-apps/portage/files/0001-estrip-silence-noise-from-objcopy-if-build-ID-sectio.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 71dd5e89eaa5868418e13da6605fe3873939c60b Mon Sep 17 00:00:00 2001
-Message-ID: <71dd5e89eaa5868418e13da6605fe3873939c60b.1771041192.git.sam@gentoo.org>
-From: Sam James <sam@gentoo.org>
-Date: Sat, 14 Feb 2026 03:44:08 +0000
-Subject: [PATCH] estrip: silence noise from objcopy if build ID section
- doesn't exist
-
-This is a tiny fix suitable for backporting into the ebuild until
-the refactoring for estrip lands.
-
-It avoids noise when there's no build ID section to update w/ a salted
-replacement.
-
-Bug: https://bugs.gentoo.org/968220
-Signed-off-by: Sam James <sam@gentoo.org>
----
- bin/estrip | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/estrip b/bin/estrip
-index 6e2a5b623..54c5a6e33 100755
---- a/bin/estrip
-+++ b/bin/estrip
-@@ -171,7 +171,7 @@ save_elf_debug() {
- 
- 					# We need to process the splitdebug file too
- 					# if we're doing it at this late juncture (bug #968220)
--					"${name_of[objcopy]}" --dump-section .note.gnu.build-id="${inode_link}_buildid" "${src}" \
-+					"${name_of[objcopy]}" --dump-section .note.gnu.build-id="${inode_link}_buildid" "${src}" 2>/dev/null \
- 						&& "${name_of[objcopy]}" --update-section .note.gnu.build-id="${inode_link}_buildid" "${dst}"
- 					rm -f "${inode_link}_buildid"
- 				elif ! contains_word buildid "${warned_for[debugedit]}"; then
--- 
-2.53.0
-
-From e87494699b30eb9458cb0fb9e05479389904dcb3 Mon Sep 17 00:00:00 2001
-Message-ID: <e87494699b30eb9458cb0fb9e05479389904dcb3.1771352319.git.sam@gentoo.org>
-From: Sam James <sam@gentoo.org>
-Date: Sun, 15 Feb 2026 14:46:34 +0000
-Subject: [PATCH] estrip: silence (further) noise from objcopy if build ID
- section doesn't exist
-
-Followup to 71dd5e89eaa5868418e13da6605fe3873939c60b.
-
-Bug: https://bugs.gentoo.org/968220
-Signed-off-by: Sam James <sam@gentoo.org>
----
- bin/estrip | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/estrip b/bin/estrip
-index 54c5a6e33..526a1f203 100755
---- a/bin/estrip
-+++ b/bin/estrip
-@@ -172,7 +172,7 @@ save_elf_debug() {
- 					# We need to process the splitdebug file too
- 					# if we're doing it at this late juncture (bug #968220)
- 					"${name_of[objcopy]}" --dump-section .note.gnu.build-id="${inode_link}_buildid" "${src}" 2>/dev/null \
--						&& "${name_of[objcopy]}" --update-section .note.gnu.build-id="${inode_link}_buildid" "${dst}"
-+						&& "${name_of[objcopy]}" --update-section .note.gnu.build-id="${inode_link}_buildid" "${dst}" 2>/dev/null
- 					rm -f "${inode_link}_buildid"
- 				elif ! contains_word buildid "${warned_for[debugedit]}"; then
- 					warned_for[debugedit]+=" buildid"
--- 
-2.53.0
-
diff --git a/sys-apps/portage/files/0002-Revert-depgraph-earlier-slot-operator-backtracking.patch b/sys-apps/portage/files/0002-Revert-depgraph-earlier-slot-operator-backtracking.patch
deleted file mode 100644
index 9e6a9fcfcfce..000000000000
--- a/sys-apps/portage/files/0002-Revert-depgraph-earlier-slot-operator-backtracking.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-From e1322d74de41e989f709e0129ac41e5469b9cc4c Mon Sep 17 00:00:00 2001
-Message-ID: <e1322d74de41e989f709e0129ac41e5469b9cc4c.1775418696.git.sam@gentoo.org>
-From: Zac Medico <zmedico@gentoo.org>
-Date: Fri, 20 Feb 2026 19:05:12 -0800
-Subject: [PATCH] Revert "depgraph: earlier slot operator backtracking"
-
-This reverts commit 8ddd35e04bb4c50a85d7cc61edb85d91dd10ce4b.
-
-Bug: https://bugs.gentoo.org/969654
-Bug: https://bugs.gentoo.org/964705
-Bug: https://bugs.gentoo.org/968228
-Signed-off-by: Zac Medico <zmedico@gentoo.org>
----
- lib/_emerge/depgraph.py                       | 152 +++++++++---------
- .../test_binpackage_downgrades_slot_dep.py    |   3 +
- .../tests/resolver/test_missed_update.py      |   3 +
- 3 files changed, 86 insertions(+), 72 deletions(-)
-
-diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
-index 7ac07ad5e..5d9888229 100644
---- a/lib/_emerge/depgraph.py
-+++ b/lib/_emerge/depgraph.py
-@@ -1937,9 +1937,16 @@ class depgraph:
-             # conflicts (or by blind luck).
-             raise self._unknown_internal_error()
- 
-+        # Both _process_slot_conflict and _slot_operator_trigger_reinstalls
-+        # can call _slot_operator_update_probe, which requires that
-+        # self._dynamic_config._blocked_pkgs has been initialized by a
-+        # call to the _validate_blockers method.
-         for conflict in self._dynamic_config._package_tracker.slot_conflicts():
-             self._process_slot_conflict(conflict)
- 
-+        if self._dynamic_config._allow_backtracking:
-+            self._slot_operator_trigger_reinstalls()
-+
-     def _process_slot_conflict(self, conflict):
-         """
-         Process slot conflict data to identify specific atoms which
-@@ -2895,50 +2902,50 @@ class depgraph:
- 
-         return None
- 
--    def _slot_operator_trigger_backtracking(self, dep: Dependency) -> bool:
-+    def _slot_operator_trigger_reinstalls(self):
-         """
--        Trigger backtracking for slot operator issues if needed.
--        Return True if this triggers backtracking, and False otherwise.
-+        Search for packages with slot-operator deps on older slots, and schedule
-+        rebuilds if they can link to a newer slot that's in the graph.
-         """
--        if not self._dynamic_config._allow_backtracking:
--            return False
--
--        atom = dep.atom
--
--        if not (atom.soname or atom.slot_operator_built):
--            new_child_slot = self._slot_change_probe(dep)
--            if new_child_slot is not None:
--                self._slot_change_backtrack(dep, new_child_slot)
--                return True
--
--        if not (dep.parent and isinstance(dep.parent, Package) and dep.parent.built):
--            return False
- 
-         rebuild_if_new_slot = (
-             self._dynamic_config.myparams.get("rebuild_if_new_slot", "y") == "y"
-         )
- 
--        # If the parent is not installed, check if it needs to be
--        # rebuilt against an installed instance, since otherwise
--        # it could trigger downgrade of an installed instance as
--        # in bug #652938.
--        want_update_probe = dep.want_update or not dep.parent.installed
--
--        # Check for slot update first, since we don't want to
--        # trigger reinstall of the child package when a newer
--        # slot will be used instead.
--        if rebuild_if_new_slot and want_update_probe:
--            new_dep = self._slot_operator_update_probe(dep, new_child_slot=True)
--            if new_dep is not None:
--                self._slot_operator_update_backtrack(dep, new_child_slot=new_dep.child)
--                return True
-+        for slot_key, slot_info in self._dynamic_config._slot_operator_deps.items():
-+            for dep in slot_info:
-+                atom = dep.atom
- 
--        if want_update_probe:
--            if self._slot_operator_update_probe(dep):
--                self._slot_operator_update_backtrack(dep)
--                return True
-+                if not (atom.soname or atom.slot_operator_built):
-+                    new_child_slot = self._slot_change_probe(dep)
-+                    if new_child_slot is not None:
-+                        self._slot_change_backtrack(dep, new_child_slot)
-+                    continue
- 
--        return False
-+                if not (
-+                    dep.parent and isinstance(dep.parent, Package) and dep.parent.built
-+                ):
-+                    continue
-+
-+                # If the parent is not installed, check if it needs to be
-+                # rebuilt against an installed instance, since otherwise
-+                # it could trigger downgrade of an installed instance as
-+                # in bug #652938.
-+                want_update_probe = dep.want_update or not dep.parent.installed
-+
-+                # Check for slot update first, since we don't want to
-+                # trigger reinstall of the child package when a newer
-+                # slot will be used instead.
-+                if rebuild_if_new_slot and want_update_probe:
-+                    new_dep = self._slot_operator_update_probe(dep, new_child_slot=True)
-+                    if new_dep is not None:
-+                        self._slot_operator_update_backtrack(
-+                            dep, new_child_slot=new_dep.child
-+                        )
-+
-+                if want_update_probe:
-+                    if self._slot_operator_update_probe(dep):
-+                        self._slot_operator_update_backtrack(dep)
- 
-     def _reinstall_for_flags(
-         self, pkg, forced_flags, orig_use, orig_iuse, cur_use, cur_iuse
-@@ -3429,6 +3436,44 @@ class depgraph:
-                     raise
-                 del e
- 
-+        # NOTE: REQUIRED_USE checks are delayed until after
-+        # package selection, since we want to prompt the user
-+        # for USE adjustment rather than have REQUIRED_USE
-+        # affect package selection and || dep choices.
-+        if (
-+            not pkg.built
-+            and pkg._metadata.get("REQUIRED_USE")
-+            and eapi_has_required_use(pkg.eapi)
-+        ):
-+            required_use_is_sat = check_required_use(
-+                pkg._metadata["REQUIRED_USE"],
-+                self._pkg_use_enabled(pkg),
-+                pkg.iuse.is_valid_flag,
-+                eapi=pkg.eapi,
-+            )
-+            if not required_use_is_sat:
-+                if dep.atom is not None and dep.parent is not None:
-+                    self._add_parent_atom(pkg, (dep.parent, dep.atom))
-+
-+                if arg_atoms:
-+                    for parent_atom in arg_atoms:
-+                        parent, atom = parent_atom
-+                        self._add_parent_atom(pkg, parent_atom)
-+
-+                atom = dep.atom
-+                if atom is None:
-+                    atom = Atom("=" + pkg.cpv)
-+                self._dynamic_config._unsatisfied_deps_for_display.append(
-+                    ((pkg.root, atom), {"myparent": dep.parent, "show_req_use": pkg})
-+                )
-+                self._dynamic_config._required_use_unsatisfied = True
-+                self._dynamic_config._skip_restart = True
-+                # Add pkg to digraph in order to enable autounmask messages
-+                # for this package, which is useful when autounmask USE
-+                # changes have violated REQUIRED_USE.
-+                self._dynamic_config.digraph.add(pkg, dep.parent, priority=priority)
-+                return 0
-+
-         if not pkg.onlydeps:
-             existing_node, existing_node_matches = self._check_slot_conflict(
-                 pkg, dep.atom
-@@ -3587,43 +3632,6 @@ class depgraph:
-             and (dep.atom.soname or dep.atom.slot_operator == "=")
-         ):
-             self._add_slot_operator_dep(dep)
--            if self._slot_operator_trigger_backtracking(dep):
--                # Drop slot operator deps that trigger backtracking, since
--                # they may be irrelevant and therefore we don't want to
--                # enforce the REQUIRED_USE check that comes below (bug 964705).
--                # Since backtracking has been triggered, the _need_restart flag
--                # is set and this depgraph is only useful for collecting
--                # backtracking parameters at this point, so it is acceptable to
--                # drop dependencies as needed. It would not be acceptable to
--                # abort depgraph creation here, since that would not scale well
--                # for large numbers of slot operator rebuilds.
--                return 1
--
--        # NOTE: REQUIRED_USE checks are delayed until after
--        # package selection, since we want to prompt the user
--        # for USE adjustment rather than have REQUIRED_USE
--        # affect package selection and || dep choices.
--        if (
--            not pkg.built
--            and pkg._metadata.get("REQUIRED_USE")
--            and eapi_has_required_use(pkg.eapi)
--        ):
--            required_use_is_sat = check_required_use(
--                pkg._metadata["REQUIRED_USE"],
--                self._pkg_use_enabled(pkg),
--                pkg.iuse.is_valid_flag,
--                eapi=pkg.eapi,
--            )
--            if not required_use_is_sat:
--                atom = dep.atom
--                if atom is None:
--                    atom = Atom("=" + pkg.cpv)
--                self._dynamic_config._unsatisfied_deps_for_display.append(
--                    ((pkg.root, atom), {"myparent": dep.parent, "show_req_use": pkg})
--                )
--                self._dynamic_config._required_use_unsatisfied = True
--                self._dynamic_config._skip_restart = True
--                return 0
- 
-         recurse = deep is True or not self._too_deep(self._depth_increment(depth, n=1))
-         dep_stack = self._dynamic_config._dep_stack
-diff --git a/lib/portage/tests/resolver/test_binpackage_downgrades_slot_dep.py b/lib/portage/tests/resolver/test_binpackage_downgrades_slot_dep.py
-index b47f73dcb..699cd1c46 100644
---- a/lib/portage/tests/resolver/test_binpackage_downgrades_slot_dep.py
-+++ b/lib/portage/tests/resolver/test_binpackage_downgrades_slot_dep.py
-@@ -1,6 +1,8 @@
- # Copyright 2025 Gentoo Authors
- # Distributed under the terms of the GNU General Public License v2
- 
-+import pytest
-+
- from portage.tests import TestCase
- from portage.tests.resolver.ResolverPlayground import (
-     ResolverPlayground,
-@@ -9,6 +11,7 @@ from portage.tests.resolver.ResolverPlayground import (
- 
- 
- class BinpackageDowngradesSlotDepTestCase(TestCase):
-+    @pytest.mark.xfail()
-     def testBinpackageDowngradesSlotDep(self):
-         python_use = "python_targets_python3_12 +python_targets_python3_13"
-         python_usedep = "python_targets_python3_12(-)?,python_targets_python3_13(-)?"
-diff --git a/lib/portage/tests/resolver/test_missed_update.py b/lib/portage/tests/resolver/test_missed_update.py
-index 6813a9172..2c15a16c8 100644
---- a/lib/portage/tests/resolver/test_missed_update.py
-+++ b/lib/portage/tests/resolver/test_missed_update.py
-@@ -1,6 +1,8 @@
- # Copyright 2026 Gentoo Authors
- # Distributed under the terms of the GNU General Public License v2
- 
-+import pytest
-+
- from portage.tests import TestCase
- from portage.tests.resolver.ResolverPlayground import (
-     ResolverPlayground,
-@@ -9,6 +11,7 @@ from portage.tests.resolver.ResolverPlayground import (
- 
- 
- class MissedQtUpdateTestCase(TestCase):
-+    @pytest.mark.xfail()
-     def testMissedQtUpdate(self):
-         """
-         Testcase where Portage was unable to upgrade from
--- 
-2.53.0
-
diff --git a/sys-apps/portage/files/0003-estrip-Don-t-break-the-debuglink-CRC-with-the-salted.patch b/sys-apps/portage/files/0003-estrip-Don-t-break-the-debuglink-CRC-with-the-salted.patch
deleted file mode 100644
index 2ee28b9b49ed..000000000000
--- a/sys-apps/portage/files/0003-estrip-Don-t-break-the-debuglink-CRC-with-the-salted.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c568ef909922c307dd99acfebc1214e6ea88e075 Mon Sep 17 00:00:00 2001
-Message-ID: <c568ef909922c307dd99acfebc1214e6ea88e075.1775418711.git.sam@gentoo.org>
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 27 Mar 2026 18:34:43 +0000
-Subject: [PATCH] estrip: Don't break the debuglink CRC with the salted build
- ID
-
-Closes: https://bugs.gentoo.org/971641
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
-Part-of: https://github.com/gentoo/portage/pull/1568
-Closes: https://github.com/gentoo/portage/pull/1568
----
- NEWS       | 2 ++
- bin/estrip | 8 ++++++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 923c99a74..94b2f8b98 100644
---- a/NEWS
-+++ b/NEWS
-@@ -70,6 +70,8 @@ Bug fixes:
- 
- * estrip: Silence noise from objcopy when no build ID section exists (bug #968220).
- 
-+* estrip: Don't break the debuglink CRC with the salted build ID (bug #971641).
-+
- portage-3.0.77 (2026-01-23)
- --------------
- 
-diff --git a/bin/estrip b/bin/estrip
-index 526a1f203..166f68087 100755
---- a/bin/estrip
-+++ b/bin/estrip
-@@ -143,8 +143,7 @@ save_elf_debug() {
- 			if (( has_feature[compressdebug] )); then
- 				objcopy_flags+=( --compress-debug-sections )
- 			fi
--			"${name_of[objcopy]}" "${objcopy_flags[@]}" "${src}" "${dst}" \
--			&& "${name_of[objcopy]}" --add-gnu-debuglink="${dst}" "${src}"
-+			"${name_of[objcopy]}" "${objcopy_flags[@]}" "${src}" "${dst}"
- 		fi
- 
- 		# Only do the following if the debug file was
-@@ -199,6 +198,11 @@ save_elf_debug() {
- 				__try_symlink "${src_buildid_rel}" "${buildid_file}"
- 			fi
- 		fi
-+
-+		if [[ -z ${splitdebug} ]] ; then
-+			# Add debuglink last to avoid the salted build ID breaking the CRC.
-+			"${name_of[objcopy]}" --add-gnu-debuglink="${dst}" "${src}"
-+		fi
- 	fi
- }
- 
--- 
-2.53.0
-
diff --git a/sys-apps/rng-tools/files/rng-tools-6.16-c99.patch b/sys-apps/rng-tools/files/rng-tools-6.16-c99.patch
deleted file mode 100644
index dad35eeed1ff..000000000000
--- a/sys-apps/rng-tools/files/rng-tools-6.16-c99.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/919399
-https://github.com/nhorman/rng-tools/pull/205
-
-From 593e326815ba7ee820ee2f0a3c45279282f07c34 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Tue, 19 Dec 2023 10:32:11 +0100
-Subject: [PATCH] configure: Fix m4 quoting issue in libargp probe
-
-Without the surrounding [], m4 drops the inner [], treating, argv[] as
-argv.  This results in an incorrect argument type for argp_parse,
-causing the probe to fail with future compilers due to type error.
---- a/configure.ac
-+++ b/configure.ac
-@@ -196,7 +196,7 @@ AS_IF(
- 		AC_LINK_IFELSE(
- 			[AC_LANG_PROGRAM(
- 				[#include <argp.h>],
--				[int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;]
-+				[[int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;]]
- 				)],
- 			[need_libargp=no],
- 			[need_libargp=yes