[gentoo-commits] proj/portage:multilib commit in: /

["Thomas Sachau" <tommy@gentoo.org>]

commit:     60c36c144d304311433dcd19662cc2cc2181c2a7
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 11:35:08 2015 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 11:35:08 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=60c36c14

Merge v2.2.19

 NEWS                                               |   9 +
 RELEASE-NOTES                                      |  50 +-
 bin/dispatch-conf                                  |   9 +-
 bin/ebuild-helpers/bsd/sed                         |   4 +-
 bin/ebuild-helpers/emake                           |  28 +-
 bin/ebuild-helpers/portageq                        |   4 +-
 bin/ebuild-helpers/unprivileged/chown              |   4 +-
 bin/ebuild-helpers/xattr/install                   |  14 +-
 bin/ebuild.sh                                      |  10 +-
 bin/emerge-webrsync                                |   4 +-
 bin/install-qa-check.d/10executable-issues         |  12 +-
 bin/install-qa-check.d/90gcc-warnings              |   2 +-
 bin/misc-functions.sh                              |  15 +-
 bin/phase-functions.sh                             |  12 +-
 bin/phase-helpers.sh                               |   2 +-
 bin/portageq                                       |  18 +-
 bin/quickpkg                                       |   1 -
 bin/repoman                                        |  58 +-
 cnf/dispatch-conf.conf                             |   2 +-
 cnf/make.globals                                   |   6 +-
 cnf/repos.conf                                     |   4 +
 man/ebuild.5                                       |  22 +-
 man/make.conf.5                                    |  31 +
 man/portage.5                                      |   8 +-
 pym/_emerge/Binpkg.py                              |  33 +-
 pym/_emerge/BinpkgExtractorAsync.py                |   5 +-
 pym/_emerge/BinpkgFetcher.py                       |  13 +-
 pym/_emerge/BinpkgPrefetcher.py                    |   2 +-
 pym/_emerge/BinpkgVerifier.py                      |   6 +-
 pym/_emerge/EbuildBinpkg.py                        |   9 +-
 pym/_emerge/EbuildBuild.py                         |  36 +-
 pym/_emerge/EbuildMerge.py                         |   3 +-
 pym/_emerge/JobStatusDisplay.py                    |   4 +-
 pym/_emerge/Package.py                             |  67 +-
 pym/_emerge/PackageMerge.py                        |   9 +-
 pym/_emerge/Scheduler.py                           |  26 +-
 pym/_emerge/actions.py                             |   5 +-
 pym/_emerge/clear_caches.py                        |   1 -
 pym/_emerge/depgraph.py                            |  16 +-
 pym/_emerge/is_valid_package_atom.py               |   5 +-
 pym/_emerge/resolver/output.py                     |  21 +-
 pym/_emerge/search.py                              |  24 +-
 pym/portage/_emirrordist/Config.py                 |   6 +-
 pym/portage/_emirrordist/MirrorDistTask.py         |   4 +-
 pym/portage/_sets/ProfilePackageSet.py             |   3 +-
 pym/portage/_sets/files.py                         |   5 +-
 pym/portage/_sets/profiles.py                      |   3 +-
 pym/portage/cache/index/pkg_desc_index.py          |   1 +
 pym/portage/checksum.py                            |   2 +-
 pym/portage/const.py                               |   5 +
 pym/portage/dbapi/_MergeProcess.py                 |   9 +-
 pym/portage/dbapi/_VdbMetadataDelta.py             |  25 +-
 pym/portage/dbapi/__init__.py                      |  10 +-
 pym/portage/dbapi/bintree.py                       | 851 +++++++++++----------
 pym/portage/dbapi/vartree.py                       |  63 +-
 pym/portage/dbapi/virtual.py                       | 113 ++-
 pym/portage/dep/__init__.py                        |  38 +-
 pym/portage/dispatch_conf.py                       | 101 ++-
 pym/portage/emaint/modules/binhost/binhost.py      |  47 +-
 pym/portage/output.py                              |   4 +-
 .../package/ebuild/_config/KeywordsManager.py      |   3 +-
 .../package/ebuild/_config/LocationsManager.py     |   8 +-
 pym/portage/package/ebuild/_config/MaskManager.py  |  21 +-
 pym/portage/package/ebuild/_config/UseManager.py   |  22 +-
 pym/portage/package/ebuild/config.py               |  15 +-
 pym/portage/package/ebuild/doebuild.py             |  81 +-
 pym/portage/package/ebuild/fetch.py                |   7 +-
 pym/portage/repository/config.py                   |   4 +-
 pym/portage/sync/controller.py                     |   9 +-
 pym/portage/sync/modules/squashdelta/README        | 124 +++
 pym/portage/sync/modules/squashdelta/__init__.py   |  37 +
 .../sync/modules/squashdelta/squashdelta.py        | 237 ++++++
 pym/portage/sync/modules/webrsync/__init__.py      |   4 +-
 pym/portage/sync/modules/webrsync/webrsync.py      |   4 +
 pym/portage/tests/dep/test_isvalidatom.py          |   8 +-
 pym/portage/tests/resolver/ResolverPlayground.py   |  25 +-
 .../resolver/binpkg_multi_instance}/__init__.py    |   0
 .../{soname => binpkg_multi_instance}/__test__.py  |   0
 .../test_build_id_profile_format.py                | 134 ++++
 .../binpkg_multi_instance/test_rebuilt_binaries.py | 101 +++
 pym/portage/util/__init__.py                       |  35 +-
 pym/portage/util/_dyn_libs/LinkageMapELF.py        |   3 +-
 pym/portage/util/formatter.py                      |  69 ++
 pym/portage/util/writeable_check.py                |  24 +-
 pym/portage/versions.py                            |  28 +-
 pym/repoman/utilities.py                           |   8 +-
 setup.py                                           |   2 +-
 87 files changed, 2192 insertions(+), 725 deletions(-)

diff --cc bin/phase-functions.sh
index 7537ddc,7bf4d63..6f98569
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@@ -549,21 -489,6 +549,13 @@@ __dyn_test() 
  	elif [[ ${EBUILD_FORCE_TEST} != 1 ]] && ! has test ${FEATURES} ; then
  		__vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}"
  	else
- 		# If ${EBUILD_FORCE_TEST} == 1 and USE came from ${T}/environment
- 		# then it might not have USE=test like it's supposed to here.
- 		if [[ ${EBUILD_FORCE_TEST} == 1 && test =~ ${PORTAGE_IUSE} ]] && \
- 			! has test ${USE} ; then
- 			export USE="${USE} test"
- 		fi
- 
 +		if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
 +			if [ ${PORTAGE_BUILDDIR}/.tested.${LOOP_ABI} -nt "${WORKDIR}" ]; then
 +				echo ">>> It appears that ${PN} is already tested for ABI=${LOOP_ABI}; skipping."
 +				echo ">>> Remove '$PORTAGE_BUILDDIR/.tested.${LOOP_ABI}' to force testing."
 +				continue
 +			fi
 +		fi
- 
  		local save_sp=${SANDBOX_PREDICT}
  		addpredict /
  		__ebuild_phase pre_src_test