From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 400951382C5 for ; Mon, 7 Dec 2020 16:47:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68223E095F; Mon, 7 Dec 2020 16:47:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50B7EE095F for ; Mon, 7 Dec 2020 16:47:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BCF9B340E43 for ; Mon, 7 Dec 2020 16:47:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2DDC938A for ; Mon, 7 Dec 2020 16:46:59 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1607359514.4e4f3561dc84b6188967bec034b5bf4d72a5f5aa.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 4e4f3561dc84b6188967bec034b5bf4d72a5f5aa X-VCS-Branch: prefix Date: Mon, 7 Dec 2020 16:46:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 618f08be-76ca-4847-a98e-6ffc9156b594 X-Archives-Hash: 5dd6f67f07f88064a73fa8c0742096ee commit: 4e4f3561dc84b6188967bec034b5bf4d72a5f5aa Author: Fabian Groffen gentoo org> AuthorDate: Mon Dec 7 16:45:14 2020 +0000 Commit: Fabian Groffen gentoo 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 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',