toolchain.eclass: change SLOT to major version for gcc-5+ #555164

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index b81dbb004cd517375b47497f8174f4f8cb05ded3..d0bc068df3448e3b526ba1c50ea992018f4753ad 100644 (file)
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -160,8 +160,11 @@ IUSE+=" ${IUSE_DEF[*]/#/+}"
 # Support upgrade paths here or people get pissed
 if ! tc_version_is_at_least 4.7 || is_crosscompile || use multislot || [[ ${GCC_PV} == *_alpha* ]] ; then
        SLOT="${GCC_CONFIG_VER}"
-else
+elif ! tc_version_is_at_least 5.0 ; then
        SLOT="${GCC_BRANCH_VER}"
+else
+       # Upstream changed versioning w/gcc-5+, so SLOT matches major only. #555164
+       SLOT="${GCCMAJOR}"
 fi
 
 #---->> DEPEND <<----