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

[Thomas Deutschmann]

commit:     22aa1d20b8c219facc5c051c4791b4b7b15b9ded
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 10 16:44:37 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 10 16:45:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22aa1d20

www-client/firefox: allow CLANG/LLVM slot 10

Package-Manager: Portage-2.3.91, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 www-client/firefox/firefox-68.6.0.ebuild | 20 ++++++++++----------
 www-client/firefox/firefox-74.0.ebuild   | 11 ++++++++++-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/www-client/firefox/firefox-68.6.0.ebuild 
b/www-client/firefox/firefox-68.6.0.ebuild
index 55cb0402f54..3b50e731772 100644
--- a/www-client/firefox/firefox-68.6.0.ebuild
+++ b/www-client/firefox/firefox-68.6.0.ebuild
@@ -38,7 +38,7 @@ if [[ "${PV}" == *_rc* ]]; then
        MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> 
$P.tar.xz"
 fi
 
-LLVM_MAX_SLOT=9
+LLVM_MAX_SLOT=10
 
 inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
                gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
@@ -130,6 +130,15 @@ DEPEND="${CDEPEND}
        >=sys-devel/binutils-2.30
        sys-apps/findutils
        || (
+               (
+                       sys-devel/clang:10
+                       !clang? ( sys-devel/llvm:10 )
+                       clang? (
+                               =sys-devel/lld-10*
+                               sys-devel/llvm:10[gold]
+                               pgo? ( 
=sys-libs/compiler-rt-sanitizers-10*[profile] )
+                       )
+               )
                (
                        sys-devel/clang:9
                        !clang? ( sys-devel/llvm:9 )
@@ -157,15 +166,6 @@ DEPEND="${CDEPEND}
                                pgo? ( 
=sys-libs/compiler-rt-sanitizers-7*[profile] )
                        )
                )
-               (
-                       sys-devel/clang:6
-                       !clang? ( sys-devel/llvm:6 )
-                       clang? (
-                               =sys-devel/lld-6*
-                               sys-devel/llvm:6[gold]
-                               pgo? ( 
=sys-libs/compiler-rt-sanitizers-6*[profile] )
-                       )
-               )
        )
        pulseaudio? ( media-sound/pulseaudio )
        >=virtual/rust-1.34.0

diff --git a/www-client/firefox/firefox-74.0.ebuild 
b/www-client/firefox/firefox-74.0.ebuild
index 3f9a0983c94..30bb87c2dd0 100644
--- a/www-client/firefox/firefox-74.0.ebuild
+++ b/www-client/firefox/firefox-74.0.ebuild
@@ -38,7 +38,7 @@ if [[ "${PV}" == *_rc* ]]; then
        MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> 
$P.tar.xz"
 fi
 
-LLVM_MAX_SLOT=9
+LLVM_MAX_SLOT=10
 
 inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
                gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
@@ -131,6 +131,15 @@ DEPEND="${CDEPEND}
        >=sys-devel/binutils-2.30
        sys-apps/findutils
        || (
+               (
+                       sys-devel/clang:10
+                       !clang? ( sys-devel/llvm:10 )
+                       clang? (
+                               =sys-devel/lld-10*
+                               sys-devel/llvm:10[gold]
+                               pgo? ( 
=sys-libs/compiler-rt-sanitizers-10*[profile] )
+                       )
+               )
                (
                        sys-devel/clang:9
                        !clang? ( sys-devel/llvm:9 )