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

[Thomas Deutschmann]

commit:     42e6aaded036981aa5d3145e23d01a47d8400a9e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 17:10:30 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> 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 <whissi <AT> 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