commit: a05b863dba5fb23207ccf3f79aac9b290163c11a Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sun Dec 3 09:30:55 2023 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sun Dec 3 09:30:55 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a05b863d
Merge branch 'master' into prefix Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> NEWS | 30 +++- bin/ebuild | 4 - lib/_emerge/AbstractEbuildProcess.py | 6 - lib/_emerge/Binpkg.py | 6 +- lib/_emerge/CompositeTask.py | 8 +- lib/_emerge/DepPriority.py | 19 +-- lib/_emerge/DepPriorityNormalRange.py | 8 +- lib/_emerge/DepPrioritySatisfiedRange.py | 13 +- lib/_emerge/EbuildBuild.py | 4 + lib/_emerge/Scheduler.py | 18 ++- lib/_emerge/actions.py | 5 - lib/_emerge/depgraph.py | 65 +++++++-- lib/portage/tests/resolver/ResolverPlayground.py | 3 - .../tests/resolver/test_alternatives_gzip.py | 5 +- lib/portage/tests/resolver/test_merge_order.py | 22 +-- .../tests/resolver/test_rebuild_ghostscript.py | 6 +- .../resolver/test_runtime_cycle_merge_order.py | 153 ++++++++++++++++++++- meson.build | 2 +- 18 files changed, 311 insertions(+), 66 deletions(-)
