From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1BD65138359 for ; Wed, 30 Sep 2020 12:45:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B2BFE01E4; Wed, 30 Sep 2020 12:45:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2DBA7E01E4 for ; Wed, 30 Sep 2020 12:45:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9726033BE5A for ; Wed, 30 Sep 2020 12:45:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22FBB385 for ; Wed, 30 Sep 2020 12:45:45 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1601469940.b2f6f16c80ac7398451a063e0b8460d144e2be5a.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox/firefox-78.3.0.ebuild www-client/firefox/firefox-81.0.ebuild X-VCS-Directories: www-client/firefox/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: b2f6f16c80ac7398451a063e0b8460d144e2be5a X-VCS-Branch: master Date: Wed, 30 Sep 2020 12:45:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f3345019-afd1-4059-8f02-8746eca07dbb X-Archives-Hash: ad21f88c7fa6493860f4668cc3457d62 commit: b2f6f16c80ac7398451a063e0b8460d144e2be5a Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Sep 30 12:45:28 2020 +0000 Commit: Thomas Deutschmann gentoo 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 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