www-client/firefox: reorder LVM deps to start from best

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass
index 0cd728743e47079e4ea8a477566f925574ba1812..821e63b1e415f964581082bddf48a452e4b1bf4e 100644 (file)
--- a/eclass/mozconfig-v6.60.eclass
+++ b/eclass/mozconfig-v6.60.eclass
@@ -160,19 +160,19 @@ DEPEND="app-arch/zip
        sys-apps/findutils
        || (
                (
-                       sys-devel/clang:4
-                       !clang? ( sys-devel/llvm:4 )
+                       sys-devel/clang:8
+                       !clang? ( sys-devel/llvm:8 )
                        clang? (
-                               =sys-devel/lld-4*
-                               sys-devel/llvm:4[gold]
+                               =sys-devel/lld-8*
+                               sys-devel/llvm:8[gold]
                        )
                )
                (
-                       sys-devel/clang:5
-                       !clang? ( sys-devel/llvm:5 )
+                       sys-devel/clang:7
+                       !clang? ( sys-devel/llvm:7 )
                        clang? (
-                               =sys-devel/lld-5*
-                               sys-devel/llvm:5[gold]
+                               =sys-devel/lld-7*
+                               sys-devel/llvm:7[gold]
                        )
                )
                (
@@ -184,19 +184,19 @@ DEPEND="app-arch/zip
                        )
                )
                (
-                       sys-devel/clang:7
-                       !clang? ( sys-devel/llvm:7 )
+                       sys-devel/clang:5
+                       !clang? ( sys-devel/llvm:5 )
                        clang? (
-                               =sys-devel/lld-7*
-                               sys-devel/llvm:7[gold]
+                               =sys-devel/lld-5*
+                               sys-devel/llvm:5[gold]
                        )
                )
                (
-                       sys-devel/clang:8
-                       !clang? ( sys-devel/llvm:8 )
+                       sys-devel/clang:4
+                       !clang? ( sys-devel/llvm:4 )
                        clang? (
-                               =sys-devel/lld-8*
-                               sys-devel/llvm:8[gold]
+                               =sys-devel/lld-4*
+                               sys-devel/llvm:4[gold]
                        )
                )
        )

diff --git a/www-client/firefox/firefox-60.5.2.ebuild b/www-client/firefox/firefox-60.5.2.ebuild
index a96c670e53efe1b041c46dafc3acef51742377b2..0b8b37bfe425cc2d403619c8100783deec86df50 100644 (file)
--- a/www-client/firefox/firefox-60.5.2.ebuild
+++ b/www-client/firefox/firefox-60.5.2.ebuild
@@ -32,6 +32,8 @@ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 
 MOZCONFIG_OPTIONAL_WIFI=1
 
+LLVM_MAX_SLOT=8
+
 inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils llvm \
                mozconfig-v6.60 pax-utils xdg-utils autotools mozlinguas-v2
 

diff --git a/www-client/firefox/firefox-65.0.2.ebuild b/www-client/firefox/firefox-65.0.2.ebuild
index df3ae98aab1017c4be12bdb6d3227fff60757f6f..8c9f3333e12476ffdaeaff947c9f2efdc13d969e 100644 (file)
--- a/www-client/firefox/firefox-65.0.2.ebuild
+++ b/www-client/firefox/firefox-65.0.2.ebuild
@@ -30,6 +30,8 @@ fi
 PATCH="${PN}-65.0-patches-04"
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 
+LLVM_MAX_SLOT=8
+
 inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
                gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
                autotools mozlinguas-v2 virtualx
@@ -116,21 +118,21 @@ DEPEND="${CDEPEND}
        sys-apps/findutils
        || (
                (
-                       sys-devel/clang:4
-                       !clang? ( sys-devel/llvm:4 )
+                       sys-devel/clang:8
+                       !clang? ( sys-devel/llvm:8 )
                        clang? (
-                               =sys-devel/lld-4*
-                               sys-devel/llvm:4[gold]
-                               pgo? ( =sys-libs/compiler-rt-sanitizers-4*[profile] )
+                               =sys-devel/lld-8*
+                               sys-devel/llvm:8[gold]
+                               pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
                        )
                )
                (
-                       sys-devel/clang:5
-                       !clang? ( sys-devel/llvm:5 )
+                       sys-devel/clang:7
+                       !clang? ( sys-devel/llvm:7 )
                        clang? (
-                               =sys-devel/lld-5*
-                               sys-devel/llvm:5[gold]
-                               pgo? ( =sys-libs/compiler-rt-sanitizers-5*[profile] )
+                               =sys-devel/lld-7*
+                               sys-devel/llvm:7[gold]
+                               pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
                        )
                )
                (
@@ -143,21 +145,21 @@ DEPEND="${CDEPEND}
                        )
                )
                (
-                       sys-devel/clang:7
-                       !clang? ( sys-devel/llvm:7 )
+                       sys-devel/clang:5
+                       !clang? ( sys-devel/llvm:5 )
                        clang? (
-                               =sys-devel/lld-7*
-                               sys-devel/llvm:7[gold]
-                               pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
+                               =sys-devel/lld-5*
+                               sys-devel/llvm:5[gold]
+                               pgo? ( =sys-libs/compiler-rt-sanitizers-5*[profile] )
                        )
                )
                (
-                       sys-devel/clang:8
-                       !clang? ( sys-devel/llvm:8 )
+                       sys-devel/clang:4
+                       !clang? ( sys-devel/llvm:4 )
                        clang? (
-                               =sys-devel/lld-8*
-                               sys-devel/llvm:8[gold]
-                               pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
+                               =sys-devel/lld-4*
+                               sys-devel/llvm:4[gold]
+                               pgo? ( =sys-libs/compiler-rt-sanitizers-4*[profile] )
                        )
                )
        )