1 |
commit: c94ec69ec2f161bf41324586e4adccdee1262562 |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 6 13:09:32 2011 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 6 13:09:32 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c94ec69e |
7 |
|
8 |
Merge commit 'v2.2.0_alpha20' into multilib |
9 |
|
10 |
|
11 |
bin/isolated-functions.sh | 12 +- |
12 |
bin/repoman | 1 + |
13 |
man/emerge.1 | 24 +- |
14 |
man/make.conf.5 | 8 +- |
15 |
man/portage.5 | 3 +- |
16 |
man/repoman.1 | 5 +- |
17 |
pym/_emerge/BinpkgFetcher.py | 4 +- |
18 |
pym/_emerge/EbuildBuild.py | 17 +- |
19 |
pym/_emerge/EbuildFetcher.py | 6 + |
20 |
pym/_emerge/Package.py | 35 ++- |
21 |
pym/_emerge/actions.py | 46 ++- |
22 |
pym/_emerge/depgraph.py | 508 +++++++++++--------- |
23 |
pym/_emerge/resolver/output.py | 116 +++-- |
24 |
pym/_emerge/resolver/slot_collision.py | 85 +++- |
25 |
pym/portage/__init__.py | 1 + |
26 |
pym/portage/_selinux.py | 6 +- |
27 |
pym/portage/cache/ebuild_xattr.py | 6 +- |
28 |
pym/portage/dbapi/_MergeProcess.py | 8 +- |
29 |
pym/portage/dbapi/bintree.py | 48 +- |
30 |
pym/portage/dep/__init__.py | 151 ++++++- |
31 |
.../package/ebuild/_config/KeywordsManager.py | 203 ++++++-- |
32 |
pym/portage/package/ebuild/_config/MaskManager.py | 59 +++- |
33 |
pym/portage/package/ebuild/config.py | 50 ++- |
34 |
pym/portage/package/ebuild/doebuild.py | 35 ++- |
35 |
pym/portage/package/ebuild/fetch.py | 1 + |
36 |
pym/portage/process.py | 5 + |
37 |
pym/portage/tests/dep/testCheckRequiredUse.py | 112 +++++- |
38 |
.../test_lazy_import_portage_baseline.py | 1 + |
39 |
pym/portage/tests/lint/test_import_modules.py | 40 ++ |
40 |
pym/portage/tests/resolver/ResolverPlayground.py | 18 +- |
41 |
pym/portage/tests/resolver/test_depclean.py | 40 ++ |
42 |
...ated_atoms.py => test_old_dep_chain_display.py} | 16 +- |
43 |
pym/portage/tests/resolver/test_required_use.py | 26 +- |
44 |
pym/portage/tests/resolver/test_slot_collisions.py | 20 +- |
45 |
pym/portage/update.py | 14 +- |
46 |
pym/repoman/checks.py | 13 +- |
47 |
pym/repoman/errors.py | 3 +- |
48 |
37 files changed, 1309 insertions(+), 437 deletions(-) |