commit: 4e4f3561dc84b6188967bec034b5bf4d72a5f5aa
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 7 16:45:14 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec 7 16:45:14 2020 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4e4f3561
Merge branch 'master' into prefix
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
RELEASE-NOTES | 12 +++
lib/_emerge/DepPrioritySatisfiedRange.py | 1 +
lib/_emerge/depgraph.py | 76 +++++++++++++----
lib/portage/__init__.py | 4 +
lib/portage/dbapi/vartree.py | 1 -
lib/portage/dep/dep_check.py | 31 ++++---
lib/portage/package/ebuild/doebuild.py | 1 -
.../tests/resolver/test_circular_choices_rust.py | 94 ++++++++++++++++++++++
lib/portage/tests/resolver/test_merge_order.py | 27 ++++++-
lib/portage/util/_eventloop/asyncio_event_loop.py | 6 +-
lib/portage/util/_eventloop/global_event_loop.py | 7 --
lib/portage/util/futures/_asyncio/__init__.py | 59 ++++++++++++--
setup.py | 2 +-
13 files changed, 272 insertions(+), 49 deletions(-)
diff --cc lib/portage/dbapi/vartree.py
index 794df99c5,f3d74cf82..e65f1c9d3
--- a/lib/portage/dbapi/vartree.py
+++ b/lib/portage/dbapi/vartree.py
@@@ -39,12 -39,8 +39,11 @@@ portage.proxy.lazyimport.lazyimport(glo
'portage.util._xattr:xattr',
'portage.util._dyn_libs.PreservedLibsRegistry:PreservedLibsRegistry',
'portage.util._dyn_libs.LinkageMapELF:LinkageMapELF@LinkageMap',
+ 'portage.util._dyn_libs.LinkageMapMachO:LinkageMapMachO',
+ 'portage.util._dyn_libs.LinkageMapPeCoff:LinkageMapPeCoff',
+ 'portage.util._dyn_libs.LinkageMapXCoff:LinkageMapXCoff',
'portage.util._dyn_libs.NeededEntry:NeededEntry',
'portage.util._async.SchedulerInterface:SchedulerInterface',
- 'portage.util._eventloop.EventLoop:EventLoop',
'portage.util._eventloop.global_event_loop:global_event_loop',
'portage.versions:best,catpkgsplit,catsplit,cpv_getkey,vercmp,' + \
'_get_slot_re,_pkgsplit@pkgsplit,_pkg_str,_unknown_repo',
