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

diff --git a/www-client/firefox/firefox-45.7.0.ebuild b/www-client/firefox/firefox-45.7.0.ebuild
index 6c62d9490f974437e753f0104dc57245d0dd8b1a..9ad87f2c1058392208692fd6a2d9ab2f3c402531 100644 (file)
--- 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 03a20ee9a5b53fe29a8e06e56e48518f7a47fe2f..f1f2b1c9674f079a2492f01fd89704133725b191 100644 (file)
--- 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