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

[Thomas Deutschmann]

commit:     b2f6f16c80ac7398451a063e0b8460d144e2be5a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 30 12:45:28 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep 30 12:45:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f6f16c

www-client/firefox: set correct update channel

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 www-client/firefox/firefox-78.3.0.ebuild | 6 +++++-
 www-client/firefox/firefox-81.0.ebuild   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/www-client/firefox/firefox-78.3.0.ebuild 
b/www-client/firefox/firefox-78.3.0.ebuild
index 3012edf2a95..a1d5ff8af43 100644
--- a/www-client/firefox/firefox-78.3.0.ebuild
+++ b/www-client/firefox/firefox-78.3.0.ebuild
@@ -601,7 +601,6 @@ src_configure() {
                --libdir="${EPREFIX}/usr/$(get_libdir)" \
                --prefix="${EPREFIX}/usr" \
                --target="${CHOST}" \
-               --update-channel=release \
                --without-ccache \
                --with-intl-api \
                --with-libclang-path="$(llvm-config --libdir)" \
@@ -614,6 +613,11 @@ src_configure() {
                --x-includes="${SYSROOT}${EPREFIX}/usr/include" \
                --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
 
+       # Set update channel
+       local update_channel=release
+       [[ ${MOZ_ESR} == 1 ]] && update_channel=esr
+       mozconfig_add_options_ac '' --update-channel=${update_channel}
+
        if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
                mozconfig_add_options_ac '' --enable-rust-simd
        fi

diff --git a/www-client/firefox/firefox-81.0.ebuild 
b/www-client/firefox/firefox-81.0.ebuild
index f298f7c35b2..c92df895d0b 100644
--- a/www-client/firefox/firefox-81.0.ebuild
+++ b/www-client/firefox/firefox-81.0.ebuild
@@ -601,7 +601,6 @@ src_configure() {
                --libdir="${EPREFIX}/usr/$(get_libdir)" \
                --prefix="${EPREFIX}/usr" \
                --target="${CHOST}" \
-               --update-channel=release \
                --without-ccache \
                --with-intl-api \
                --with-libclang-path="$(llvm-config --libdir)" \
@@ -614,6 +613,11 @@ src_configure() {
                --x-includes="${SYSROOT}${EPREFIX}/usr/include" \
                --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
 
+       # Set update channel
+       local update_channel=release
+       [[ ${MOZ_ESR} == 1 ]] && update_channel=esr
+       mozconfig_add_options_ac '' --update-channel=${update_channel}
+
        if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
                mozconfig_add_options_ac '' --enable-rust-simd
        fi