| 1 |
commit: 22aa1d20b8c219facc5c051c4791b4b7b15b9ded |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 10 16:44:37 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 10 16:45:27 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22aa1d20 |
| 7 |
|
| 8 |
www-client/firefox: allow CLANG/LLVM slot 10 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.91, Repoman-2.3.20 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
www-client/firefox/firefox-68.6.0.ebuild | 20 ++++++++++---------- |
| 14 |
www-client/firefox/firefox-74.0.ebuild | 11 ++++++++++- |
| 15 |
2 files changed, 20 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-client/firefox/firefox-68.6.0.ebuild b/www-client/firefox/firefox-68.6.0.ebuild |
| 18 |
index 55cb0402f54..3b50e731772 100644 |
| 19 |
--- a/www-client/firefox/firefox-68.6.0.ebuild |
| 20 |
+++ b/www-client/firefox/firefox-68.6.0.ebuild |
| 21 |
@@ -38,7 +38,7 @@ if [[ "${PV}" == *_rc* ]]; then |
| 22 |
MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz" |
| 23 |
fi |
| 24 |
|
| 25 |
-LLVM_MAX_SLOT=9 |
| 26 |
+LLVM_MAX_SLOT=10 |
| 27 |
|
| 28 |
inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \ |
| 29 |
gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \ |
| 30 |
@@ -130,6 +130,15 @@ DEPEND="${CDEPEND} |
| 31 |
>=sys-devel/binutils-2.30 |
| 32 |
sys-apps/findutils |
| 33 |
|| ( |
| 34 |
+ ( |
| 35 |
+ sys-devel/clang:10 |
| 36 |
+ !clang? ( sys-devel/llvm:10 ) |
| 37 |
+ clang? ( |
| 38 |
+ =sys-devel/lld-10* |
| 39 |
+ sys-devel/llvm:10[gold] |
| 40 |
+ pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) |
| 41 |
+ ) |
| 42 |
+ ) |
| 43 |
( |
| 44 |
sys-devel/clang:9 |
| 45 |
!clang? ( sys-devel/llvm:9 ) |
| 46 |
@@ -157,15 +166,6 @@ DEPEND="${CDEPEND} |
| 47 |
pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) |
| 48 |
) |
| 49 |
) |
| 50 |
- ( |
| 51 |
- sys-devel/clang:6 |
| 52 |
- !clang? ( sys-devel/llvm:6 ) |
| 53 |
- clang? ( |
| 54 |
- =sys-devel/lld-6* |
| 55 |
- sys-devel/llvm:6[gold] |
| 56 |
- pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) |
| 57 |
- ) |
| 58 |
- ) |
| 59 |
) |
| 60 |
pulseaudio? ( media-sound/pulseaudio ) |
| 61 |
>=virtual/rust-1.34.0 |
| 62 |
|
| 63 |
diff --git a/www-client/firefox/firefox-74.0.ebuild b/www-client/firefox/firefox-74.0.ebuild |
| 64 |
index 3f9a0983c94..30bb87c2dd0 100644 |
| 65 |
--- a/www-client/firefox/firefox-74.0.ebuild |
| 66 |
+++ b/www-client/firefox/firefox-74.0.ebuild |
| 67 |
@@ -38,7 +38,7 @@ if [[ "${PV}" == *_rc* ]]; then |
| 68 |
MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz" |
| 69 |
fi |
| 70 |
|
| 71 |
-LLVM_MAX_SLOT=9 |
| 72 |
+LLVM_MAX_SLOT=10 |
| 73 |
|
| 74 |
inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \ |
| 75 |
gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \ |
| 76 |
@@ -131,6 +131,15 @@ DEPEND="${CDEPEND} |
| 77 |
>=sys-devel/binutils-2.30 |
| 78 |
sys-apps/findutils |
| 79 |
|| ( |
| 80 |
+ ( |
| 81 |
+ sys-devel/clang:10 |
| 82 |
+ !clang? ( sys-devel/llvm:10 ) |
| 83 |
+ clang? ( |
| 84 |
+ =sys-devel/lld-10* |
| 85 |
+ sys-devel/llvm:10[gold] |
| 86 |
+ pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) |
| 87 |
+ ) |
| 88 |
+ ) |
| 89 |
( |
| 90 |
sys-devel/clang:9 |
| 91 |
!clang? ( sys-devel/llvm:9 ) |
Archives