commit: 723161745437fcc4a90a7307f6412201f5edd225 Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> AuthorDate: Fri Dec 12 20:17:36 2014 +0000 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> CommitDate: Fri Dec 12 20:17:36 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=72316174
Merge tag 'v2.2.12' into multilib NEWS | 17 +- RELEASE-NOTES | 21 ++ bin/chpathtool.py | 9 +- bin/ebuild-helpers/emake | 4 +- bin/misc-functions.sh | 44 +++- bin/phase-helpers.sh | 8 +- bin/quickpkg | 4 +- bin/repoman | 12 +- pym/_emerge/Scheduler.py | 2 +- pym/_emerge/actions.py | 13 +- pym/_emerge/depgraph.py | 7 +- pym/_emerge/main.py | 5 +- pym/_emerge/sync/old_tree_timestamp.py | 12 +- pym/_emerge/unmerge.py | 3 +- pym/portage/_emirrordist/FetchTask.py | 6 +- pym/portage/_sets/dbapi.py | 4 +- pym/portage/cache/sqlite.py | 4 +- pym/portage/const.py | 3 +- pym/portage/dbapi/__init__.py | 6 +- pym/portage/dbapi/vartree.py | 10 +- pym/portage/emaint/main.py | 6 +- pym/portage/emaint/modules/merges/__init__.py | 30 +++ pym/portage/emaint/modules/merges/merges.py | 290 +++++++++++++++++++++++ pym/portage/localization.py | 7 +- pym/portage/output.py | 6 +- pym/portage/util/_eventloop/EventLoop.py | 8 +- pym/portage/util/_eventloop/PollSelectAdapter.py | 6 +- 27 files changed, 481 insertions(+), 66 deletions(-)
