commit: feb6264c45dda65c8298349f0f04d06ae0c5ff8e
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 13:25:51 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 23 13:25:51 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=feb6264c
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
RELEASE-NOTES | 29 +++
bin/ebuild-helpers/dosym | 17 +-
bin/phase-functions.sh | 1 +
bin/phase-helpers.sh | 8 +-
man/emerge.1 | 19 +-
pym/_emerge/AsynchronousLock.py | 89 +++++++-
pym/_emerge/EbuildBuild.py | 23 +-
pym/_emerge/Scheduler.py | 3 -
pym/_emerge/SpawnProcess.py | 3 +-
pym/_emerge/SubProcess.py | 23 +-
pym/_emerge/UseFlagDisplay.py | 19 +-
pym/_emerge/actions.py | 17 +-
pym/_emerge/depgraph.py | 136 +++++++++---
pym/_emerge/main.py | 12 ++
pym/portage/dbapi/bintree.py | 19 +-
pym/portage/dbapi/vartree.py | 22 +-
pym/portage/package/ebuild/_spawn_nofetch.py | 106 +++++----
pym/portage/tests/ebuild/test_ipc_daemon.py | 3 +-
pym/portage/tests/locks/test_asynchronous_lock.py | 15 +-
pym/portage/tests/resolver/test_autounmask.py | 57 ++++-
.../tests/resolver/test_autounmask_use_breakage.py | 40 ++++
.../tests/resolver/test_onlydeps_minimal.py | 47 ++++
.../test_slot_conflict_unsatisfied_deep_deps.py | 61 ++++++
...ask.py => test_slot_operator_complete_graph.py} | 23 +-
.../modules => tests/util/eventloop}/__init__.py | 0
.../tests/{bin => util/eventloop}/__test__.py | 0
.../tests/util/eventloop/test_call_soon_fifo.py | 6 +-
.../modules => tests/util/futures}/__init__.py | 0
.../tests/{bin => util/futures}/__test__.py | 0
.../tests/util/futures/test_done_callback.py | 35 +++
pym/portage/tests/util/test_digraph.py | 4 +-
pym/portage/util/_async/SchedulerInterface.py | 3 +-
pym/portage/util/_eventloop/EventLoop.py | 32 ++-
pym/portage/util/digraph.py | 26 ++-
pym/portage/util/futures/futures.py | 238 ++++++++++++++-------
repoman/man/repoman.1 | 4 +
repoman/pym/repoman/modules/scan/ebuild/checks.py | 13 ++
repoman/pym/repoman/qa_data.py | 4 +
setup.py | 7 +-
src/portage_util_file_copy_reflink_linux.c | 19 +-
40 files changed, 945 insertions(+), 238 deletions(-)
diff --cc bin/ebuild-helpers/dosym
index 19e163498,e96039146..a2157e96e
--- a/bin/ebuild-helpers/dosym
+++ b/bin/ebuild-helpers/dosym
@@@ -1,5 -1,5 +1,5 @@@
-#!/bin/bash
+#!@PORTAGE_BASH@
- # Copyright 1999-2012 Gentoo Foundation
+ # Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
diff --cc bin/phase-helpers.sh
index 349cd206a,e1dcfd5e8..83eb69389
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@@ -1,5 -1,5 +1,5 @@@
-#!/bin/bash
+#!@PORTAGE_BASH@
- # Copyright 1999-2013 Gentoo Foundation
+ # Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
export DESTTREE=/usr
