[gentoo-commits] repo/gentoo:master commit in: www-client/firefox/

[Ian Stakenvicius]

commit:     61fe4f891af6a622ebb4a3754f07ac5a54f5c629
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 16:03:08 2017 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 16:03:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61fe4f89

www-client/firefox: adjust SHELL, other var specs on calls to emake

Aligned the use of forcing various variables on calls to emake, so that they
are common across all current versions of firefox.  This should address
two bugs related to SHELL: bug 602370 and bug 600488

Package-Manager: portage-2.3.0

 www-client/firefox/firefox-45.7.0.ebuild | 7 +++----
 www-client/firefox/firefox-51.0.ebuild   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/www-client/firefox/firefox-45.7.0.ebuild 
b/www-client/firefox/firefox-45.7.0.ebuild
index 6c62d94..9ad87f2 100644
--- a/www-client/firefox/firefox-45.7.0.ebuild
+++ b/www-client/firefox/firefox-45.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -220,6 +220,7 @@ src_configure() {
        fi
 
        # workaround for funky/broken upstream configure...
+       SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
        emake -f client.mk configure
 }
 
@@ -245,11 +246,9 @@ src_compile() {
                shopt -u nullglob
                addpredict "${cards}"
 
-               CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
                MOZ_MAKE_FLAGS="${MAKEOPTS}" 
SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
                virtx emake -f client.mk profiledbuild || die "virtx emake 
failed"
        else
-               CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
                MOZ_MAKE_FLAGS="${MAKEOPTS}" 
SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
                emake -f client.mk realbuild
        fi
@@ -289,7 +288,7 @@ src_install() {
                        || die
        done
 
-       MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+       MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
        emake DESTDIR="${D}" install
 
        # Install language packs

diff --git a/www-client/firefox/firefox-51.0.ebuild 
b/www-client/firefox/firefox-51.0.ebuild
index 03a20ee..f1f2b1c 100644
--- a/www-client/firefox/firefox-51.0.ebuild
+++ b/www-client/firefox/firefox-51.0.ebuild
@@ -306,7 +306,7 @@ src_install() {
                        || die
        done
 
-       MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+       MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
        emake DESTDIR="${D}" install
 
        # Install language packs