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