commit: 9ab4d534816dd92345df6c0cc2a1c1343415a6bd Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> AuthorDate: Sun Aug 23 12:20:01 2020 +0000 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> CommitDate: Sun Aug 23 12:22:18 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9ab4d534
Merge portage-3.0.4 Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org> .editorconfig | 5 +- .travis.yml | 1 - DEVELOPING | 18 +- NEWS | 4 + README | 2 +- RELEASE-NOTES | 45 ++ bin/archive-conf | 4 +- bin/binhost-snapshot | 5 +- bin/check-implicit-pointer-usage.py | 27 +- bin/chmod-lite.py | 11 +- bin/chpathtool.py | 10 +- bin/clean_locks | 4 +- bin/dispatch-conf | 4 +- bin/dohtml.py | 15 +- bin/doins.py | 37 +- bin/ebuild | 19 +- bin/ebuild-ipc.py | 2 +- bin/ecompress | 27 +- bin/egencache | 19 +- bin/emaint | 4 +- bin/emerge | 4 +- bin/env-update | 4 +- bin/filter-bash-environment.py | 11 +- bin/fixpackages | 4 +- bin/glsa-check | 4 +- bin/install.py | 19 +- bin/pid-ns-init | 10 +- bin/portageq | 6 +- bin/quickpkg | 6 +- bin/regenworld | 4 +- bin/socks5-server.py | 2 +- bin/xattr-helper.py | 32 +- cnf/repo.postsync.d/example | 15 +- doc/api/conf.py | 2 +- lib/_emerge/AbstractEbuildProcess.py | 3 +- lib/_emerge/AbstractPollTask.py | 4 +- lib/_emerge/AsynchronousLock.py | 12 +- lib/_emerge/Binpkg.py | 8 +- lib/_emerge/BinpkgEnvExtractor.py | 11 +- lib/_emerge/BinpkgFetcher.py | 11 +- lib/_emerge/BinpkgPrefetcher.py | 1 - lib/_emerge/BlockerCache.py | 29 +- lib/_emerge/BlockerDB.py | 7 +- lib/_emerge/DepPriority.py | 1 - lib/_emerge/DepPriorityNormalRange.py | 2 +- lib/_emerge/DepPrioritySatisfiedRange.py | 2 +- lib/_emerge/Dependency.py | 1 - lib/_emerge/DependencyArg.py | 20 +- lib/_emerge/EbuildBuild.py | 30 +- lib/_emerge/EbuildBuildDir.py | 1 - lib/_emerge/EbuildFetcher.py | 12 +- lib/_emerge/EbuildMetadataPhase.py | 12 +- lib/_emerge/EbuildPhase.py | 19 +- lib/_emerge/FakeVartree.py | 23 +- lib/_emerge/FifoIpcDaemon.py | 33 +- lib/_emerge/JobStatusDisplay.py | 15 +- lib/_emerge/MergeListItem.py | 2 +- lib/_emerge/MetadataRegen.py | 7 +- lib/_emerge/Package.py | 47 +- lib/_emerge/PackageVirtualDbapi.py | 7 +- lib/_emerge/PipeReader.py | 14 +- lib/_emerge/PollScheduler.py | 6 +- lib/_emerge/ProgressHandler.py | 3 +- lib/_emerge/RootConfig.py | 2 +- lib/_emerge/Scheduler.py | 15 +- lib/_emerge/SequentialTaskQueue.py | 8 +- lib/_emerge/SetArg.py | 1 - lib/_emerge/SpawnProcess.py | 43 +- lib/_emerge/SubProcess.py | 9 +- lib/_emerge/TaskSequence.py | 6 +- lib/_emerge/UnmergeDepPriority.py | 1 - lib/_emerge/UseFlagDisplay.py | 16 +- lib/_emerge/UserQuery.py | 23 +- lib/_emerge/_find_deep_system_runtime_deps.py | 1 - lib/_emerge/actions.py | 79 ++-- lib/_emerge/chk_updated_cfg_files.py | 2 - lib/_emerge/countdown.py | 4 +- lib/_emerge/create_depgraph_params.py | 1 - lib/_emerge/create_world_atom.py | 10 +- lib/_emerge/depgraph.py | 171 ++++---- lib/_emerge/emergelog.py | 3 - lib/_emerge/help.py | 6 +- lib/_emerge/main.py | 21 +- lib/_emerge/post_emerge.py | 4 +- lib/_emerge/resolver/DbapiProvidesIndex.py | 8 +- lib/_emerge/resolver/backtracking.py | 9 +- lib/_emerge/resolver/circular_dependency.py | 16 +- lib/_emerge/resolver/output.py | 104 ++--- lib/_emerge/resolver/output_helpers.py | 148 +------ lib/_emerge/resolver/package_tracker.py | 8 +- lib/_emerge/resolver/slot_collision.py | 226 +++++----- lib/_emerge/search.py | 17 +- lib/_emerge/show_invalid_depstring_notice.py | 1 - lib/_emerge/stdout_spinner.py | 4 +- lib/_emerge/unmerge.py | 39 +- lib/portage/__init__.py | 84 ++-- lib/portage/_emirrordist/Config.py | 12 +- lib/portage/_emirrordist/DeletionIterator.py | 2 +- lib/portage/_emirrordist/FetchIterator.py | 2 +- lib/portage/_emirrordist/FetchTask.py | 55 +-- lib/portage/_emirrordist/MirrorDistTask.py | 8 +- lib/portage/_emirrordist/main.py | 11 +- lib/portage/_global_updates.py | 7 +- lib/portage/_legacy_globals.py | 2 +- lib/portage/_selinux.py | 17 +- lib/portage/_sets/__init__.py | 21 +- lib/portage/_sets/base.py | 38 +- lib/portage/_sets/dbapi.py | 81 ++-- lib/portage/_sets/files.py | 14 +- lib/portage/_sets/libs.py | 4 +- lib/portage/_sets/security.py | 16 +- lib/portage/_sets/shell.py | 4 +- lib/portage/cache/__init__.py | 1 - lib/portage/cache/anydbm.py | 39 +- lib/portage/cache/ebuild_xattr.py | 36 +- lib/portage/cache/flat_hash.py | 10 +- lib/portage/cache/fs_template.py | 15 +- lib/portage/cache/index/IndexStreamIterator.py | 2 +- lib/portage/cache/index/pkg_desc_index.py | 13 +- lib/portage/cache/mappings.py | 58 +-- lib/portage/cache/metadata.py | 9 +- lib/portage/cache/sql_template.py | 30 +- lib/portage/cache/sqlite.py | 50 ++- lib/portage/cache/template.py | 40 +- lib/portage/checksum.py | 30 +- lib/portage/const.py | 2 - lib/portage/cvstree.py | 27 +- lib/portage/data.py | 10 +- lib/portage/dbapi/DummyTree.py | 2 +- lib/portage/dbapi/IndexedPortdb.py | 10 +- lib/portage/dbapi/IndexedVardb.py | 5 +- .../dbapi/_ContentsCaseSensitivityManager.py | 2 +- lib/portage/dbapi/_MergeProcess.py | 125 ++---- lib/portage/dbapi/_VdbMetadataDelta.py | 2 +- lib/portage/dbapi/__init__.py | 10 +- lib/portage/dbapi/_expand_new_virt.py | 2 - lib/portage/dbapi/bintree.py | 97 ++-- lib/portage/dbapi/cpv_expand.py | 12 +- lib/portage/dbapi/dep_expand.py | 2 - lib/portage/dbapi/porttree.py | 45 +- lib/portage/dbapi/vartree.py | 101 ++--- lib/portage/dbapi/virtual.py | 11 +- lib/portage/debug.py | 16 +- lib/portage/dep/__init__.py | 257 ++++++----- lib/portage/dep/_dnf.py | 4 +- lib/portage/dep/_slot_operator.py | 2 - lib/portage/dep/dep_check.py | 19 +- lib/portage/dep/soname/SonameAtom.py | 16 +- lib/portage/dep/soname/multilib_category.py | 2 - lib/portage/dep/soname/parse.py | 2 - lib/portage/dispatch_conf.py | 7 +- lib/portage/eclass_cache.py | 17 +- lib/portage/elog/__init__.py | 10 +- lib/portage/elog/messages.py | 19 +- lib/portage/elog/mod_custom.py | 9 +- lib/portage/elog/mod_echo.py | 10 +- lib/portage/elog/mod_mail.py | 10 +- lib/portage/elog/mod_mail_summary.py | 8 +- lib/portage/elog/mod_save_summary.py | 5 - lib/portage/elog/mod_syslog.py | 14 +- lib/portage/emaint/main.py | 8 +- lib/portage/emaint/modules/binhost/binhost.py | 12 +- lib/portage/emaint/modules/config/config.py | 2 +- lib/portage/emaint/modules/logs/logs.py | 2 +- lib/portage/emaint/modules/merges/merges.py | 12 +- lib/portage/emaint/modules/move/move.py | 7 +- lib/portage/emaint/modules/resume/resume.py | 2 +- lib/portage/emaint/modules/sync/sync.py | 17 +- lib/portage/emaint/modules/world/world.py | 3 +- lib/portage/env/__init__.py | 1 - lib/portage/env/config.py | 22 +- lib/portage/env/loaders.py | 24 +- lib/portage/env/validators.py | 4 +- lib/portage/exception.py | 55 +-- lib/portage/getbinpkg.py | 95 ++-- lib/portage/glsa.py | 48 +- lib/portage/localization.py | 6 +- lib/portage/locks.py | 54 +-- lib/portage/mail.py | 59 +-- lib/portage/manifest.py | 69 ++- lib/portage/metadata.py | 18 +- lib/portage/module.py | 9 +- lib/portage/news.py | 15 +- lib/portage/output.py | 59 ++- .../package/ebuild/_config/KeywordsManager.py | 7 +- .../package/ebuild/_config/LicenseManager.py | 6 +- .../package/ebuild/_config/LocationsManager.py | 4 +- lib/portage/package/ebuild/_config/MaskManager.py | 2 +- lib/portage/package/ebuild/_config/UseManager.py | 2 +- .../package/ebuild/_config/VirtualsManager.py | 2 +- lib/portage/package/ebuild/_config/features_set.py | 2 +- .../package/ebuild/_config/special_env_vars.py | 2 - lib/portage/package/ebuild/_ipc/IpcCommand.py | 2 +- lib/portage/package/ebuild/_ipc/QueryCommand.py | 17 +- .../ebuild/_parallel_manifest/ManifestProcess.py | 3 +- .../ebuild/_parallel_manifest/ManifestScheduler.py | 2 - lib/portage/package/ebuild/_spawn_nofetch.py | 6 +- lib/portage/package/ebuild/config.py | 57 +-- .../package/ebuild/deprecated_profile_check.py | 4 +- lib/portage/package/ebuild/doebuild.py | 20 +- lib/portage/package/ebuild/fetch.py | 30 +- lib/portage/package/ebuild/getmaskingreason.py | 13 +- lib/portage/package/ebuild/getmaskingstatus.py | 20 +- lib/portage/package/ebuild/prepare_build_dirs.py | 3 - lib/portage/process.py | 45 +- lib/portage/progress.py | 3 +- lib/portage/proxy/lazyimport.py | 7 +- lib/portage/proxy/objectproxy.py | 11 +- lib/portage/repository/config.py | 35 +- .../repository/storage/hardlink_quarantine.py | 26 +- lib/portage/repository/storage/hardlink_rcu.py | 47 +- lib/portage/repository/storage/inplace.py | 10 +- lib/portage/repository/storage/interface.py | 12 +- lib/portage/sync/config_checks.py | 2 +- lib/portage/sync/controller.py | 20 +- lib/portage/sync/getaddrinfo_validate.py | 7 +- lib/portage/sync/modules/git/__init__.py | 13 +- lib/portage/sync/modules/git/git.py | 37 +- lib/portage/sync/modules/rsync/rsync.py | 52 +-- lib/portage/sync/modules/webrsync/webrsync.py | 1 - lib/portage/sync/old_tree_timestamp.py | 4 +- lib/portage/sync/syncbase.py | 5 +- lib/portage/tests/__init__.py | 4 +- lib/portage/tests/bin/setup_env.py | 20 +- lib/portage/tests/dbapi/test_auxdb.py | 45 +- lib/portage/tests/dep/testAtom.py | 8 +- lib/portage/tests/dep/testExtractAffectingUSE.py | 6 +- lib/portage/tests/dep/test_dep_getcpv.py | 4 +- lib/portage/tests/dep/test_isvalidatom.py | 2 +- lib/portage/tests/dep/test_match_from_list.py | 14 +- lib/portage/tests/dep/test_soname_atom_pickle.py | 3 - lib/portage/tests/dep/test_use_reduce.py | 2 +- lib/portage/tests/ebuild/test_config.py | 6 +- lib/portage/tests/ebuild/test_fetch.py | 6 +- lib/portage/tests/ebuild/test_spawn.py | 1 - .../tests/ebuild/test_use_expand_incremental.py | 2 - lib/portage/tests/emerge/test_config_protect.py | 2 - lib/portage/tests/emerge/test_simple.py | 11 +- lib/portage/tests/env/__init__.py | 1 - lib/portage/tests/env/config/__init__.py | 1 - .../tests/env/config/test_PackageMaskFile.py | 8 +- lib/portage/tests/glsa/test_security_set.py | 2 - lib/portage/tests/lafilefixer/test_lafilefixer.py | 4 +- lib/portage/tests/lint/test_bash_syntax.py | 1 - lib/portage/tests/process/test_AsyncFunction.py | 62 +++ lib/portage/tests/process/test_PipeLogger.py | 2 +- lib/portage/tests/process/test_poll.py | 10 +- lib/portage/tests/resolver/ResolverPlayground.py | 27 +- .../resolver/test_binary_pkg_ebuild_visibility.py | 1 - .../tests/resolver/test_circular_dependencies.py | 10 +- lib/portage/tests/resolver/test_eapi.py | 80 ++-- lib/portage/tests/resolver/test_merge_order.py | 3 +- .../test_missing_iuse_and_evaluated_atoms.py | 8 +- .../tests/resolver/test_old_dep_chain_display.py | 6 +- .../tests/resolver/test_profile_default_eapi.py | 2 - .../tests/resolver/test_profile_package_set.py | 2 - lib/portage/tests/resolver/test_required_use.py | 4 +- lib/portage/tests/resolver/test_simple.py | 4 +- lib/portage/tests/resolver/test_slot_collisions.py | 8 +- .../test_slot_conflict_unsatisfied_deep_deps.py | 10 +- lib/portage/tests/runTests.py | 7 +- lib/portage/tests/sets/files/testConfigFileSet.py | 1 - lib/portage/tests/sets/files/testStaticFileSet.py | 1 - lib/portage/tests/sets/shell/testShell.py | 12 +- lib/portage/tests/sync/test_sync_local.py | 11 +- lib/portage/tests/unicode/test_string_format.py | 54 +-- lib/portage/tests/util/__init__.py | 1 - .../tests/util/eventloop/test_call_soon_fifo.py | 4 +- .../util/futures/asyncio/test_child_watcher.py | 4 +- .../futures/asyncio/test_event_loop_in_fork.py | 23 +- .../tests/util/futures/asyncio/test_pipe_closed.py | 10 +- .../asyncio/test_policy_wrapper_recursion.py | 8 +- .../util/futures/asyncio/test_subprocess_exec.py | 5 - .../tests/util/futures/test_compat_coroutine.py | 47 +- lib/portage/tests/util/futures/test_retry.py | 34 +- lib/portage/tests/util/test_getconfig.py | 3 +- lib/portage/tests/util/test_grabdict.py | 4 +- lib/portage/tests/util/test_normalizedPath.py | 6 +- lib/portage/tests/util/test_socks5.py | 31 +- lib/portage/tests/util/test_xattr.py | 18 +- lib/portage/tests/xpak/test_decodeint.py | 4 +- lib/portage/update.py | 20 +- lib/portage/util/SlotObject.py | 2 +- lib/portage/util/_ShelveUnicodeWrapper.py | 45 -- lib/portage/util/__init__.py | 113 ++--- lib/portage/util/_async/AsyncFunction.py | 4 +- lib/portage/util/_async/BuildLogger.py | 31 +- lib/portage/util/_async/ForkProcess.py | 146 +++++-- lib/portage/util/_async/PipeLogger.py | 106 ++--- lib/portage/util/_async/SchedulerInterface.py | 4 +- lib/portage/util/_compare_files.py | 23 +- lib/portage/util/_desktop_entry.py | 17 +- lib/portage/util/_dyn_libs/LinkageMapELF.py | 52 +-- lib/portage/util/_dyn_libs/NeededEntry.py | 19 +- .../util/_dyn_libs/PreservedLibsRegistry.py | 31 +- .../util/_dyn_libs/display_preserved_libs.py | 6 +- lib/portage/util/_dyn_libs/soname_deps.py | 4 +- lib/portage/util/_eventloop/EventLoop.py | 53 +-- lib/portage/util/_eventloop/PollConstants.py | 3 +- lib/portage/util/_eventloop/PollSelectAdapter.py | 8 +- lib/portage/util/_eventloop/asyncio_event_loop.py | 9 +- lib/portage/util/_eventloop/global_event_loop.py | 16 +- lib/portage/util/_urlopen.py | 67 ++- lib/portage/util/_xattr.py | 6 +- lib/portage/util/backoff.py | 2 +- lib/portage/util/changelog.py | 29 +- lib/portage/util/compression_probe.py | 5 +- lib/portage/util/configparser.py | 23 +- lib/portage/util/digraph.py | 8 +- lib/portage/util/elf/header.py | 2 +- lib/portage/util/env_update.py | 12 +- lib/portage/util/formatter.py | 5 +- lib/portage/util/futures/_asyncio/__init__.py | 48 +- lib/portage/util/futures/_asyncio/process.py | 18 +- lib/portage/util/futures/_asyncio/streams.py | 2 +- lib/portage/util/futures/_asyncio/tasks.py | 15 +- lib/portage/util/futures/_sync_decorator.py | 3 +- lib/portage/util/futures/compat_coroutine.py | 10 +- lib/portage/util/futures/events.py | 37 +- lib/portage/util/futures/executor/fork.py | 4 +- lib/portage/util/futures/extendedfutures.py | 2 - lib/portage/util/futures/futures.py | 42 +- lib/portage/util/futures/iter_completed.py | 5 +- lib/portage/util/futures/retry.py | 2 +- lib/portage/util/futures/transports.py | 5 +- lib/portage/util/futures/unix_events.py | 34 +- lib/portage/util/install_mask.py | 13 +- lib/portage/util/iterators/MultiIterGroupBy.py | 4 +- lib/portage/util/lafilefixer.py | 11 +- lib/portage/util/listdir.py | 3 - lib/portage/util/locale.py | 4 +- lib/portage/util/monotonic.py | 34 -- lib/portage/util/movefile.py | 65 +-- lib/portage/util/mtimedb.py | 6 +- lib/portage/util/netlink.py | 3 +- lib/portage/util/socks5.py | 13 +- lib/portage/util/whirlpool.py | 28 +- lib/portage/util/writeable_check.py | 2 - lib/portage/versions.py | 40 +- lib/portage/xml/metadata.py | 48 +- lib/portage/xpak.py | 21 +- man/ebuild.5 | 4 +- man/egencache.1 | 4 +- man/emerge.1 | 16 +- man/portage.5 | 47 +- pylintrc | 486 +++++++++++++++++++++ repoman/RELEASE-NOTES | 6 + repoman/bin/repoman | 5 +- repoman/lib/repoman/__init__.py | 7 +- repoman/lib/repoman/actions.py | 6 +- repoman/lib/repoman/argparser.py | 9 + repoman/lib/repoman/copyrights.py | 2 +- repoman/lib/repoman/errors.py | 2 - repoman/lib/repoman/gpg.py | 2 - repoman/lib/repoman/main.py | 7 +- repoman/lib/repoman/metadata.py | 7 - repoman/lib/repoman/modules/commit/manifest.py | 2 +- repoman/lib/repoman/modules/commit/repochecks.py | 2 - repoman/lib/repoman/modules/linechecks/base.py | 2 +- repoman/lib/repoman/modules/linechecks/config.py | 4 +- .../lib/repoman/modules/linechecks/controller.py | 2 +- .../modules/linechecks/deprecated/inherit.py | 1 - repoman/lib/repoman/modules/scan/depend/profile.py | 117 ++++- repoman/lib/repoman/modules/scan/ebuild/ebuild.py | 3 +- .../modules/scan/metadata/ebuild_metadata.py | 5 +- .../lib/repoman/modules/scan/metadata/use_flags.py | 2 +- repoman/lib/repoman/modules/scan/module.py | 2 +- repoman/lib/repoman/modules/scan/scanbase.py | 2 +- repoman/lib/repoman/modules/vcs/None/status.py | 2 +- repoman/lib/repoman/modules/vcs/bzr/status.py | 2 +- repoman/lib/repoman/modules/vcs/changes.py | 2 +- repoman/lib/repoman/modules/vcs/cvs/status.py | 2 +- repoman/lib/repoman/modules/vcs/git/status.py | 2 +- repoman/lib/repoman/modules/vcs/hg/status.py | 2 +- repoman/lib/repoman/modules/vcs/settings.py | 5 +- repoman/lib/repoman/modules/vcs/svn/status.py | 2 +- repoman/lib/repoman/modules/vcs/vcs.py | 3 +- repoman/lib/repoman/profile.py | 4 +- repoman/lib/repoman/qa_data.py | 2 +- repoman/lib/repoman/qa_tracker.py | 2 +- repoman/lib/repoman/repos.py | 2 +- repoman/lib/repoman/scanner.py | 20 +- repoman/lib/repoman/tests/__init__.py | 4 +- repoman/lib/repoman/utilities.py | 7 +- repoman/man/repoman.1 | 9 +- repoman/runtests | 4 +- repoman/setup.py | 8 +- runtests | 7 +- setup.py | 6 +- tabcheck.py | 3 +- tox.ini | 8 +- 391 files changed, 3232 insertions(+), 4185 deletions(-)
