commit: 08d48efbbdc7f7e36b5be16884cd72f5ef52e3d6 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sun Mar 20 19:31:06 2016 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sun Mar 20 19:31:06 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=08d48efb
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix .travis.yml | 3 +++ RELEASE-NOTES | 20 +++++++++++++++++++ bin/egencache | 6 +++--- bin/misc-functions.sh | 2 +- bin/phase-functions.sh | 7 +------ bin/phase-helpers.sh | 7 ++++++- bin/portageq | 33 ++++++++++++++------------------ man/portage.5 | 6 ++++++ pym/portage/dbapi/porttree.py | 3 ++- pym/portage/package/ebuild/doebuild.py | 2 +- pym/portage/sync/modules/git/__init__.py | 5 ++++- pym/portage/sync/modules/git/git.py | 4 ++++ pym/portage/tests/repoman/test_simple.py | 9 +++------ pym/repoman/actions.py | 29 +++++++++++++++++++--------- pym/repoman/scanner.py | 2 +- runtests | 4 ++-- setup.py | 2 +- 17 files changed, 92 insertions(+), 52 deletions(-) diff --cc bin/misc-functions.sh index 080e366,58755a1..a930604 mode 100644,100755..100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh
