sys-apps/portage: Sync with Gentoo and take 3.0.81 early

changelog/updates/2026-06-24-portage-update.md

@@ -0,0 +1 @@
+- dev: portage ([3.0.81](https://codeberg.org/gentoo/portage/raw/tag/portage-3.0.81/NEWS) (includes [3.0.80](https://codeberg.org/gentoo/portage/raw/tag/portage-3.0.80/NEWS), [3.0.79](https://codeberg.org/gentoo/portage/raw/tag/portage-3.0.79/NEWS), [3.0.78](https://codeberg.org/gentoo/portage/raw/tag/portage-3.0.78/NEWS)))

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults

@@ -112,8 +112,8 @@ LINGUAS="en"
 PORTAGE_BZIP2_COMMAND="lbzip2"
 PORTAGE_BUNZIP2_COMMAND="lbunzip2"
 
-# Always build binary packages, remove old build logs, avoid running as root.
-FEATURES="buildpkg clean-logs compressdebug parallel-install splitdebug
+# Always remove old build logs, avoid running as root.
+FEATURES="clean-logs compressdebug parallel-install splitdebug
           userfetch userpriv usersandbox ipc-sandbox network-sandbox
           -ccache -merge-sync -binpkg-multi-instance"
 

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords

@@ -115,3 +115,6 @@ sys-apps/azure-vm-utils
 # Use unstable version for cross-compile fix. This needs to be at least as new
 # as app-containers/docker.
 =app-containers/docker-cli-29.1.3
+
+# Take this version early for a cross fix and buildpkg-proactive.
+=sys-apps/portage-3.0.81

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc

@@ -3,10 +3,6 @@
 CROS_BUILD_BOARD_TREE="${SYSROOT}/build"
 CROS_ADDONS_TREE="/mnt/host/source/src/third_party/coreos-overlay/coreos"
 
-# EAPI 9 is not exporting those variables, but some of them are still
-# used by cross-pkg-config, for instance.
-export ARCH EROOT ESYSROOT BROOT ROOT SYSROOT EPREFIX
-
 # Are we merging for the board sysroot, or for the SDK, or for
 # the images? Returns a string in a passed variable:
 #

sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults

@@ -8,8 +8,11 @@ USE="${USE} -cros_host -expat -cairo -X -man"
 USE="${USE} -acl -gpm -python"
 USE="${USE} -fortran -abiword -perl -poppler-data"
 
+# Proactively ensure usable binary packages exist for building an image.
+FEATURES="buildpkg buildpkg-proactive"
+
 # Exclude documentation
-FEATURES="nodoc noinfo noman"
+FEATURES="${FEATURES} nodoc noinfo noman"
 
 # Exclude even more documentation
 # Remove bash-completion files as we don't install bash-completion.

sdk_container/src/third_party/portage-stable/eclass/acct-user.eclass

@@ -1,4 +1,4 @@
-# Copyright 2019-2025 Gentoo Authors
+# Copyright 2019-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: acct-user.eclass
@@ -19,7 +19,7 @@
 # on the package providing it.
 #
 # The ebuild needs to call acct-user_add_deps after specifying
-# ACCT_USER_GROUPS.
+# ACCT_USER_GROUPS or ACCT_USER_HOME_OWNER.
 #
 # Example:
 # If your package needs user 'foo' belonging to same-named group, you
@@ -152,8 +152,8 @@ S=${WORKDIR}
 
 # @FUNCTION: acct-user_add_deps
 # @DESCRIPTION:
-# Generate appropriate RDEPEND from ACCT_USER_GROUPS.  This must be
-# called if ACCT_USER_GROUPS are set.
+# Generate appropriate RDEPEND from ACCT_USER_GROUPS and
+# ACCT_USER_HOME_OWNER.  This must be called if one of these are set.
 acct-user_add_deps() {
 	debug-print-function ${FUNCNAME} "$@"
 
@@ -165,6 +165,23 @@ acct-user_add_deps() {
 	fi
 
 	RDEPEND+=${ACCT_USER_GROUPS[*]/#/ acct-group/}
+
+	local user group
+	case ${ACCT_USER_HOME_OWNER} in
+		*:*)
+			user=${ACCT_USER_HOME_OWNER%:*}
+			group=${ACCT_USER_HOME_OWNER#*:} ;;
+		*)
+			user=${ACCT_USER_HOME_OWNER}
+			group= ;;
+	esac
+
+	# Add ACCT_USER_HOME_OWNER dependencies if necessary.
+	[[ -n ${user} && ${user} != "${ACCT_USER_NAME}" ]] &&
+		RDEPEND+=" acct-user/${user}"
+	[[ -n ${group} ]] && ! has "${group}" "${ACCT_USER_GROUPS[@]}" &&
+		RDEPEND+=" acct-group/${group}"
+
 	_ACCT_USER_ADD_DEPS_CALLED=1
 }
 

sdk_container/src/third_party/portage-stable/sys-apps/portage/Manifest

@@ -1,3 +1,3 @@
-DIST portage-3.0.77.tar.bz2 1222765 BLAKE2B 062b99059582caf323001b14e74d5ad762aeb4ece9750dcd548b4eddacabea60044dbb8006911c458c2550b7f1f86a5e91c5f0f67b37a3c839a1d7bac751376c SHA512 bae4d30d53473402a90c21923c71e81463e0f1afc1300f194d67b1af109eca71bd52ca82a1c17881871b9c30a64d584eb0392daab81b38c622cb2384afd195b7
-DIST portage-3.0.78.tar.bz2 1234503 BLAKE2B fecc7def9d2b3cbeb022a1807f9f3db643b4000b1c9674bf2306f6a7b13ef163f7243c9f62e035ef1c0ee5d49f2fdd25b63ff6ae100c9adf59fd3c9352e80410 SHA512 38243d05ad6d253275f19e7c90bc527fe63f6c26a82e7135c603f853612af42c1038ae3269637049ba7212e9caebfe80004d735c02c84882a35fdbc48d3777de
 DIST portage-3.0.79.tar.bz2 1235108 BLAKE2B 279b874be40f3ba610d8dc439683a388dc926cabe236dc4426a64fcd1267484312e84b15fb44c80ecb0ddce50cace4c9fc3f29886b6911d4199ed611fbecf28d SHA512 63df73d0fb2fd5ff7e6f0cacd8999aca0c99b91fbe2a2be0204a597e8230ecc1e60dcad0f24d9200b5948dec2c7e1e417853805d19beaf748c1f16490e64036c
+DIST portage-3.0.80.tar.bz2 1237591 BLAKE2B 58b5a54629f9be4f768a94e16acf73e07c47622fa488450e22e36be8e0b006e05c1ed22aab2ba5787c88f8ddbaadcec6b3dde02bb9e2967994723fcb3b97f6dc SHA512 91a98ab1e8ff75a4207f0b2ec664c023928278e99f5c758704dd6ce06073d4544d7785584adeb80ab7853218373ea1f16af1c11fcb5bdde659f730dbfa632cae
+DIST portage-3.0.81.tar.bz2 1239236 BLAKE2B 8f94a276ba5e2602701dbf876ab46408a644831862cd040b589d7568cef1b3ed4e7735eab82076bcb5113c022ae6e2858b9279c8b9c3b76ff8b0bce6cef8c597 SHA512 59a0fe9d6cfb4cf3cf03ac87d6da0e63c776004c805f1fe8834ff7aedda75efafa608cdbc0458a70b9e4d039c290352e7c47d925e773f68e1934d1b77b0920b6

sdk_container/src/third_party/portage-stable/sys-apps/portage/files/0001-Workaround-import-problem-after-Python-upgrade.patch

@@ -0,0 +1,47 @@
+From e7cf51fd6a504b2ab9d887c562c2ca3ace12d033 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 31 May 2026 17:30:41 +0200
+Subject: [PATCH] Workaround import problem after Python upgrade
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+To: gentoo-portage-dev@lists.gentoo.org
+
+Make `SyncfsProcess` import non-lazy to ensure that it is imported
+before the old-Python version of Portage is removed, and therefore fix
+a crash when Portage is being rebuilt for a new Python version.
+
+Bug: https://bugs.gentoo.org/970375
+Closes: https://github.com/gentoo/portage/pull/1586
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+Signed-off-by: Mike Gilbert <floppym@gentoo.org>
+---
+ lib/portage/dbapi/vartree.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lib/portage/dbapi/vartree.py b/lib/portage/dbapi/vartree.py
+index 87d4f3453238..7f392588ef9a 100644
+--- a/lib/portage/dbapi/vartree.py
++++ b/lib/portage/dbapi/vartree.py
+@@ -43,6 +43,10 @@ from portage import _unicode_encode
+ from portage.util.futures.executor.fork import ForkExecutor
+ from ._VdbMetadataDelta import VdbMetadataDelta
+
++# Made global to fix importing on Python version upgrade:
++# https://bugs.gentoo.org/970375
++from ._SyncfsProcess import SyncfsProcess
++
+ from _emerge.EbuildBuildDir import EbuildBuildDir
+ from _emerge.EbuildPhase import EbuildPhase
+ from _emerge.emergelog import emergelog
+@@ -6128,7 +6132,6 @@ class dblink:
+         does nothing if FEATURES=merge-sync is disabled.
+         """
+         import subprocess
+-        from portage.dbapi._SyncfsProcess import SyncfsProcess
+
+         if not self._device_path_map or "merge-sync" not in self.settings.features:
+             return
+-- 
+2.54.0
+

sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.77-r4.ebuild → sdk_container/src/third_party/portage-stable/sys-apps/portage/portage-3.0.79-r1.ebuild

@@ -93,9 +93,7 @@ PDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/0001-estrip-silence-noise-from-objcopy-if-build-ID-sectio.patch
-	"${FILESDIR}"/0002-Revert-depgraph-earlier-slot-operator-backtracking.patch
-	"${FILESDIR}"/0003-estrip-Don-t-break-the-debuglink-CRC-with-the-salted.patch
+	"${FILESDIR}/0001-Workaround-import-problem-after-Python-upgrade.patch"
 )
 
 pkg_pretend() {