commit:     dd0d209ca0a5e34055b11e90ad28d2ad3ba423e8
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  2 09:57:11 2026 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan  2 09:57:11 2026 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=dd0d209c

Merge remote-tracking branch 'origin/master' into prefix

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 .pre-commit-config.yaml                            |   2 +-
 NEWS                                               |  64 +++++
 bin/estrip                                         |   8 +-
 bin/misc-functions.sh                              |  49 ++++
 cnf/make.conf.example                              |  38 +--
 cnf/make.globals                                   |  12 +-
 lib/_emerge/Binpkg.py                              |   4 +-
 lib/_emerge/EbuildPhase.py                         |   1 +
 lib/_emerge/PackagePhase.py                        |  11 +-
 lib/_emerge/Scheduler.py                           | 239 ++++++++++++++--
 lib/_emerge/actions.py                             |   4 +-
 lib/_emerge/depgraph.py                            |   1 +
 lib/_emerge/main.py                                |  29 +-
 lib/portage/binrepo/config.py                      |   4 +-
 lib/portage/const.py                               |   2 +
 lib/portage/dbapi/bintree.py                       |  45 ++-
 lib/portage/dbapi/vartree.py                       |  18 +-
 lib/portage/exception.py                           |   2 +-
 lib/portage/gpg.py                                 |  18 +-
 lib/portage/gpkg.py                                | 199 +++++++------
 .../package/ebuild/_config/LicenseManager.py       |  12 +-
 lib/portage/package/ebuild/config.py               |   5 +-
 lib/portage/repository/config.py                   |   1 +
 lib/portage/tests/conftest.py                      |   2 +-
 lib/portage/tests/ebuild/test_config.py            | 228 +++++++++------
 lib/portage/tests/gpkg/test_gpkg_gpg_emerge.py     | 315 +++++++++++++++++++++
 lib/portage/tests/resolver/ResolverPlayground.py   |   1 +
 lib/portage/tests/resolver/test_with_test_deps.py  |  22 +-
 lib/portage/util/human_readable.py                 |  23 ++
 lib/portage/util/meson.build                       |   1 +
 man/emerge.1                                       |   9 +-
 man/make.conf.5                                    |  68 +++--
 man/portage.5                                      |  10 +-
 meson.build                                        |   2 +-
 34 files changed, 1161 insertions(+), 288 deletions(-)

Reply via email to