[gentoo-commits] repo/proj/prefix:master commit in: eclass/

["Michael Haubenwallner" <haubi@gentoo.org>]

commit:     954efef84a53cdbd10393fd71a37bd9cc3286ac9
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 11:36:26 2019 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 12:01:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=954efef8

python-utils-r1.eclass: support USE=prefix-stack

Need to support FEATURES=stacked-prefix for some transition period.
Better not test with 'use prefix-stack' but 'has prefix-stack ${USE}',
for when the user's profile does not set IUSE_IMPLICIT=prefix-stack yet.
Bug: https://bugs.gentoo.org/658572
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

 eclass/python-utils-r1.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index d72329b30a..6e9cab5360 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -390,7 +390,7 @@ python_export() {
 				export PYTHON=${EPREFIX}/usr/bin/${impl}
 				if [[ " python jython pypy pypy3 " != *" ${PN} "* ]] \
 				&& [[ ! -x ${EPREFIX}/usr/bin/${impl} ]] \
-				&& has stacked-prefix ${FEATURES}; then
+				&& { has prefix-stack ${USE} || has stacked-prefix ${FEATURES} ;} ; then
 					# Need to look in build prefix
 					if [[ -x ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/usr/bin/${impl} ]]; then
 						PYTHON=${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/usr/bin/${impl}
@@ -402,7 +402,7 @@ python_export() {
 				export PYTHON_EPREFIX=${EPREFIX}
 				if [[ " python jython pypy pypy3 " != *" ${PN} "* ]] \
 				&& [[ ! -x ${EPREFIX}/usr/bin/${impl} ]] \
-				&& has stacked-prefix ${FEATURES}; then
+				&& { has prefix-stack ${USE} || has stacked-prefix ${FEATURES} ;} ; then
 					# Need to look in build prefix
 					if [[ -x ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/usr/bin/${impl} ]]; then
 						PYTHON_EPREFIX=${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}
@@ -521,7 +521,7 @@ python_export() {
 				export PYTHON_SCRIPTDIR=${EPREFIX}/usr/lib/python-exec/${impl}
 				if [[ " python jython pypy pypy3 " != *" ${PN} "* ]] \
 				&& [[ ! -x ${EPREFIX}/usr/bin/${impl} ]] \
-				&& has stacked-prefix ${FEATURES}; then
+				&& { has prefix-stack ${USE} || has stacked-prefix ${FEATURES} ;} ; then
 					# Need to look in build prefix
 					if [[ -x ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/usr/bin/${impl} ]]; then
 						PYTHON_SCRIPTDIR=${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/usr/lib/python-exec/${impl}