[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Frysinger]

commit:     9cfef505387b4bfce445217fd96fcd67a3f3b57d
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 00:55:01 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 00:55:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cfef505

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

 eclass/toolchain.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index b81dbb0..d0bc068 100644
--- 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 <<----