commit: 991d7349c8faab28bf956c00e477e115654ba3b0 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Thu Feb 28 12:31:19 2019 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Thu Feb 28 12:31:19 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=991d7349
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> RELEASE-NOTES | 50 +++++ bin/ebuild.sh | 30 ++- bin/misc-functions.sh | 2 - bin/pid-ns-init | 105 +++++++++- bin/postinst-qa-check.d/50gnome2-utils | 64 ------- bin/postinst-qa-check.d/50xdg-utils | 54 ++++++ bin/preinst-qa-check.d/50gnome2-utils | 1 - bin/socks5-server.py | 8 +- cnf/make.conf.example | 8 +- cnf/make.globals | 3 +- lib/_emerge/SpawnProcess.py | 2 +- lib/_emerge/resolver/output.py | 13 +- lib/portage/dbapi/porttree.py | 20 +- lib/portage/locks.py | 150 +++++++++++++-- .../package/ebuild/_config/special_env_vars.py | 3 +- lib/portage/package/ebuild/config.py | 4 +- lib/portage/package/ebuild/doebuild.py | 3 +- lib/portage/process.py | 38 +++- lib/portage/tests/resolver/ResolverPlayground.py | 2 + lib/portage/tests/util/test_install_mask.py | 36 ++++ lib/portage/tests/util/test_socks5.py | 211 +++++++++++++++++++++ lib/portage/util/cpuinfo.py | 33 +++- lib/portage/util/futures/executor/fork.py | 4 +- lib/portage/util/futures/iter_completed.py | 18 +- lib/portage/util/install_mask.py | 89 ++++++++- lib/portage/util/socks5.py | 48 ++++- man/make.conf.5 | 6 +- setup.py | 2 +- 28 files changed, 839 insertions(+), 168 deletions(-)
