From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1224238-garchives=archives.gentoo.org@lists.gentoo.org> 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 5AF02138359 for <garchives@archives.gentoo.org>; Sun, 22 Nov 2020 11:15:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D69EE076B; Sun, 22 Nov 2020 11:15:45 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 714D2E076B for <gentoo-commits@lists.gentoo.org>; Sun, 22 Nov 2020 11:15:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1C51D33BDF8 for <gentoo-commits@lists.gentoo.org>; Sun, 22 Nov 2020 11:15:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2592A462 for <gentoo-commits@lists.gentoo.org>; Sun, 22 Nov 2020 11:15:41 +0000 (UTC) From: "Fabian Groffen" <grobian@gentoo.org> 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" <grobian@gentoo.org> Message-ID: <1606043716.7238a400b115fca23ba39b1b1ce123f2ac1bf993.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: 7238a400b115fca23ba39b1b1ce123f2ac1bf993 X-VCS-Branch: prefix Date: Sun, 22 Nov 2020 11:15:41 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1ee84d15-17a7-47d9-a6de-d6fda230c7f7 X-Archives-Hash: 0269d6b63e5593270aed5fb81f7c6910 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(-)