commit:     d41a3639f9e8adb6684d3800adf1b1b2ae40f843
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 11:37:13 2015 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 11:37:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d41a3639

Merge v2.2.21

 .travis.yml                                   |   2 -
 DEVELOPING                                    |  10 +-
 README                                        |   2 +-
 RELEASE-NOTES                                 |  39 ++++
 bin/ebuild-helpers/die                        |   2 +-
 bin/ebuild-helpers/dobin                      |   2 +-
 bin/ebuild-helpers/doconfd                    |   2 +-
 bin/ebuild-helpers/dodir                      |   2 +-
 bin/ebuild-helpers/dodoc                      |   2 +-
 bin/ebuild-helpers/doenvd                     |   2 +-
 bin/ebuild-helpers/doexe                      |   2 +-
 bin/ebuild-helpers/dohard                     |   2 +-
 bin/ebuild-helpers/doheader                   |   2 +-
 bin/ebuild-helpers/dohtml                     |   6 +-
 bin/ebuild-helpers/doinfo                     |   2 +-
 bin/ebuild-helpers/doinitd                    |   2 +-
 bin/ebuild-helpers/doins                      |   2 +-
 bin/ebuild-helpers/dolib                      |   2 +-
 bin/ebuild-helpers/doman                      |   2 +-
 bin/ebuild-helpers/domo                       |   2 +-
 bin/ebuild-helpers/dosbin                     |   2 +-
 bin/ebuild-helpers/dosed                      |   2 +-
 bin/ebuild-helpers/dosym                      |   2 +-
 bin/ebuild-helpers/ecompress                  |   2 +-
 bin/ebuild-helpers/ecompressdir               |   2 +-
 bin/ebuild-helpers/elog                       |   2 +-
 bin/ebuild-helpers/emake                      |   2 +-
 bin/ebuild-helpers/fowners                    |   2 +-
 bin/ebuild-helpers/fperms                     |   2 +-
 bin/ebuild-helpers/keepdir                    |   2 +-
 bin/ebuild-helpers/newins                     |   2 +-
 bin/ebuild-helpers/portageq                   |   4 +-
 bin/ebuild-helpers/prepall                    |   2 +-
 bin/ebuild-helpers/prepalldocs                |   2 +-
 bin/ebuild-helpers/prepallinfo                |   2 +-
 bin/ebuild-helpers/prepallman                 |   2 +-
 bin/ebuild-helpers/prepallstrip               |   2 +-
 bin/ebuild-helpers/prepinfo                   |   2 +-
 bin/ebuild-helpers/prepman                    |   2 +-
 bin/ebuild-helpers/prepstrip                  |   3 +-
 bin/ebuild-helpers/unprivileged/chown         |   4 +-
 bin/ebuild-helpers/xattr/install              |   2 -
 bin/ebuild-ipc                                |   4 +-
 bin/ebuild.sh                                 |   3 -
 bin/egencache                                 |  20 +++
 bin/helper-functions.sh                       |   2 +-
 bin/install-qa-check.d/10executable-issues    | 248 +++++++++++++-------------
 bin/install-qa-check.d/80libraries            | 130 +++++++-------
 bin/isolated-functions.sh                     |   3 +-
 bin/misc-functions.sh                         |  18 +-
 bin/phase-helpers.sh                          |   4 +-
 bin/quickpkg                                  |  18 +-
 bin/xattr-helper.py                           |  11 +-
 doc/qa.docbook                                |   3 +-
 man/portage.5                                 |  11 ++
 man/repoman.1                                 |   5 +-
 pym/_emerge/AbstractEbuildProcess.py          |  21 ++-
 pym/_emerge/BlockerDB.py                      |   5 +-
 pym/_emerge/PackageVirtualDbapi.py            |   4 +-
 pym/_emerge/Scheduler.py                      |  10 +-
 pym/_emerge/actions.py                        |   7 +-
 pym/_emerge/depgraph.py                       |  55 ++++--
 pym/_emerge/main.py                           |  19 +-
 pym/_emerge/resolver/circular_dependency.py   |  21 ++-
 pym/_emerge/resolver/slot_collision.py        |  11 +-
 pym/_emerge/search.py                         |   3 +-
 pym/portage/dbapi/IndexedPortdb.py            |   4 +-
 pym/portage/dbapi/IndexedVardb.py             |   6 +-
 pym/portage/dbapi/__init__.py                 |   4 +-
 pym/portage/dbapi/bintree.py                  |   4 +-
 pym/portage/dbapi/porttree.py                 |   6 +-
 pym/portage/dbapi/vartree.py                  |  22 ++-
 pym/portage/dbapi/virtual.py                  |   4 +-
 pym/portage/dep/__init__.py                   |   7 +-
 pym/portage/dep/soname/multilib_category.py   |   2 +-
 pym/portage/emaint/modules/sync/sync.py       | 148 +++++++++++++--
 pym/portage/manifest.py                       |  35 ++++
 pym/portage/package/ebuild/config.py          |   3 +-
 pym/portage/proxy/lazyimport.py               |  17 +-
 pym/portage/repository/config.py              |  44 +++--
 pym/portage/sync/__init__.py                  |  20 ++-
 pym/portage/sync/controller.py                |  31 +++-
 pym/portage/sync/modules/cvs/__init__.py      |   3 +-
 pym/portage/sync/modules/cvs/cvs.py           |   2 +-
 pym/portage/sync/modules/git/__init__.py      |   1 +
 pym/portage/sync/modules/git/git.py           |  20 ++-
 pym/portage/sync/modules/rsync/__init__.py    |   4 +
 pym/portage/sync/modules/rsync/rsync.py       |  17 +-
 pym/portage/sync/modules/svn/__init__.py      |   1 +
 pym/portage/sync/modules/webrsync/__init__.py |   1 +
 pym/portage/sync/syncbase.py                  |   2 +-
 pym/portage/tests/dep/test_match_from_list.py |  21 ++-
 pym/portage/tests/sync/test_sync_local.py     |  79 +++++++-
 pym/portage/tests/util/test_xattr.py          | 178 ++++++++++++++++++
 pym/portage/util/_async/AsyncFunction.py      |  67 +++++++
 pym/portage/util/_dyn_libs/LinkageMapELF.py   |   2 +-
 pym/portage/util/_xattr.py                    | 228 +++++++++++++++++++++++
 pym/portage/util/movefile.py                  | 102 +++--------
 runtests                                      | 156 ++++++++++++++++
 runtests.sh                                   | 109 -----------
 setup.py                                      |   2 +-
 101 files changed, 1538 insertions(+), 588 deletions(-)

diff --cc bin/misc-functions.sh
index 5038ff1,c2ff70a..84f01c1
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -14,10 -14,9 +14,10 @@@
  MISC_FUNCTIONS_ARGS="$@"
  shift $#
  
- source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}/ebuild.sh"
+ source "${PORTAGE_BIN_PATH}/ebuild.sh" || exit 1
  
  install_symlink_html_docs() {
 +      [[ " ${FEATURES} " == *" force-prefix "* ]] || \
        if ! ___eapi_has_prefix_variables; then
                local ED=${D}
        fi

Reply via email to