commit: cc3c972cfcafc20187ee631af4d766a7e4027593
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 13:36:20 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 13:36:20 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cc3c972c
Merge remote-tracking branch 'origin/master' into prefix
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
.github/workflows/ci.yml | 2 +-
MANIFEST.in | 3 +
NEWS | 12 +
RELEASE-NOTES | 33 +
bin/chmod-lite | 11 +-
bin/ebuild-ipc | 9 +-
bin/ebuild-pyhelper | 21 +
bin/egencache | 2 -
bin/glsa-check | 3 +-
bin/shelve-utils | 36 +
cnf/make.globals | 1 +
lib/_emerge/BlockerCache.py | 6 +-
lib/_emerge/EbuildPhase.py | 28 +-
lib/_emerge/Package.py | 9 -
lib/_emerge/Scheduler.py | 2 -
lib/_emerge/UseFlagDisplay.py | 2 -
lib/_emerge/create_depgraph_params.py | 30 +-
lib/_emerge/help.py | 2 +-
lib/_emerge/main.py | 2 +
lib/_emerge/resolver/output.py | 2 -
lib/portage/__init__.py | 18 +-
.../_compat_upgrade/binpkg_multi_instance.py | 33 +
lib/portage/_emirrordist/Config.py | 39 +-
lib/portage/_emirrordist/ContentDB.py | 196 ++++
lib/portage/_emirrordist/DeletionIterator.py | 25 +-
lib/portage/_emirrordist/DeletionTask.py | 8 +
lib/portage/_emirrordist/FetchIterator.py | 3 +-
lib/portage/_emirrordist/FetchTask.py | 5 +-
lib/portage/_emirrordist/main.py | 15 +-
lib/portage/_sets/ProfilePackageSet.py | 9 +-
lib/portage/_sets/profiles.py | 10 +-
lib/portage/cache/flat_hash.py | 3 -
lib/portage/dbapi/_VdbMetadataDelta.py | 11 +-
lib/portage/dbapi/bintree.py | 1 +
lib/portage/dbapi/vartree.py | 48 +-
lib/portage/dep/__init__.py | 7 +-
lib/portage/eapi.py | 107 +-
lib/portage/emaint/modules/merges/__init__.py | 14 +-
lib/portage/emaint/modules/merges/merges.py | 11 +-
lib/portage/emaint/modules/sync/sync.py | 40 +-
lib/portage/locks.py | 125 ++-
.../package/ebuild/_config/KeywordsManager.py | 7 +-
.../package/ebuild/_config/LocationsManager.py | 11 +-
lib/portage/package/ebuild/_config/MaskManager.py | 7 +-
lib/portage/package/ebuild/_config/UseManager.py | 12 +-
lib/portage/package/ebuild/config.py | 28 +-
lib/portage/package/ebuild/fetch.py | 195 +++-
lib/portage/repository/config.py | 36 +-
lib/portage/tests/dep/test_isvalidatom.py | 26 +-
lib/portage/tests/ebuild/test_fetch.py | 332 +++++-
lib/portage/tests/emerge/test_simple.py | 4 +-
lib/portage/tests/resolver/ResolverPlayground.py | 10 +-
.../test_build_id_profile_format.py | 14 +-
lib/portage/tests/resolver/test_autounmask.py | 25 +-
.../resolver/test_autounmask_use_slot_conflict.py | 51 +
.../tests/resolver/test_unpack_dependencies.py | 65 --
lib/portage/tests/resolver/test_use_aliases.py | 131 ---
lib/portage/tests/resolver/test_useflags.py | 28 +-
lib/portage/tests/sync/test_sync_local.py | 15 +-
lib/portage/tests/unicode/test_string_format.py | 9 -
lib/portage/tests/util/test_shelve.py | 60 +
lib/portage/util/_async/BuildLogger.py | 12 +-
lib/portage/util/_async/PipeLogger.py | 12 +-
lib/portage/util/_async/PopenProcess.py | 4 +-
lib/portage/util/_async/SchedulerInterface.py | 10 +-
lib/portage/util/_eventloop/EventLoop.py | 1153 --------------------
lib/portage/util/_eventloop/PollConstants.py | 17 -
lib/portage/util/_eventloop/PollSelectAdapter.py | 74 --
lib/portage/util/_eventloop/asyncio_event_loop.py | 7 +-
lib/portage/util/bin_entry_point.py | 35 +
lib/portage/util/digraph.py | 3 -
lib/portage/util/futures/_asyncio/__init__.py | 50 +-
lib/portage/util/futures/_asyncio/process.py | 116 --
lib/portage/util/futures/_asyncio/streams.py | 13 +-
lib/portage/util/futures/_asyncio/tasks.py | 96 --
lib/portage/util/futures/events.py | 186 ----
lib/portage/util/futures/futures.py | 156 +--
lib/portage/util/futures/transports.py | 87 --
lib/portage/util/futures/unix_events.py | 626 +----------
lib/portage/util/path.py | 4 +-
lib/portage/util/shelve.py | 58 +
lib/portage/versions.py | 10 +-
man/emaint.1 | 6 +-
man/emerge.1 | 20 +-
man/emirrordist.1 | 6 +-
man/make.conf.5 | 17 +-
man/portage.5 | 6 +-
pyproject.toml | 6 +
repoman/RELEASE-NOTES | 6 +
repoman/bin/repoman | 4 +-
repoman/cnf/linechecks/linechecks.yaml | 2 +-
repoman/cnf/qa_data/qa_data.yaml | 1 +
repoman/cnf/repository/qa_data.yaml | 1 +
repoman/cnf/repository/repository.yaml | 1 +
repoman/lib/repoman/actions.py | 1 -
repoman/lib/repoman/argparser.py | 5 +-
repoman/lib/repoman/main.py | 43 +-
.../modules/linechecks/deprecated/deprecated.py | 2 +-
.../repoman/modules/linechecks/phases/__init__.py | 6 +
.../lib/repoman/modules/linechecks/phases/phase.py | 132 ++-
repoman/lib/repoman/modules/scan/module.py | 4 +-
repoman/lib/repoman/repos.py | 8 +-
repoman/lib/repoman/tests/simple/test_simple.py | 207 +++-
repoman/man/repoman.1 | 5 +-
repoman/setup.py | 2 +-
setup.py | 107 +-
tox.ini | 2 +-
107 files changed, 2145 insertions(+), 3194 deletions(-)
diff --cc lib/portage/package/ebuild/config.py
index 4a43eaf7b,0d0b51053..f56e39c47
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@@ -41,8 -41,11 +41,11 @@@ from portage.env.loaders import KeyValu
from portage.exception import InvalidDependString, PortageException
from portage.localization import _
from portage.output import colorize
-from portage.process import fakeroot_capable, sandbox_capable
+from portage.process import fakeroot_capable, sandbox_capable,
macossandbox_capable
- from portage.repository.config import load_repository_config
+ from portage.repository.config import (
+ allow_profile_repo_deps,
+ load_repository_config,
+ )
from portage.util import ensure_dirs, getconfig, grabdict, \
grabdict_package, grabfile, grabfile_package, LazyItemsDict, \
normalize_path, shlex_split, stack_dictlist, stack_dicts, stack_lists, \
