commit:     7d211604cc83b15d4aed3dc0f04edc6c3201c86f
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  8 22:24:36 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jun  8 22:24:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d211604

sys-libs/ncurses: Fix broken use of ROOT=/ has_version under EAPI 7

Pass -b instead as changing ROOT confuses Portage to the point where
this breaks when building for a ROOTed cross-prefix environment.

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 sys-libs/ncurses/ncurses-6.1_p20181020.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild 
b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
index c96c376e5c8..ba84afddf04 100644
--- a/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1_p20181020.ebuild
@@ -70,7 +70,7 @@ src_configure() {
        # This comes up when cross-compiling, doing multilib builds, upgrading,
        # or installing for the first time.  Build a local copy of tic whenever
        # the host version isn't available. #249363 #557598
-       if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+       if ! has_version -b "~sys-libs/${P}:0" ; then
                local lbuildflags="-static"
 
                # some toolchains don't quite support static linking
@@ -192,7 +192,7 @@ do_configure() {
 
 src_compile() {
        # See comments in src_configure.
-       if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+       if ! has_version -b "~sys-libs/${P}:0" ; then
                BUILD_DIR="${WORKDIR}" \
                do_compile cross -C progs tic
        fi

Reply via email to