1 |
commit: 2d437d18df9f8de6198b78099846f53df3f7241a |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 24 00:23:26 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 24 00:55:27 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d437d18 |
7 |
|
8 |
www-client/firefox: don't install llvm-symbolizer |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
www-client/firefox/firefox-60.2.1.ebuild | 4 ++++ |
13 |
www-client/firefox/firefox-62.0.2.ebuild | 4 ++++ |
14 |
2 files changed, 8 insertions(+) |
15 |
|
16 |
diff --git a/www-client/firefox/firefox-60.2.1.ebuild b/www-client/firefox/firefox-60.2.1.ebuild |
17 |
index 2d2e154e846..82115473965 100644 |
18 |
--- a/www-client/firefox/firefox-60.2.1.ebuild |
19 |
+++ b/www-client/firefox/firefox-60.2.1.ebuild |
20 |
@@ -354,6 +354,10 @@ PROFILE_EOF |
21 |
|| die |
22 |
fi |
23 |
|
24 |
+ # Don't install llvm-symbolizer from sys-devel/llvm package |
25 |
+ [[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \ |
26 |
+ rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" |
27 |
+ |
28 |
# firefox and firefox-bin are identical |
29 |
rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die |
30 |
dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin |
31 |
|
32 |
diff --git a/www-client/firefox/firefox-62.0.2.ebuild b/www-client/firefox/firefox-62.0.2.ebuild |
33 |
index 569e8d139db..81c5d44874e 100644 |
34 |
--- a/www-client/firefox/firefox-62.0.2.ebuild |
35 |
+++ b/www-client/firefox/firefox-62.0.2.ebuild |
36 |
@@ -542,6 +542,10 @@ PROFILE_EOF |
37 |
|| die |
38 |
fi |
39 |
|
40 |
+ # Don't install llvm-symbolizer from sys-devel/llvm package |
41 |
+ [[ -f "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] && \ |
42 |
+ rm "${ED%/}${MOZILLA_FIVE_HOME}/llvm-symbolizer" |
43 |
+ |
44 |
# firefox and firefox-bin are identical |
45 |
rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die |
46 |
dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin |