| 1 |
commit: 487202f9db043fc140df65f644bbb3d2ce8039db |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 26 14:41:49 2012 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 26 14:41:49 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=487202f9 |
| 7 |
|
| 8 |
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix |
| 9 |
|
| 10 |
Conflicts: |
| 11 |
pym/_emerge/actions.py |
| 12 |
|
| 13 |
|
| 14 |
bin/dispatch-conf | 2 +- |
| 15 |
bin/ebuild-helpers/prepstrip | 48 +++++- |
| 16 |
bin/phase-functions.sh | 3 +- |
| 17 |
bin/repoman | 39 ++++- |
| 18 |
bin/xattr-helper.py | 176 ++++++++++++++++++++ |
| 19 |
man/ebuild.5 | 7 +- |
| 20 |
man/emerge.1 | 4 +- |
| 21 |
pym/_emerge/BinpkgFetcher.py | 2 +- |
| 22 |
pym/_emerge/EbuildMetadataPhase.py | 2 +- |
| 23 |
pym/_emerge/Package.py | 12 +- |
| 24 |
pym/_emerge/SpawnProcess.py | 2 +- |
| 25 |
pym/_emerge/actions.py | 56 ++++-- |
| 26 |
pym/_emerge/depgraph.py | 9 +- |
| 27 |
pym/_emerge/help.py | 2 +- |
| 28 |
pym/_emerge/is_valid_package_atom.py | 2 +- |
| 29 |
pym/_emerge/main.py | 17 ++- |
| 30 |
pym/_emerge/resolver/slot_collision.py | 3 + |
| 31 |
pym/portage/__init__.py | 11 ++ |
| 32 |
pym/portage/dbapi/_MergeProcess.py | 3 + |
| 33 |
pym/portage/dbapi/bintree.py | 10 +- |
| 34 |
pym/portage/dbapi/dep_expand.py | 4 +- |
| 35 |
pym/portage/dbapi/porttree.py | 9 +- |
| 36 |
pym/portage/dbapi/vartree.py | 14 +- |
| 37 |
pym/portage/dep/__init__.py | 2 +- |
| 38 |
pym/portage/getbinpkg.py | 2 +- |
| 39 |
.../{_eapi_invalid.py => _metadata_invalid.py} | 0 |
| 40 |
pym/portage/package/ebuild/config.py | 3 +- |
| 41 |
pym/portage/package/ebuild/doebuild.py | 39 ++++- |
| 42 |
pym/portage/package/ebuild/fetch.py | 2 +- |
| 43 |
pym/portage/package/ebuild/getmaskingstatus.py | 7 + |
| 44 |
pym/portage/process.py | 2 +- |
| 45 |
pym/repoman/checks.py | 10 +- |
| 46 |
runtests.sh | 2 +- |
| 47 |
33 files changed, 424 insertions(+), 82 deletions(-) |
Archives