| 1 |
commit: cc3c972cfcafc20187ee631af4d766a7e4027593 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 16 13:36:20 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 16 13:36:20 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cc3c972c |
| 7 |
|
| 8 |
Merge remote-tracking branch 'origin/master' into prefix |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
.github/workflows/ci.yml | 2 +- |
| 13 |
MANIFEST.in | 3 + |
| 14 |
NEWS | 12 + |
| 15 |
RELEASE-NOTES | 33 + |
| 16 |
bin/chmod-lite | 11 +- |
| 17 |
bin/ebuild-ipc | 9 +- |
| 18 |
bin/ebuild-pyhelper | 21 + |
| 19 |
bin/egencache | 2 - |
| 20 |
bin/glsa-check | 3 +- |
| 21 |
bin/shelve-utils | 36 + |
| 22 |
cnf/make.globals | 1 + |
| 23 |
lib/_emerge/BlockerCache.py | 6 +- |
| 24 |
lib/_emerge/EbuildPhase.py | 28 +- |
| 25 |
lib/_emerge/Package.py | 9 - |
| 26 |
lib/_emerge/Scheduler.py | 2 - |
| 27 |
lib/_emerge/UseFlagDisplay.py | 2 - |
| 28 |
lib/_emerge/create_depgraph_params.py | 30 +- |
| 29 |
lib/_emerge/help.py | 2 +- |
| 30 |
lib/_emerge/main.py | 2 + |
| 31 |
lib/_emerge/resolver/output.py | 2 - |
| 32 |
lib/portage/__init__.py | 18 +- |
| 33 |
.../_compat_upgrade/binpkg_multi_instance.py | 33 + |
| 34 |
lib/portage/_emirrordist/Config.py | 39 +- |
| 35 |
lib/portage/_emirrordist/ContentDB.py | 196 ++++ |
| 36 |
lib/portage/_emirrordist/DeletionIterator.py | 25 +- |
| 37 |
lib/portage/_emirrordist/DeletionTask.py | 8 + |
| 38 |
lib/portage/_emirrordist/FetchIterator.py | 3 +- |
| 39 |
lib/portage/_emirrordist/FetchTask.py | 5 +- |
| 40 |
lib/portage/_emirrordist/main.py | 15 +- |
| 41 |
lib/portage/_sets/ProfilePackageSet.py | 9 +- |
| 42 |
lib/portage/_sets/profiles.py | 10 +- |
| 43 |
lib/portage/cache/flat_hash.py | 3 - |
| 44 |
lib/portage/dbapi/_VdbMetadataDelta.py | 11 +- |
| 45 |
lib/portage/dbapi/bintree.py | 1 + |
| 46 |
lib/portage/dbapi/vartree.py | 48 +- |
| 47 |
lib/portage/dep/__init__.py | 7 +- |
| 48 |
lib/portage/eapi.py | 107 +- |
| 49 |
lib/portage/emaint/modules/merges/__init__.py | 14 +- |
| 50 |
lib/portage/emaint/modules/merges/merges.py | 11 +- |
| 51 |
lib/portage/emaint/modules/sync/sync.py | 40 +- |
| 52 |
lib/portage/locks.py | 125 ++- |
| 53 |
.../package/ebuild/_config/KeywordsManager.py | 7 +- |
| 54 |
.../package/ebuild/_config/LocationsManager.py | 11 +- |
| 55 |
lib/portage/package/ebuild/_config/MaskManager.py | 7 +- |
| 56 |
lib/portage/package/ebuild/_config/UseManager.py | 12 +- |
| 57 |
lib/portage/package/ebuild/config.py | 28 +- |
| 58 |
lib/portage/package/ebuild/fetch.py | 195 +++- |
| 59 |
lib/portage/repository/config.py | 36 +- |
| 60 |
lib/portage/tests/dep/test_isvalidatom.py | 26 +- |
| 61 |
lib/portage/tests/ebuild/test_fetch.py | 332 +++++- |
| 62 |
lib/portage/tests/emerge/test_simple.py | 4 +- |
| 63 |
lib/portage/tests/resolver/ResolverPlayground.py | 10 +- |
| 64 |
.../test_build_id_profile_format.py | 14 +- |
| 65 |
lib/portage/tests/resolver/test_autounmask.py | 25 +- |
| 66 |
.../resolver/test_autounmask_use_slot_conflict.py | 51 + |
| 67 |
.../tests/resolver/test_unpack_dependencies.py | 65 -- |
| 68 |
lib/portage/tests/resolver/test_use_aliases.py | 131 --- |
| 69 |
lib/portage/tests/resolver/test_useflags.py | 28 +- |
| 70 |
lib/portage/tests/sync/test_sync_local.py | 15 +- |
| 71 |
lib/portage/tests/unicode/test_string_format.py | 9 - |
| 72 |
lib/portage/tests/util/test_shelve.py | 60 + |
| 73 |
lib/portage/util/_async/BuildLogger.py | 12 +- |
| 74 |
lib/portage/util/_async/PipeLogger.py | 12 +- |
| 75 |
lib/portage/util/_async/PopenProcess.py | 4 +- |
| 76 |
lib/portage/util/_async/SchedulerInterface.py | 10 +- |
| 77 |
lib/portage/util/_eventloop/EventLoop.py | 1153 -------------------- |
| 78 |
lib/portage/util/_eventloop/PollConstants.py | 17 - |
| 79 |
lib/portage/util/_eventloop/PollSelectAdapter.py | 74 -- |
| 80 |
lib/portage/util/_eventloop/asyncio_event_loop.py | 7 +- |
| 81 |
lib/portage/util/bin_entry_point.py | 35 + |
| 82 |
lib/portage/util/digraph.py | 3 - |
| 83 |
lib/portage/util/futures/_asyncio/__init__.py | 50 +- |
| 84 |
lib/portage/util/futures/_asyncio/process.py | 116 -- |
| 85 |
lib/portage/util/futures/_asyncio/streams.py | 13 +- |
| 86 |
lib/portage/util/futures/_asyncio/tasks.py | 96 -- |
| 87 |
lib/portage/util/futures/events.py | 186 ---- |
| 88 |
lib/portage/util/futures/futures.py | 156 +-- |
| 89 |
lib/portage/util/futures/transports.py | 87 -- |
| 90 |
lib/portage/util/futures/unix_events.py | 626 +---------- |
| 91 |
lib/portage/util/path.py | 4 +- |
| 92 |
lib/portage/util/shelve.py | 58 + |
| 93 |
lib/portage/versions.py | 10 +- |
| 94 |
man/emaint.1 | 6 +- |
| 95 |
man/emerge.1 | 20 +- |
| 96 |
man/emirrordist.1 | 6 +- |
| 97 |
man/make.conf.5 | 17 +- |
| 98 |
man/portage.5 | 6 +- |
| 99 |
pyproject.toml | 6 + |
| 100 |
repoman/RELEASE-NOTES | 6 + |
| 101 |
repoman/bin/repoman | 4 +- |
| 102 |
repoman/cnf/linechecks/linechecks.yaml | 2 +- |
| 103 |
repoman/cnf/qa_data/qa_data.yaml | 1 + |
| 104 |
repoman/cnf/repository/qa_data.yaml | 1 + |
| 105 |
repoman/cnf/repository/repository.yaml | 1 + |
| 106 |
repoman/lib/repoman/actions.py | 1 - |
| 107 |
repoman/lib/repoman/argparser.py | 5 +- |
| 108 |
repoman/lib/repoman/main.py | 43 +- |
| 109 |
.../modules/linechecks/deprecated/deprecated.py | 2 +- |
| 110 |
.../repoman/modules/linechecks/phases/__init__.py | 6 + |
| 111 |
.../lib/repoman/modules/linechecks/phases/phase.py | 132 ++- |
| 112 |
repoman/lib/repoman/modules/scan/module.py | 4 +- |
| 113 |
repoman/lib/repoman/repos.py | 8 +- |
| 114 |
repoman/lib/repoman/tests/simple/test_simple.py | 207 +++- |
| 115 |
repoman/man/repoman.1 | 5 +- |
| 116 |
repoman/setup.py | 2 +- |
| 117 |
setup.py | 107 +- |
| 118 |
tox.ini | 2 +- |
| 119 |
107 files changed, 2145 insertions(+), 3194 deletions(-) |
| 120 |
|
| 121 |
diff --cc lib/portage/package/ebuild/config.py |
| 122 |
index 4a43eaf7b,0d0b51053..f56e39c47 |
| 123 |
--- a/lib/portage/package/ebuild/config.py |
| 124 |
+++ b/lib/portage/package/ebuild/config.py |
| 125 |
@@@ -41,8 -41,11 +41,11 @@@ from portage.env.loaders import KeyValu |
| 126 |
from portage.exception import InvalidDependString, PortageException |
| 127 |
from portage.localization import _ |
| 128 |
from portage.output import colorize |
| 129 |
-from portage.process import fakeroot_capable, sandbox_capable |
| 130 |
+from portage.process import fakeroot_capable, sandbox_capable, macossandbox_capable |
| 131 |
- from portage.repository.config import load_repository_config |
| 132 |
+ from portage.repository.config import ( |
| 133 |
+ allow_profile_repo_deps, |
| 134 |
+ load_repository_config, |
| 135 |
+ ) |
| 136 |
from portage.util import ensure_dirs, getconfig, grabdict, \ |
| 137 |
grabdict_package, grabfile, grabfile_package, LazyItemsDict, \ |
| 138 |
normalize_path, shlex_split, stack_dictlist, stack_dicts, stack_lists, \ |
Archives