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: Mon, 02 Dec 2019 18:55:57
Message-Id: 1575312942.d2c5a3099cccc05a7e25c396b768d9bd1057b423.whissi@gentoo
1 commit: d2c5a3099cccc05a7e25c396b768d9bd1057b423
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 2 18:55:27 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 2 18:55:42 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c5a309
7
8 www-client/firefox: dropping -j1 workaround
9
10 Closes: https://bugs.gentoo.org/687028
11 Package-Manager: Portage-2.3.80, Repoman-2.3.19
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 www-client/firefox/firefox-68.3.0.ebuild | 8 +-------
15 www-client/firefox/firefox-71.0.ebuild | 8 +-------
16 2 files changed, 2 insertions(+), 14 deletions(-)
17
18 diff --git a/www-client/firefox/firefox-68.3.0.ebuild b/www-client/firefox/firefox-68.3.0.ebuild
19 index 3ee70a3ec92..8c9aed8335d 100644
20 --- a/www-client/firefox/firefox-68.3.0.ebuild
21 +++ b/www-client/firefox/firefox-68.3.0.ebuild
22 @@ -42,7 +42,7 @@ LLVM_MAX_SLOT=9
23
24 inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
25 gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
26 - autotools mozlinguas-v2 virtualx multiprocessing
27 + autotools mozlinguas-v2 virtualx
28
29 DESCRIPTION="Firefox Web Browser"
30 HOMEPAGE="https://www.mozilla.com/firefox"
31 @@ -271,12 +271,6 @@ src_prepare() {
32 # Allow user to apply any additional patches without modifing ebuild
33 eapply_user
34
35 - local n_jobs=$(makeopts_jobs)
36 - if [[ ${n_jobs} == 1 ]]; then
37 - einfo "Building with MAKEOPTS=-j1 is known to fail (bug #687028); Forcing MAKEOPTS=-j2 ..."
38 - export MAKEOPTS=-j2
39 - fi
40 -
41 # Enable gnomebreakpad
42 if use debug ; then
43 sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
44
45 diff --git a/www-client/firefox/firefox-71.0.ebuild b/www-client/firefox/firefox-71.0.ebuild
46 index 2abc5742b83..21f0e548118 100644
47 --- a/www-client/firefox/firefox-71.0.ebuild
48 +++ b/www-client/firefox/firefox-71.0.ebuild
49 @@ -42,7 +42,7 @@ LLVM_MAX_SLOT=9
50
51 inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
52 gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
53 - autotools mozlinguas-v2 virtualx multiprocessing eapi7-ver
54 + autotools mozlinguas-v2 virtualx eapi7-ver
55
56 DESCRIPTION="Firefox Web Browser"
57 HOMEPAGE="https://www.mozilla.com/firefox"
58 @@ -270,12 +270,6 @@ src_prepare() {
59 # Allow user to apply any additional patches without modifing ebuild
60 eapply_user
61
62 - local n_jobs=$(makeopts_jobs)
63 - if [[ ${n_jobs} == 1 ]]; then
64 - einfo "Building with MAKEOPTS=-j1 is known to fail (bug #687028); Forcing MAKEOPTS=-j2 ..."
65 - export MAKEOPTS=-j2
66 - fi
67 -
68 # Enable gnomebreakpad
69 if use debug ; then
70 sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \