From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 89ED1138334 for ; Tue, 3 Jul 2018 08:52:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C349E08EC; Tue, 3 Jul 2018 08:52:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 12AA5E08EC for ; Tue, 3 Jul 2018 08:52:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7AC0335CB2 for ; Tue, 3 Jul 2018 08:52:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1EE4C347 for ; Tue, 3 Jul 2018 08:52:47 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1530607741.96b0650dfe6ec38d1c02541d20b0adaf492032d9.haubi@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: eclass/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: eclass/python-utils-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: 96b0650dfe6ec38d1c02541d20b0adaf492032d9 X-VCS-Branch: master Date: Tue, 3 Jul 2018 08:52:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 89e2fb8b-dec4-4e23-b94d-f0541acc1435 X-Archives-Hash: ca557c82c2f544c5036f6e141a0f087e commit: 96b0650dfe6ec38d1c02541d20b0adaf492032d9 Author: Michael Haubenwallner gentoo org> AuthorDate: Tue Jul 3 08:49:01 2018 +0000 Commit: Michael Haubenwallner gentoo org> CommitDate: Tue Jul 3 08:49:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=96b0650d python-utils-r1.eclass: switch to stacked-prefix feature USE=prefix-chain now is FEATURES=stacked-prefix Bug: https://bugs.gentoo.org/658572 eclass/python-utils-r1.eclass | 54 +++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index ed84c2680c..6a70453cbe 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -388,36 +388,24 @@ python_export() { PYTHON) export PYTHON=${EPREFIX}/usr/bin/${impl} if [[ " python jython pypy pypy3 " != *" ${PN} "* ]] \ - && [[ ! -x ${PYTHON} ]] \ - && use prefix-chain; then - # Need to search in parent prefixes - local parent - local parents=() - IFS=: eval 'parents=(${PORTAGE_READONLY_EPREFIXES})' - for parent in "${parents[@]}"; do - if [[ -x ${parent}/usr/bin/${impl} ]]; then - PYTHON=${parent}/usr/bin/${impl} - break - fi - done + && [[ ! -x ${EPREFIX}/usr/bin/${impl} ]] \ + && 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} + fi fi debug-print "${FUNCNAME}: PYTHON = ${PYTHON}" ;; PYTHON_EPREFIX) export PYTHON_EPREFIX=${EPREFIX} if [[ " python jython pypy pypy3 " != *" ${PN} "* ]] \ - && [[ ! -x ${PYTHON_EPREFIX}/usr/bin/${impl} ]] \ - && use prefix-chain; then - # Need to search in parent prefixes - local parent - local parents=() - IFS=: eval 'parents=(${PORTAGE_READONLY_EPREFIXES})' - for parent in "${parents[@]}"; do - if [[ -x ${parent}/usr/bin/${impl} ]]; then - PYTHON_EPREFIX=${parent} - break - fi - done + && [[ ! -x ${EPREFIX}/usr/bin/${impl} ]] \ + && 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}} + fi fi debug-print "${FUNCNAME}: PYTHON_EPREFIX = ${PYTHON_EPREFIX}" ;; @@ -531,18 +519,12 @@ python_export() { local dir export PYTHON_SCRIPTDIR=${EPREFIX}/usr/lib/python-exec/${impl} if [[ " python jython pypy pypy3 " != *" ${PN} "* ]] \ - && [[ ! -d ${PYTHON_SCRIPTDIR} ]] \ - && use prefix-chain; then - # Need to search in parent prefixes - local parent - local parents=() - IFS=: eval 'parents=(${PORTAGE_READONLY_EPREFIXES})' - for parent in "${parents[@]}"; do - if [[ -e ${parent}/usr/lib/python-exec/${impl} ]]; then - PYTHON_SCRIPTDIR=${parent}/usr/lib/python-exec/${impl} - break - fi - done + && [[ ! -x ${EPREFIX}/usr/bin/${impl} ]] \ + && 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} + fi fi debug-print "${FUNCNAME}: PYTHON_SCRIPTDIR = ${PYTHON_SCRIPTDIR}" ;;