commit:     0ed453cdc3f1d395fa73a1abcf4d0870626d9fb4
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 08:24:56 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 08:24:56 2017 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=0ed453cd

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

 .travis.yml                                        |   9 +-
 NEWS                                               |   7 +
 RELEASE-NOTES                                      |  18 +
 man/emerge.1                                       |  37 +-
 pym/_emerge/create_depgraph_params.py              |   5 +
 pym/_emerge/depgraph.py                            | 119 +++++--
 pym/_emerge/main.py                                |   5 +
 pym/portage/_emirrordist/FetchTask.py              |   2 +-
 pym/portage/checksum.py                            | 340 +++++++++++-------
 pym/portage/const.py                               |   3 +-
 pym/portage/dbapi/bintree.py                       |   4 +-
 pym/portage/dep/__init__.py                        |   4 +-
 pym/portage/eclass_cache.py                        |   2 +-
 pym/portage/manifest.py                            |   4 +-
 pym/portage/package/ebuild/config.py               |   7 +-
 pym/portage/package/ebuild/fetch.py                |  11 +-
 pym/portage/tests/resolver/ResolverPlayground.py   |   5 +
 .../soname/test_slot_conflict_reinstall.py         |  16 +-
 pym/portage/tests/resolver/test_bdeps.py           | 215 ++++++++++++
 pym/portage/tests/resolver/test_slot_abi.py        |  12 +-
 .../tests/resolver/test_slot_conflict_rebuild.py   |   8 +-
 .../resolver/test_slot_operator_exclusive_slots.py | 109 ++++++
 .../test_slot_operator_runtime_pkg_mask.py         | 136 ++++++++
 .../modules => tests/util/file_copy}/__init__.py   |   0
 .../tests/{bin => util/file_copy}/__test__.py      |   0
 pym/portage/tests/util/file_copy/test_copyfile.py  |  71 ++++
 pym/portage/tests/util/test_checksum.py            | 106 ++++++
 pym/portage/util/file_copy/__init__.py             |  36 ++
 pym/portage/util/movefile.py                       |   5 +-
 repoman/pym/repoman/actions.py                     |  21 +-
 repoman/pym/repoman/modules/scan/ebuild/checks.py  |  26 ++
 repoman/pym/repoman/modules/scan/ebuild/errors.py  |   2 +
 repoman/pym/repoman/qa_data.py                     |   4 +-
 repoman/pym/repoman/utilities.py                   |  39 ++-
 setup.py                                           |  11 +-
 src/portage_util_file_copy_reflink_linux.c         | 385 +++++++++++++++++++++
 36 files changed, 1573 insertions(+), 211 deletions(-)

Reply via email to