1 |
commit: 5c128c674867e13b4627a5ac873f87a9419ed288 |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 8 10:03:32 2012 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 8 10:03:32 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5c128c67 |
7 |
|
8 |
Merge v2.2.0_alpha116 |
9 |
|
10 |
|
11 |
bin/ebuild | 9 +- |
12 |
bin/ebuild-ipc.py | 11 +- |
13 |
bin/emaint | 9 +- |
14 |
bin/emerge | 11 +- |
15 |
bin/quickpkg | 15 +- |
16 |
man/ebuild.5 | 6 +- |
17 |
man/emerge.1 | 3 + |
18 |
man/make.conf.5 | 13 +- |
19 |
pym/_emerge/depgraph.py | 109 +++++++--- |
20 |
pym/_emerge/main.py | 6 + |
21 |
pym/portage/const.py | 24 ++- |
22 |
pym/portage/dbapi/bintree.py | 4 +- |
23 |
pym/portage/dbapi/vartree.py | 110 +++++++++- |
24 |
pym/portage/dep/__init__.py | 40 +++- |
25 |
pym/portage/tests/ebuild/test_config.py | 4 +- |
26 |
.../tests/resolver/test_slot_abi_downgrade.py | 225 ++++++++++++++++++++ |
27 |
pym/portage/tests/runTests | 11 +- |
28 |
17 files changed, 517 insertions(+), 93 deletions(-) |
29 |
|
30 |
diff --cc pym/portage/const.py |
31 |
index ad7e2ec,ceef5c5..7c75381 |
32 |
--- a/pym/portage/const.py |
33 |
+++ b/pym/portage/const.py |
34 |
@@@ -91,8 -90,9 +91,9 @@@ SUPPORTED_FEATURES = frozenset( |
35 |
"ccache", "chflags", "clean-logs", |
36 |
"collision-protect", "compress-build-logs", "compressdebug", |
37 |
"config-protect-if-modified", |
38 |
- "digest", "distcc", "distcc-pump", "distlocks", "ebuild-locks", "fakeroot", |
39 |
+ "digest", "distcc", "distcc-pump", "distlocks", |
40 |
+ "downgrade-backup", "ebuild-locks", "fakeroot", |
41 |
- "fail-clean", "force-mirror", "force-prefix", "getbinpkg", |
42 |
+ "fail-clean", "force-mirror", "force-multilib", "force-prefix", "getbinpkg", |
43 |
"installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror", |
44 |
"metadata-transfer", "mirror", "multilib-strict", "news", |
45 |
"noauto", "noclean", "nodoc", "noinfo", "noman", |