| 1 |
commit: 2988e14465a24de9db00f5899239cb739e5de083 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 28 12:32:23 2016 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 12:32:23 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2988e144 |
| 7 |
|
| 8 |
merge v2.2.26 |
| 9 |
|
| 10 |
RELEASE-NOTES | 12 ++++++ |
| 11 |
bin/egencache | 6 +-- |
| 12 |
bin/phase-functions.sh | 13 ++++++- |
| 13 |
bin/phase-helpers.sh | 17 +++++---- |
| 14 |
pym/_emerge/SpawnProcess.py | 37 +++++++++++++++++-- |
| 15 |
pym/_emerge/depgraph.py | 35 +++++++++++++++++- |
| 16 |
pym/portage/repository/config.py | 14 ++----- |
| 17 |
pym/portage/sync/controller.py | 7 ++++ |
| 18 |
pym/portage/sync/modules/cvs/__init__.py | 4 +- |
| 19 |
.../tests/resolver/test_autounmask_parent.py | 43 ++++++++++++++++++++++ |
| 20 |
pym/portage/util/locale.py | 7 ++-- |
| 21 |
setup.py | 2 +- |
| 22 |
12 files changed, 164 insertions(+), 33 deletions(-) |
| 23 |
|
| 24 |
diff --cc bin/phase-functions.sh |
| 25 |
index 6f98569,042e242..96ed339 |
| 26 |
--- a/bin/phase-functions.sh |
| 27 |
+++ b/bin/phase-functions.sh |
| 28 |
@@@ -222,32 -219,13 +222,38 @@@ __dyn_pretend() |
| 29 |
} |
| 30 |
|
| 31 |
__dyn_setup() { |
| 32 |
+ if [[ -e $PORTAGE_BUILDDIR/.setuped ]] ; then |
| 33 |
+ __vecho ">>> It appears that '$PF' is already setup; skipping." |
| 34 |
+ __vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped' to force setup." |
| 35 |
- return 0 |
| 36 |
++ return |
| 37 |
++ fi |
| 38 |
++ |
| 39 |
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then |
| 40 |
+ if ! is_auto-multilib && ! use multilib_abi_"${DEFAULT_ABI}" ; then |
| 41 |
+ ewarn |
| 42 |
+ ewarn "You disabled all ABIs" |
| 43 |
+ ewarn "You should enable at least one ABI" |
| 44 |
+ ewarn "Enabling the default ABI now" |
| 45 |
+ ewarn |
| 46 |
+ fi |
| 47 |
fi |
| 48 |
+ for LOOP_ABI in $(get_abi_list); do |
| 49 |
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then |
| 50 |
+ set_abi ${LOOP_ABI} |
| 51 |
+ rm -f "${T}"/environment |
| 52 |
+ if [[ -e $PORTAGE_BUILDDIR/.setuped.${ABI} ]] ; then |
| 53 |
+ __vecho ">>> It appears that '$PF' is already setup; skipping." |
| 54 |
+ __vecho ">>> Remove '$PORTAGE_BUILDDIR/.setuped.${ABI}' to force setup." |
| 55 |
+ return 0 |
| 56 |
+ fi |
| 57 |
+ fi |
| 58 |
__ebuild_phase pre_pkg_setup |
| 59 |
__ebuild_phase pkg_setup |
| 60 |
+ >> "$PORTAGE_BUILDDIR/.setuped.${ABI}" || \ |
| 61 |
+ die "Failed to create $PORTAGE_BUILDDIR/.setuped" |
| 62 |
+ |
| 63 |
+ done |
| 64 |
+ |
| 65 |
>> "$PORTAGE_BUILDDIR/.setuped" || \ |
| 66 |
die "Failed to create $PORTAGE_BUILDDIR/.setuped" |
| 67 |
__ebuild_phase post_pkg_setup |
| 68 |
@@@ -270,7 -246,7 +276,7 @@@ __dyn_unpack() |
| 69 |
>> "$PORTAGE_BUILDDIR/.unpacked" || \ |
| 70 |
die "Failed to create $PORTAGE_BUILDDIR/.unpacked" |
| 71 |
__vecho ">>> Source unpacked in ${WORKDIR}" |
| 72 |
-- __ebuild_phase post_src_unpack |
| 73 |
++__ebuild_phase post_src_unpack |
| 74 |
} |
| 75 |
|
| 76 |
__dyn_clean() { |
| 77 |
@@@ -406,11 -372,14 +412,16 @@@ __dyn_prepare() |
| 78 |
trap __abort_prepare SIGINT SIGQUIT |
| 79 |
|
| 80 |
__ebuild_phase pre_src_prepare |
| 81 |
- __vecho ">>> Preparing source in $PWD ..." |
| 82 |
+ __vecho ">>> Preparing source in $PWD$(_get_abi_string) ..." |
| 83 |
__ebuild_phase src_prepare |
| 84 |
|
| 85 |
+ done |
| 86 |
+ |
| 87 |
+ # keep path in eapply_user in sync! |
| 88 |
+ if ___eapi_has_eapply_user && [[ ! -f ${T}/.portage_user_patches_applied ]]; then |
| 89 |
+ die "eapply_user (or default) must be called in src_prepare()!" |
| 90 |
+ fi |
| 91 |
+ |
| 92 |
>> "$PORTAGE_BUILDDIR/.prepared" || \ |
| 93 |
die "Failed to create $PORTAGE_BUILDDIR/.prepared" |
| 94 |
__vecho ">>> Source prepared." |
Archives