mozconfig-v6.60.eclass: set correct update channel for ESR versions

Closes: https://bugs.gentoo.org/677722
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass
index 083b0cd7e6136ba5f06e154bd7e5f80c19876627..b090218ac8146549f902490639a6499f2d425225 100644 (file)
--- a/eclass/mozconfig-v6.60.eclass
+++ b/eclass/mozconfig-v6.60.eclass
@@ -221,6 +221,11 @@ mozconfig_config() {
        # Must pass release in order to properly select linker
        mozconfig_annotate 'Enable by Gentoo' --enable-release
 
+       # Set correct update channel, bug 677722
+       if [[ -n "${MOZ_ESR}" ]] ; then
+               mozconfig_annotate 'set update channel to ESR' --enable-update-channel=esr
+       fi
+
        # Avoid auto-magic on linker
        if use clang ; then
                # This is upstream's default