Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/
Date: Wed, 01 Jul 2020 17:36:56
Message-Id: 1593625002.62a1c3080795a68efbe01127cd9479a2d16ae921.whissi@gentoo
1 commit: 62a1c3080795a68efbe01127cd9479a2d16ae921
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 1 17:17:54 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 1 17:36:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62a1c308
7
8 www-client/firefox: synchronize with thunderbird ebuild
9
10 Package-Manager: Portage-2.3.103, Repoman-2.3.23
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 www-client/firefox/firefox-68.10.0.ebuild | 21 +++++++--------------
14 1 file changed, 7 insertions(+), 14 deletions(-)
15
16 diff --git a/www-client/firefox/firefox-68.10.0.ebuild b/www-client/firefox/firefox-68.10.0.ebuild
17 index d73893c7c90..64189efee3c 100644
18 --- a/www-client/firefox/firefox-68.10.0.ebuild
19 +++ b/www-client/firefox/firefox-68.10.0.ebuild
20 @@ -10,11 +10,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
21 PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
22
23 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
24 -MOZ_LANGS=(ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
25 -en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gn gu-IN
26 -he hi-IN hr hsb hu hy-AM ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
27 -nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
28 -th tr uk ur uz vi xh zh-CN zh-TW )
29 +MOZ_LANGS=( ach af an ar ast az be bg bn br bs ca cak cs cy da de dsb
30 +el en en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu fa ff fi fr
31 +fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM ia id is it ja ka
32 +kab kk km kn ko lij lt lv mk mr ms my nb-NO nl nn-NO oc pa-IN pl pt-BR
33 +pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th tr uk ur uz vi xh
34 +zh-CN zh-TW )
35
36 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
37 MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
38 @@ -30,7 +31,7 @@ fi
39 PATCH="${PN}-68.0-patches-14"
40
41 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
42 -MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
43 +MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/${PN}-${MOZ_PV}.source.tar.xz"
44
45 if [[ "${PV}" == *_rc* ]]; then
46 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
47 @@ -179,8 +180,6 @@ DEPEND="${CDEPEND}
48
49 S="${WORKDIR}/firefox-${PV%_*}"
50
51 -QA_PRESTRIPPED="usr/lib*/${PN}/firefox"
52 -
53 BUILD_OBJ_DIR="${S}/ff"
54
55 # allow GMP_PLUGIN_LIST to be set in an eclass or
56 @@ -262,12 +261,6 @@ pkg_setup() {
57 addpredict /proc/self/oom_score_adj
58
59 llvm_pkg_setup
60 -
61 - if has ccache ${FEATURES} ; then
62 - if use clang && use pgo ; then
63 - die "Using FEATURES=ccache with USE=clang and USE=pgo is currently known to be broken (bug #718632)."
64 - fi
65 - fi
66 }
67
68 src_unpack() {