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 6ADD5138359 for ; Wed, 21 Oct 2020 17:11:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CB15E098E; Wed, 21 Oct 2020 17:11:33 +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 74DE4E098E for ; Wed, 21 Oct 2020 17:11:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9AB46340CF1 for ; Wed, 21 Oct 2020 17:11:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 904353B5 for ; Wed, 21 Oct 2020 17:11:29 +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: <1603300272.42e6aaded036981aa5d3145e23d01a47d8400a9e.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/firefox-bin/firefox-bin-78.4.0.ebuild www-client/firefox-bin/firefox-bin-82.0.ebuild X-VCS-Directories: www-client/firefox-bin/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 42e6aaded036981aa5d3145e23d01a47d8400a9e X-VCS-Branch: master Date: Wed, 21 Oct 2020 17:11:29 +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: ab4757b4-d4d8-45b5-a4b9-b3b438d99dda X-Archives-Hash: c3603c954f6051a68b0ca66a9bb200ca commit: 42e6aaded036981aa5d3145e23d01a47d8400a9e Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Oct 21 17:10:30 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Oct 21 17:11:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42e6aade www-client/firefox-bin: synchronize with mail-client/thunderbird-bin Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann gentoo.org> www-client/firefox-bin/firefox-bin-78.4.0.ebuild | 18 +++++++++++++----- www-client/firefox-bin/firefox-bin-82.0.ebuild | 18 +++++++++++++----- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/www-client/firefox-bin/firefox-bin-78.4.0.ebuild b/www-client/firefox-bin/firefox-bin-78.4.0.ebuild index 2c98494ac15..739c0027fac 100644 --- a/www-client/firefox-bin/firefox-bin-78.4.0.ebuild +++ b/www-client/firefox-bin/firefox-bin-78.4.0.ebuild @@ -5,10 +5,16 @@ EAPI=7 MOZ_ESR=yes -# Convert the ebuild version to the upstream mozilla version, used by mozlinguas -MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI -MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI -MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI +MOZ_PV=${PV} +MOZ_PV_SUFFIX= +if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then + MOZ_PV_SUFFIX=${BASH_REMATCH[1]} + + # Convert the ebuild version to the upstream Mozilla version + MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI + MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI + MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI +fi if [[ -n ${MOZ_ESR} ]] ; then # ESR releases have slightly different version numbers @@ -17,6 +23,8 @@ fi MOZ_PN="${PN%-bin}" MOZ_P="${MOZ_PN}-${MOZ_PV}" +MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}" +MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}" inherit desktop pax-utils xdg @@ -114,7 +122,7 @@ mozilla_set_globals() { fi SRC_URI+=" l10n_${xflag/[_@]/-}? (" - SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P}-${lang}.xpi" + SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi" SRC_URI+=" )" IUSE+=" l10n_${xflag/[_@]/-}" done diff --git a/www-client/firefox-bin/firefox-bin-82.0.ebuild b/www-client/firefox-bin/firefox-bin-82.0.ebuild index 55910de3e93..062d39d12df 100644 --- a/www-client/firefox-bin/firefox-bin-82.0.ebuild +++ b/www-client/firefox-bin/firefox-bin-82.0.ebuild @@ -5,10 +5,16 @@ EAPI=7 MOZ_ESR= -# Convert the ebuild version to the upstream mozilla version, used by mozlinguas -MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI -MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI -MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI +MOZ_PV=${PV} +MOZ_PV_SUFFIX= +if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then + MOZ_PV_SUFFIX=${BASH_REMATCH[1]} + + # Convert the ebuild version to the upstream Mozilla version + MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI + MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI + MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI +fi if [[ -n ${MOZ_ESR} ]] ; then # ESR releases have slightly different version numbers @@ -17,6 +23,8 @@ fi MOZ_PN="${PN%-bin}" MOZ_P="${MOZ_PN}-${MOZ_PV}" +MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}" +MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}" inherit desktop pax-utils xdg @@ -114,7 +122,7 @@ mozilla_set_globals() { fi SRC_URI+=" l10n_${xflag/[_@]/-}? (" - SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P}-${lang}.xpi" + SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi" SRC_URI+=" )" IUSE+=" l10n_${xflag/[_@]/-}" done