commit: 879a0e8cb85c68b99625b28a00a5dc846bfac7d7
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 22 14:17:54 2025 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Nov 22 14:17:54 2025 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=879a0e8c
Merge remote-tracking branch 'origin/master' into prefix
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
NEWS | 59 ++
bin/ebuild-helpers/emake | 5 +-
bin/ecompress | 37 +-
bin/egencache | 22 +-
bin/misc-functions.sh | 4 +-
cnf/make.globals | 5 +-
lib/_emerge/EbuildBinpkg.py | 13 +-
lib/_emerge/actions.py | 123 +++-
lib/_emerge/depgraph.py | 34 +-
lib/portage/__init__.py | 2 +-
lib/portage/_emirrordist/FetchTask.py | 19 +-
lib/portage/cache/metadata.py | 29 +-
lib/portage/dbapi/bintree.py | 723 +++++++++++----------
lib/portage/dep/dep_check.py | 8 +-
lib/portage/eapi.py | 19 +-
lib/portage/gpkg.py | 38 +-
lib/portage/news.py | 13 +-
lib/portage/package/ebuild/_config/UseManager.py | 28 +-
lib/portage/package/ebuild/config.py | 32 +
lib/portage/package/ebuild/doebuild.py | 34 +
lib/portage/repository/config.py | 34 +-
lib/portage/sync/syncbase.py | 28 +-
lib/portage/tests/resolver/ResolverPlayground.py | 7 +
.../test_build_id_profile_format.py | 15 +-
lib/portage/tests/resolver/meson.build | 2 +
lib/portage/tests/resolver/test_bootstrap_deps.py | 3 +-
.../tests/resolver/test_onlydeps_minimal.py | 10 +-
.../tests/resolver/test_profile_default_eapi.py | 23 +-
.../tests/resolver/test_profile_use_stable.py | 74 +++
lib/portage/tests/resolver/test_virtual_cycle.py | 63 ++
lib/portage/tests/sets/base/test_variable_set.py | 14 +-
lib/portage/util/__init__.py | 7 +-
lib/portage/util/movefile.py | 6 +-
lib/portage/xpak.py | 9 +-
man/emerge.1 | 6 +-
man/make.conf.5 | 29 +-
meson.build | 2 +-
37 files changed, 1072 insertions(+), 507 deletions(-)
diff --cc bin/ebuild-helpers/emake
index 8a919a7a83,d52adb5843..917a6e31da
--- a/bin/ebuild-helpers/emake
+++ b/bin/ebuild-helpers/emake
@@@ -11,9 -11,11 +11,12 @@@
source "${PORTAGE_BIN_PATH:?}"/isolated-functions.sh || exit
+ # Prevent MAKEOPTS from resetting MAKEFLAGS jobserver mode for bug 692576.
+ [[ -n ${MAKEFLAGS} ]] && unset MAKEOPTS
+
cmd=(
- ${MAKE:-make} ${MAKEOPTS} "$@" ${EXTRA_EMAKE}
+ # PREFIX LOCAL: force SHELL to be set (don't use possibly ancient /bin/sh)
+ ${MAKE:-make} SHELL="${BASH:-/bin/bash}" ${MAKEOPTS} "$@" ${EXTRA_EMAKE}
)
if [[ ${PORTAGE_QUIET} != 1 ]] ; then
