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