commit: 46900b2cb1099c482740a4dd12d858fb735e1fc1 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Tue May 6 19:32:08 2014 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Tue May 6 19:32:08 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=46900b2c
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix DEVELOPING | 97 ++++++++++------ RELEASE-NOTES | 19 ++- bin/repoman | 9 ++ man/make.conf.5 | 127 ++++++++++----------- pym/_emerge/EbuildBuild.py | 9 +- pym/_emerge/TaskSequence.py | 25 +++- pym/_emerge/actions.py | 5 +- pym/_emerge/depgraph.py | 5 +- pym/_emerge/main.py | 4 + pym/_emerge/resolver/output.py | 5 +- pym/_emerge/resolver/output_helpers.py | 20 +--- pym/_emerge/search.py | 10 +- pym/portage/dbapi/vartree.py | 42 +++---- pym/portage/dep/dep_check.py | 14 --- pym/portage/glsa.py | 1 + pym/portage/localization.py | 12 ++ .../tests/resolver/test_slot_conflict_rebuild.py | 41 +++++++ pym/portage/util/writeable_check.py | 29 +++-- pym/repoman/checks.py | 10 -- pym/repoman/utilities.py | 2 +- 20 files changed, 296 insertions(+), 190 deletions(-)
