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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ABD03158013 for ; Sun, 3 Dec 2023 09:54:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC6102BC020; Sun, 3 Dec 2023 09:54:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B0F162BC020 for ; Sun, 3 Dec 2023 09:54:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92D1F335C8E for ; Sun, 3 Dec 2023 09:54:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EDB26AC2 for ; Sun, 3 Dec 2023 09:54:33 +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: <1701595855.a05b863dba5fb23207ccf3f79aac9b290163c11a.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: a05b863dba5fb23207ccf3f79aac9b290163c11a X-VCS-Branch: prefix Date: Sun, 3 Dec 2023 09:54:33 +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: 8a15b00c-b6b3-4cce-9f09-c55fb862a57a X-Archives-Hash: 2e4d4a2c7fa55e157ab8803be92a2870 commit: a05b863dba5fb23207ccf3f79aac9b290163c11a Author: Fabian Groffen gentoo org> AuthorDate: Sun Dec 3 09:30:55 2023 +0000 Commit: Fabian Groffen gentoo 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 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(-)