commit: 7238a400b115fca23ba39b1b1ce123f2ac1bf993 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sun Nov 22 11:14:34 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sun Nov 22 11:15:16 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7238a400
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> RELEASE-NOTES | 16 ++ bin/isolated-functions.sh | 3 +- bin/phase-helpers.sh | 3 +- bin/pid-ns-init | 24 ++- cnf/repo.postsync.d/example | 3 +- cnf/sets/portage.conf | 6 + doc/package/ebuild/eapi/4.docbook | 2 +- lib/_emerge/DepPriorityNormalRange.py | 2 + lib/_emerge/DepPrioritySatisfiedRange.py | 53 +++--- lib/_emerge/actions.py | 19 +- lib/_emerge/depgraph.py | 56 ++++-- lib/_emerge/main.py | 5 + lib/portage/cache/template.py | 2 +- .../package/ebuild/_config/KeywordsManager.py | 2 +- .../package/ebuild/_config/LocationsManager.py | 30 ++- lib/portage/package/ebuild/_config/UseManager.py | 4 +- lib/portage/package/ebuild/config.py | 9 +- .../package/ebuild/deprecated_profile_check.py | 9 +- lib/portage/tests/emerge/test_simple.py | 8 +- lib/portage/tests/resolver/test_merge_order.py | 10 + .../tests/resolver/test_slot_operator_bdeps.py | 209 +++++++++++++++++++++ lib/portage/util/_compare_files.py | 3 +- lib/portage/util/movefile.py | 10 +- lib/portage/util/netlink.py | 2 +- man/emerge.1 | 10 +- man/make.conf.5 | 2 +- repoman/RELEASE-NOTES | 5 + repoman/cnf/qa_data/qa_data.yaml | 1 - repoman/cnf/repository/qa_data.yaml | 1 - repoman/lib/repoman/modules/scan/fetch/fetches.py | 7 +- repoman/man/repoman.1 | 2 +- repoman/setup.py | 2 +- setup.py | 2 +- 33 files changed, 430 insertions(+), 92 deletions(-)
