commit: ee29b930b880050eb9a04c06d0f1a0edd0e1fc27 Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> AuthorDate: Sat Apr 14 12:11:15 2018 +0000 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> CommitDate: Sat Apr 14 12:11:15 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ee29b930
Merge portage-2.3.28 .travis.yml | 2 + NEWS | 4 + RELEASE-NOTES | 50 + bin/eapi.sh | 42 +- bin/eapi7-ver-funcs.sh | 191 ++++ bin/ebuild | 2 + bin/ebuild-helpers/dobin | 16 +- bin/ebuild-helpers/doconfd | 11 +- bin/ebuild-helpers/dodir | 4 +- bin/ebuild-helpers/dodoc | 2 +- bin/ebuild-helpers/doenvd | 11 +- bin/ebuild-helpers/doexe | 8 +- bin/ebuild-helpers/dohard | 6 +- bin/ebuild-helpers/doheader | 8 +- bin/ebuild-helpers/dohtml | 7 +- bin/ebuild-helpers/doinfo | 8 +- bin/ebuild-helpers/doins | 18 +- bin/ebuild-helpers/dolib | 17 +- bin/ebuild-helpers/dolib.a | 4 +- bin/ebuild-helpers/dolib.so | 4 +- bin/ebuild-helpers/doman | 8 +- bin/ebuild-helpers/domo | 21 +- bin/ebuild-helpers/dosbin | 16 +- bin/ebuild-helpers/dosed | 4 +- bin/ebuild-helpers/dosym | 8 +- bin/ebuild-helpers/ecompressdir | 25 +- bin/ebuild-helpers/fowners | 4 +- bin/ebuild-helpers/fperms | 4 +- bin/ebuild-helpers/keepdir | 6 +- bin/ebuild-helpers/newins | 2 +- bin/ebuild-helpers/nonfatal | 14 + bin/ebuild-helpers/prepall | 2 +- bin/ebuild-helpers/prepalldocs | 4 +- bin/ebuild-helpers/prepallinfo | 4 +- bin/ebuild-helpers/prepallstrip | 4 + bin/ebuild-helpers/prepinfo | 12 +- bin/ebuild-helpers/prepman | 10 +- bin/ebuild-helpers/prepstrip | 401 +------- bin/ebuild.sh | 47 +- bin/emerge | 1 + bin/{ebuild-helpers/prepstrip => estrip} | 93 +- bin/etc-update | 30 +- bin/filter-bash-environment.py | 47 +- bin/install-qa-check.d/60udev | 6 +- bin/install-qa-check.d/80libraries | 22 +- bin/isolated-functions.sh | 40 +- bin/misc-functions.sh | 131 +-- bin/phase-functions.sh | 50 +- bin/phase-helpers.sh | 114 ++- bin/portageq | 18 +- bin/postinst-qa-check.d/50gnome2-utils | 3 + bin/save-ebuild-env.sh | 8 +- bin/xattr-helper.py | 19 +- cnf/repos.conf | 6 + man/ebuild.5 | 10 - man/emerge.1 | 26 +- man/portage.5 | 29 +- pym/_emerge/BlockerDB.py | 4 +- pym/_emerge/EbuildPhase.py | 7 + pym/_emerge/Package.py | 32 +- pym/_emerge/PackagePhase.py | 93 ++ pym/_emerge/actions.py | 16 +- pym/_emerge/create_depgraph_params.py | 12 +- pym/_emerge/depgraph.py | 77 +- pym/_emerge/main.py | 24 +- pym/_emerge/resolver/output.py | 4 +- pym/_emerge/search.py | 4 + pym/_emerge/show_invalid_depstring_notice.py | 4 +- pym/portage/__init__.py | 58 +- pym/portage/_sets/base.py | 17 +- pym/portage/cache/metadata.py | 4 +- pym/portage/const.py | 3 +- pym/portage/dbapi/__init__.py | 4 +- pym/portage/dbapi/bintree.py | 16 +- pym/portage/dbapi/dep_expand.py | 2 +- pym/portage/dbapi/porttree.py | 105 +- pym/portage/dbapi/vartree.py | 66 +- pym/portage/dep/__init__.py | 27 +- pym/portage/dep/_slot_operator.py | 7 +- pym/portage/eapi.py | 43 +- pym/portage/emaint/modules/move/move.py | 4 +- pym/portage/module.py | 49 +- pym/portage/package/ebuild/_config/MaskManager.py | 10 +- .../package/ebuild/_config/special_env_vars.py | 7 +- pym/portage/package/ebuild/config.py | 137 +-- pym/portage/package/ebuild/doebuild.py | 26 +- pym/portage/process.py | 30 +- pym/portage/repository/config.py | 27 +- pym/portage/sync/modules/git/__init__.py | 3 +- pym/portage/sync/modules/git/git.py | 95 +- pym/portage/sync/modules/rsync/__init__.py | 1 + pym/portage/sync/modules/rsync/rsync.py | 479 +++++---- pym/portage/sync/syncbase.py | 87 +- pym/portage/tests/bin/test_eapi7_ver_funcs.py | 240 +++++ pym/portage/tests/bin/test_filter_bash_env.py | 115 +++ pym/portage/tests/dep/testCheckRequiredUse.py | 5 +- pym/portage/tests/ebuild/test_ipc_daemon.py | 12 +- pym/portage/tests/resolver/ResolverPlayground.py | 2 +- pym/portage/tests/resolver/test_autounmask.py | 25 +- pym/portage/tests/resolver/test_complete_graph.py | 20 +- pym/portage/tests/resolver/test_eapi.py | 9 +- pym/portage/tests/resolver/test_required_use.py | 22 +- .../resolver/test_slot_change_without_revbump.py | 19 + .../tests/resolver/test_virtual_transition.py | 51 - .../tests/util/futures/test_iter_completed.py | 50 + pym/portage/tests/util/futures/test_retry.py | 147 +++ pym/portage/util/_async/AsyncTaskFuture.py | 31 + pym/portage/util/_eventloop/EventLoop.py | 92 +- pym/portage/util/backoff.py | 53 + .../modules => util/futures/executor}/__init__.py | 0 pym/portage/util/futures/executor/fork.py | 134 +++ pym/portage/util/futures/futures.py | 6 + pym/portage/util/futures/iter_completed.py | 63 ++ pym/portage/util/futures/retry.py | 183 ++++ pym/portage/util/futures/wait.py | 92 ++ pym/portage/util/install_mask.py | 125 +++ pym/portage/util/monotonic.py | 34 + pym/portage/util/movefile.py | 4 +- repoman/NEWS | 5 + repoman/RELEASE-NOTES | 13 + repoman/cnf/linechecks/linechecks.yaml | 35 + repoman/cnf/qa_data/qa_data.yaml | 136 +++ repoman/cnf/repository/linechecks.yaml | 252 +++++ repoman/cnf/repository/qa_data.yaml | 160 +++ repoman/cnf/repository/repository.yaml | 76 ++ repoman/man/repoman.1 | 19 +- repoman/pym/repoman/actions.py | 100 +- repoman/pym/repoman/argparser.py | 8 +- repoman/pym/repoman/config.py | 159 +++ repoman/pym/repoman/main.py | 30 +- repoman/pym/repoman/metadata.py | 2 +- .../__test__.py => modules/linechecks/__init__.py} | 0 .../modules/linechecks/assignment/__init__.py | 28 + .../modules/linechecks/assignment/assignment.py | 31 + repoman/pym/repoman/modules/linechecks/base.py | 101 ++ repoman/pym/repoman/modules/linechecks/config.py | 118 +++ .../pym/repoman/modules/linechecks/controller.py | 145 +++ .../repoman/modules/linechecks/depend/__init__.py | 22 + .../repoman/modules/linechecks/depend/implicit.py | 39 + .../modules/linechecks/deprecated/__init__.py | 47 + .../modules/linechecks/deprecated/deprecated.py | 32 + .../modules/linechecks/deprecated/inherit.py | 66 ++ .../pym/repoman/modules/linechecks/do/__init__.py | 22 + repoman/pym/repoman/modules/linechecks/do/dosym.py | 16 + .../repoman/modules/linechecks/eapi/__init__.py | 52 + .../pym/repoman/modules/linechecks/eapi/checks.py | 83 ++ .../repoman/modules/linechecks/eapi/definition.py | 36 + .../repoman/modules/linechecks/emake/__init__.py | 28 + .../pym/repoman/modules/linechecks/emake/emake.py | 23 + .../modules/linechecks/gentoo_header/__init__.py | 22 + .../modules/linechecks/gentoo_header/header.py | 49 + .../repoman/modules/linechecks/helpers/__init__.py | 22 + .../repoman/modules/linechecks/helpers/offset.py | 22 + .../repoman/modules/linechecks/nested/__init__.py | 22 + .../repoman/modules/linechecks/nested/nested.py | 15 + .../repoman/modules/linechecks/nested/nesteddie.py | 11 + .../repoman/modules/linechecks/patches/__init__.py | 22 + .../repoman/modules/linechecks/patches/patches.py | 16 + .../repoman/modules/linechecks/phases/__init__.py | 35 + .../pym/repoman/modules/linechecks/phases/phase.py | 71 ++ .../repoman/modules/linechecks/portage/__init__.py | 28 + .../repoman/modules/linechecks/portage/internal.py | 37 + .../repoman/modules/linechecks/quotes/__init__.py | 28 + .../repoman/modules/linechecks/quotes/quoteda.py | 16 + .../repoman/modules/linechecks/quotes/quotes.py | 86 ++ .../pym/repoman/modules/linechecks/uri/__init__.py | 22 + repoman/pym/repoman/modules/linechecks/uri/uri.py | 30 + .../pym/repoman/modules/linechecks/use/__init__.py | 22 + .../repoman/modules/linechecks/use/builtwith.py | 10 + .../repoman/modules/linechecks/useless/__init__.py | 28 + .../pym/repoman/modules/linechecks/useless/cd.py | 24 + .../repoman/modules/linechecks/useless/dodoc.py | 16 + .../modules/linechecks/whitespace/__init__.py | 28 + .../repoman/modules/linechecks/whitespace/blank.py | 25 + .../modules/linechecks/whitespace/whitespace.py | 21 + .../modules/linechecks/workaround/__init__.py | 28 + .../modules/linechecks/workaround/workarounds.py | 18 + .../pym/repoman/modules/scan/depend/__init__.py | 4 +- .../repoman/modules/scan/depend/_depend_checks.py | 11 +- repoman/pym/repoman/modules/scan/depend/profile.py | 3 +- .../repoman/modules/scan/directories/__init__.py | 5 +- repoman/pym/repoman/modules/scan/eapi/__init__.py | 4 +- repoman/pym/repoman/modules/scan/eapi/eapi.py | 4 +- .../pym/repoman/modules/scan/ebuild/__init__.py | 7 +- repoman/pym/repoman/modules/scan/ebuild/checks.py | 1044 -------------------- repoman/pym/repoman/modules/scan/ebuild/ebuild.py | 5 +- repoman/pym/repoman/modules/scan/ebuild/errors.py | 53 - .../pym/repoman/modules/scan/ebuild/multicheck.py | 10 +- .../pym/repoman/modules/scan/eclasses/__init__.py | 7 +- repoman/pym/repoman/modules/scan/eclasses/ruby.py | 5 +- repoman/pym/repoman/modules/scan/fetch/__init__.py | 4 +- .../pym/repoman/modules/scan/keywords/__init__.py | 4 +- .../pym/repoman/modules/scan/manifest/__init__.py | 4 +- .../pym/repoman/modules/scan/metadata/__init__.py | 13 +- .../repoman/modules/scan/metadata/description.py | 6 +- .../modules/scan/metadata/ebuild_metadata.py | 14 +- .../repoman/modules/scan/metadata/pkgmetadata.py | 2 +- .../pym/repoman/modules/scan/metadata/restrict.py | 4 +- repoman/pym/repoman/modules/scan/module.py | 102 ++ .../pym/repoman/modules/scan/options/__init__.py | 4 +- repoman/pym/repoman/qa_data.py | 462 ++------- repoman/pym/repoman/qa_tracker.py | 10 +- repoman/pym/repoman/repos.py | 21 +- repoman/pym/repoman/scanner.py | 84 +- .../pym/repoman/tests/commit}/__init__.py | 2 +- .../repoman/tests/{simple => commit}/__test__.py | 0 repoman/pym/repoman/tests/commit/test_commitmsg.py | 109 ++ repoman/pym/repoman/tests/runTests.py | 8 +- repoman/pym/repoman/tests/simple/test_simple.py | 8 +- repoman/pym/repoman/utilities.py | 22 +- repoman/setup.py | 8 +- setup.py | 2 +- 212 files changed, 6465 insertions(+), 3030 deletions(-) diff --cc bin/phase-functions.sh index 58e0cdc0b,3de8d01b5..6c8da017d --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@@ -746,28 -673,10 +760,20 @@@ __dyn_install() x=$(echo -n ${!f}) [[ -n $x ]] && echo "$x" > $f done - if [[ $CATEGORY != virtual ]] ; then - for f in ASFLAGS CBUILD CC CFLAGS CHOST CTARGET CXX \ - CXXFLAGS EXTRA_ECONF EXTRA_EINSTALL EXTRA_MAKE \ - LDFLAGS LIBCFLAGS LIBCXXFLAGS QA_CONFIGURE_OPTIONS \ - QA_DESKTOP_FILE QA_PREBUILT PROVIDES_EXCLUDE REQUIRES_EXCLUDE ; do - x=$(echo -n ${!f}) - [[ -n $x ]] && echo "$x" > $f - done - # whitespace preserved - for f in QA_AM_MAINTAINER_MODE ; do - [[ -n ${!f} ]] && echo "${!f}" > $f - done + # whitespace preserved + for f in QA_AM_MAINTAINER_MODE ; do + [[ -n ${!f} ]] && echo "${!f}" > $f + done + fi + if [[ " ${FEATURES} " == *" force-multilib "* ]]; then + #IUSE is changed in _post_src_install_chost_fix + #in pym/portage/package/ebuild/doebuild.py + #which is run after dyn_install, so useless to + #add internal USE flags here + if is_auto-multilib; then + echo "$(get_abi_order)" > MULTILIB_ABIS + fi + fi echo "${USE}" > USE echo "${EAPI:-0}" > EAPI