1 |
commit: 57847abbfcf4049abf5789493673a50ae798867c |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 1 12:00:15 2012 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 1 12:00:15 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=57847abb |
7 |
|
8 |
Merge commit 'v2.2.0_alpha114' into multilib |
9 |
|
10 |
|
11 |
NEWS | 9 + |
12 |
RELEASE-NOTES | 6 + |
13 |
bin/dohtml.py | 49 +- |
14 |
bin/egencache | 3 + |
15 |
bin/misc-functions.sh | 7 +- |
16 |
bin/repoman | 32 +- |
17 |
bin/save-ebuild-env.sh | 3 + |
18 |
cnf/make.globals | 1 + |
19 |
doc/package/ebuild.docbook | 1 + |
20 |
doc/package/ebuild/eapi/4-python.docbook | 230 +++--- |
21 |
doc/package/ebuild/eapi/4-slot-abi.docbook | 70 ++ |
22 |
doc/portage.docbook | 1 + |
23 |
man/emerge.1 | 36 +- |
24 |
man/make.conf.5 | 8 + |
25 |
man/portage.5 | 26 +- |
26 |
man/repoman.1 | 4 + |
27 |
pym/_emerge/AtomArg.py | 5 +- |
28 |
pym/_emerge/Dependency.py | 2 +- |
29 |
pym/_emerge/DependencyArg.py | 14 +- |
30 |
pym/_emerge/EbuildPhase.py | 4 +- |
31 |
pym/_emerge/FakeVartree.py | 32 +- |
32 |
pym/_emerge/Package.py | 56 +- |
33 |
pym/_emerge/PollScheduler.py | 13 +- |
34 |
pym/_emerge/Scheduler.py | 5 +- |
35 |
pym/_emerge/SetArg.py | 5 +- |
36 |
pym/_emerge/actions.py | 55 ++- |
37 |
pym/_emerge/create_depgraph_params.py | 14 + |
38 |
pym/_emerge/depgraph.py | 840 ++++++++++++++------ |
39 |
pym/_emerge/main.py | 32 +- |
40 |
pym/_emerge/resolver/backtracking.py | 36 +- |
41 |
pym/_emerge/resolver/output.py | 25 +- |
42 |
pym/_emerge/resolver/slot_collision.py | 44 +- |
43 |
pym/portage/__init__.py | 2 +- |
44 |
pym/portage/_sets/__init__.py | 12 +- |
45 |
pym/portage/_sets/files.py | 13 +- |
46 |
pym/portage/cache/fs_template.py | 22 +- |
47 |
pym/portage/cache/sqlite.py | 42 +- |
48 |
pym/portage/const.py | 5 +- |
49 |
pym/portage/dbapi/__init__.py | 49 +- |
50 |
pym/portage/dbapi/bintree.py | 1 - |
51 |
pym/portage/dbapi/porttree.py | 19 +- |
52 |
pym/portage/dbapi/vartree.py | 61 +- |
53 |
pym/portage/dbapi/virtual.py | 51 +- |
54 |
pym/portage/dep/__init__.py | 434 +++++++---- |
55 |
pym/portage/dep/_slot_abi.py | 92 +++ |
56 |
pym/portage/dep/dep_check.py | 15 +- |
57 |
pym/portage/eapi.py | 38 + |
58 |
.../package/ebuild/_config/special_env_vars.py | 5 +- |
59 |
pym/portage/package/ebuild/_ipc/QueryCommand.py | 10 +- |
60 |
pym/portage/package/ebuild/config.py | 13 +- |
61 |
pym/portage/package/ebuild/doebuild.py | 101 ++- |
62 |
pym/portage/repository/config.py | 6 +- |
63 |
pym/portage/tests/dbapi/test_fakedbapi.py | 7 +- |
64 |
pym/portage/tests/dep/testAtom.py | 19 + |
65 |
pym/portage/tests/dep/test_isvalidatom.py | 9 + |
66 |
pym/portage/tests/dep/test_match_from_list.py | 31 +- |
67 |
pym/portage/tests/emerge/test_emerge_slot_abi.py | 198 +++++ |
68 |
pym/portage/tests/emerge/test_simple.py | 6 +- |
69 |
pym/portage/tests/repoman/test_echangelog.py | 110 +++ |
70 |
pym/portage/tests/resolver/ResolverPlayground.py | 57 +- |
71 |
pym/portage/tests/resolver/test_autounmask.py | 17 +- |
72 |
pym/portage/tests/resolver/test_complete_graph.py | 4 +- |
73 |
pym/portage/tests/resolver/test_merge_order.py | 6 +- |
74 |
pym/portage/tests/resolver/test_simple.py | 20 +- |
75 |
pym/portage/tests/resolver/test_slot_abi.py | 376 +++++++++ |
76 |
pym/portage/tests/resolver/test_slot_collisions.py | 12 + |
77 |
pym/portage/util/__init__.py | 2 +- |
78 |
pym/portage/versions.py | 54 +- |
79 |
pym/portage/xpak.py | 2 +- |
80 |
pym/repoman/checks.py | 10 +- |
81 |
pym/repoman/utilities.py | 68 +- |
82 |
runtests.sh | 2 +- |
83 |
72 files changed, 2811 insertions(+), 858 deletions(-) |