commit: cb6b68d4b7659fe601d8149b257925673eb9e03c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 13 07:20:22 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 07:20:22 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=cb6b68d4
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
.editorconfig | 14 +++
.travis.yml | 4 +-
NEWS | 15 +++
RELEASE-NOTES | 14 +++
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 | 16 +++
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(+), 133 deletions(-)
diff --cc bin/misc-functions.sh
index a9306043d,079369313..d143b6b7e
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -1111,11 -478,13 +1111,13 @@@ __dyn_package()
[ -z "${PORTAGE_BINPKG_TMPFILE}" ] && \
die "PORTAGE_BINPKG_TMPFILE is unset"
mkdir -p "${PORTAGE_BINPKG_TMPFILE%/*}" || die "mkdir failed"
+ [ -z "${PORTAGE_COMPRESSION_COMMAND}" ] && \
+ die "PORTAGE_COMPRESSION_COMMAND is unset"
tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${PROOT}" . | \
- $PORTAGE_BZIP2_COMMAND -c > "$PORTAGE_BINPKG_TMPFILE"
+ $PORTAGE_COMPRESSION_COMMAND -c > "$PORTAGE_BINPKG_TMPFILE"
assert "failed to pack binary package: '$PORTAGE_BINPKG_TMPFILE'"
PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \
- "${PORTAGE_PYTHON:-/usr/bin/python}"
"$PORTAGE_BIN_PATH"/xpak-helper.py recompose \
+ "${PORTAGE_PYTHON:-@PREFIX_PORTAGE_PYTHON@}"
"$PORTAGE_BIN_PATH"/xpak-helper.py recompose \
"$PORTAGE_BINPKG_TMPFILE" "$PORTAGE_BUILDDIR/build-info"
if [ $? -ne 0 ]; then
rm -f "${PORTAGE_BINPKG_TMPFILE}"
