commit: 4d42c6dde9572c3b9dac7dadf1366420b05f37e3
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 10:42:45 2018 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 10:42:45 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4d42c6dd
Merge tag 'portage-2.3.17' into multilib
COPYING | 35 ++
NEWS | 5 +
RELEASE-NOTES | 9 +
bin/doins.py | 579 +++++++++++++++++++++
bin/ebuild-helpers/doins | 156 ++----
bin/phase-helpers.sh | 3 +-
pym/_emerge/Scheduler.py | 36 --
pym/_emerge/depgraph.py | 12 +-
pym/_emerge/main.py | 3 +-
pym/portage/checksum.py | 9 +-
pym/portage/output.py | 2 +-
pym/portage/package/ebuild/config.py | 4 +-
pym/portage/tests/bin/test_doins.py | 352 +++++++++++++
.../resolver/test_disjunctive_depend_order.py | 87 ++++
.../tests/resolver/test_onlydeps_minimal.py | 5 +-
pym/portage/tests/versions/test_vercmp.py | 3 -
pym/portage/versions.py | 38 +-
setup.py | 2 +-
18 files changed, 1153 insertions(+), 187 deletions(-)
diff --cc bin/phase-helpers.sh
index 8e3721dba,9b1f6adbe..0a3bcdf1f
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@@ -193,9 -193,9 +193,10 @@@ use()
# a full profile with IUSE_IMPLICIT and stuff (see bug #456830).
elif [[ -n $PORTAGE_IUSE && -n $EBUILD_PHASE &&
-n $PORTAGE_INTERNAL_CALLER ]] ; then
- if [[ ! $u =~ $PORTAGE_IUSE ]] ; then
+ if ( [[ ! " ${FEATURES} " == *" force-multilib "* && $u ==
multilib ]] && \
+ [[ ! $u =~ $PORTAGE_IUSE ]] ) ; then
- if [[ ! ${EAPI} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
; then
+ if [[ ${EMERGE_FROM} != binary &&
+ ! ${EAPI} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$
]] ; then
# This is only strict starting with EAPI 5,
since implicit IUSE
# is not well defined for earlier EAPIs (see
bug #449708).
die "USE Flag '${u}' not in IUSE for
${CATEGORY}/${PF}"
