[gentoo-commits] proj/portage:master commit in: bin/

[Michał Górny]

commit:     8afd881d6f364a8fd8b71f46602caeda30c5ffe0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 16:32:27 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 16:32:27 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=8afd881d

src_prepare: Do not expect eapply_user in EAPIs not having it

 bin/phase-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index abbc602..042e242 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -376,7 +376,7 @@ __dyn_prepare() {
        __ebuild_phase src_prepare
 
        # keep path in eapply_user in sync!
-       if [[ ! -f ${T}/.portage_user_patches_applied ]]; then
+       if ___eapi_has_eapply_user && [[ ! -f 
${T}/.portage_user_patches_applied ]]; then
                die "eapply_user (or default) must be called in src_prepare()!"
        fi