1 |
commit: 1d305fca5d8176643852103f9fe12e587558c322 |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 22 09:41:33 2011 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 22 09:41:33 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d305fca |
7 |
|
8 |
Merge commit 'v2.2.0_alpha34' into multilib |
9 |
|
10 |
|
11 |
bin/etc-update | 6 +- |
12 |
bin/glsa-check | 4 +- |
13 |
cnf/make.conf.sparc.diff | 2 +- |
14 |
doc/package/ebuild/eapi/4.docbook | 4 +- |
15 |
make.conf.txt | 719 -------------------- |
16 |
man/ebuild.5 | 4 +- |
17 |
man/emerge.1 | 18 +- |
18 |
man/make.conf.5 | 2 +- |
19 |
pym/_emerge/AsynchronousLock.py | 45 ++- |
20 |
pym/_emerge/AsynchronousTask.py | 5 +- |
21 |
pym/_emerge/Binpkg.py | 3 +- |
22 |
pym/_emerge/BinpkgFetcher.py | 7 +- |
23 |
pym/_emerge/EbuildBuild.py | 3 +- |
24 |
pym/_emerge/EbuildBuildDir.py | 29 +- |
25 |
pym/_emerge/EbuildMerge.py | 20 +- |
26 |
pym/_emerge/EbuildPhase.py | 32 +- |
27 |
pym/_emerge/actions.py | 3 +- |
28 |
pym/_emerge/depgraph.py | 479 +++++++++++--- |
29 |
pym/_emerge/help.py | 21 +- |
30 |
pym/_emerge/main.py | 17 +- |
31 |
pym/_emerge/resolver/backtracking.py | 7 +- |
32 |
pym/_emerge/resolver/output_helpers.py | 4 +- |
33 |
pym/_emerge/unmerge.py | 10 +- |
34 |
pym/portage/cvstree.py | 6 +- |
35 |
pym/portage/dbapi/vartree.py | 247 +++++-- |
36 |
pym/portage/mail.py | 11 +- |
37 |
pym/portage/output.py | 4 +- |
38 |
pym/portage/package/ebuild/getmaskingstatus.py | 7 +- |
39 |
pym/portage/tests/ebuild/test_config.py | 4 +- |
40 |
pym/portage/tests/locks/test_asynchronous_lock.py | 95 +++- |
41 |
pym/portage/tests/resolver/ResolverPlayground.py | 18 +- |
42 |
pym/portage/tests/resolver/test_autounmask.py | 51 ++- |
43 |
.../tests/resolver/test_circular_dependencies.py | 3 +- |
44 |
pym/portage/tests/resolver/test_multirepo.py | 3 + |
45 |
.../tests/resolver/test_old_dep_chain_display.py | 2 + |
46 |
pym/portage/tests/resolver/test_simple.py | 2 +- |
47 |
pym/portage/tests/resolver/test_slot_collisions.py | 3 +- |
48 |
pym/portage/update.py | 4 +- |
49 |
pym/portage/util/_dyn_libs/LinkageMapELF.py | 13 +- |
50 |
pym/portage/util/digraph.py | 10 +- |
51 |
pym/portage/util/movefile.py | 5 +- |
52 |
pym/portage/xml/metadata.py | 4 +- |
53 |
42 files changed, 962 insertions(+), 974 deletions(-) |