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

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

commit:     16fcf4998f4b55f1697e4358c7b232e3cab56a11
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 10:38:27 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 10:38:27 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=16fcf499

Merge tag 'portage-2.3.7' into multilib

 .editorconfig                                      |  14 +++
 .travis.yml                                        |   4 +-
 NEWS                                               |  15 +++
 RELEASE-NOTES                                      |  16 ++-
 bin/ebuild-helpers/doman                           |   1 +
 bin/install-qa-check.d/80multilib-strict           |   7 +-
 bin/misc-functions.sh                              |   6 +-
 bin/phase-helpers.sh                               |  45 +++++---
 bin/quickpkg                                       |  62 ++++++++---
 cnf/make.globals                                   |   3 +-
 man/emerge.1                                       |   7 ++
 man/make.conf.5                                    |  25 +++++
 man/portage.5                                      |  27 ++++-
 pym/_emerge/BinpkgExtractorAsync.py                |  43 +++++++-
 pym/_emerge/actions.py                             |  15 +++
 pym/_emerge/depgraph.py                            | 117 +++++++++++++++++----
 pym/_emerge/main.py                                |   9 ++
 pym/_emerge/search.py                              |  24 ++++-
 pym/portage/const.py                               |   3 +-
 pym/portage/dbapi/bintree.py                       |  18 ++--
 pym/portage/dep/dep_check.py                       |   6 +-
 pym/portage/localization.py                        |   2 +-
 .../package/ebuild/_config/KeywordsManager.py      |   4 +-
 pym/portage/package/ebuild/_config/UseManager.py   |   5 +-
 .../package/ebuild/_config/special_env_vars.py     |   3 +-
 pym/portage/package/ebuild/config.py               |  27 +++++
 pym/portage/package/ebuild/doebuild.py             |  34 +++++-
 pym/portage/sync/modules/git/__init__.py           |   8 +-
 pym/portage/sync/modules/git/git.py                |  37 ++++++-
 pym/portage/sync/modules/rsync/__init__.py         |   3 +-
 pym/portage/sync/modules/rsync/rsync.py            |  12 +++
 pym/portage/sync/syncbase.py                       |   5 +-
 pym/portage/tests/emerge/test_simple.py            |   5 +-
 .../tests/resolver/test_autounmask_binpkg_use.py   |  64 +++++++++++
 .../resolver/test_autounmask_keep_keywords.py      |  72 +++++++++++++
 pym/portage/util/_urlopen.py                       |  12 +++
 pym/portage/util/compression_probe.py              |  45 ++++++--
 repoman/RELEASE-NOTES                              |  12 +++
 repoman/bin/repoman                                |   4 +-
 repoman/man/repoman.1                              |  20 +++-
 repoman/pym/repoman/actions.py                     |  55 ++++++++--
 repoman/pym/repoman/argparser.py                   |  16 ++-
 repoman/pym/repoman/main.py                        |   4 +-
 repoman/pym/repoman/modules/scan/ebuild/checks.py  |   5 +
 .../pym/repoman/modules/scan/keywords/keywords.py  |  26 ++++-
 .../repoman/modules/scan/metadata/pkgmetadata.py   |  10 ++
 repoman/pym/repoman/qa_data.py                     |   1 +
 repoman/pym/repoman/scanner.py                     |   2 +-
 repoman/pym/repoman/tests/runTests.py              |   4 +-
 repoman/runtests                                   |   4 +-
 repoman/setup.py                                   |   2 +-
 setup.py                                           |   8 +-
 52 files changed, 844 insertions(+), 134 deletions(-)

diff --cc pym/_emerge/actions.py
index 6f6646b34,3c6c265f7..d9647dd9a
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@@ -2862,13 -2872,11 +2872,18 @@@ def run_action(emerge_config)
  	adjust_configs(emerge_config.opts, emerge_config.trees)
  	apply_priorities(emerge_config.target_config.settings)
  
 +	if 'force-multilib' in emerge_config.target_config.settings.features:
 +		if emerge_config.target_config.settings.get("NO_AUTO_FLAG", "") is "":
 +			writemsg_level(bad("!!! Failed to find vars from extra profile") + "\n",level=logging.ERROR, noiselevel=-1)
 +			writemsg_level(bad("!!! Please make sure that you did follow the instructions and included the extra profile\n"),level=logging.ERROR, noiselevel=-1)
 +			writemsg_level(bad("!!! http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=blob;f=doc/portage-multilib-instructions\n"),level=logging.ERROR, noiselevel=-1)
 +			writemsg_level(bad("!!! has some basic instructions for the setup\n"),level=logging.ERROR, noiselevel=-1)
 +			return 1
+ 	if ("--autounmask-continue" in emerge_config.opts and
+ 		emerge_config.opts.get("--autounmask") == "n"):
+ 		writemsg_level(
+ 			" %s --autounmask-continue has been disabled by --autounmask=n\n" %
+ 			warn("*"), level=logging.WARNING, noiselevel=-1)
  
  	for fmt in emerge_config.target_config.settings.get("PORTAGE_BINPKG_FORMAT", "").split():
  		if not fmt in portage.const.SUPPORTED_BINPKG_FORMATS: