toolchain.eclass: use versioned SLOT all the time

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 23b0fa77b3d4522f0296abcbc2fe2039099ced5f..7dade5cf192c76ea02b5616c1abd9c8e2080e144 100644 (file)
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -159,15 +159,7 @@ fi
 
 IUSE+=" ${IUSE_DEF[*]/#/+}"
 
-# Support upgrade paths here or people get pissed
-if ! tc_version_is_at_least 4.8 || is_crosscompile || use multislot || [[ ${GCC_PV} == *_alpha* ]] ; then
-       SLOT="${GCC_CONFIG_VER}"
-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
+SLOT="${GCC_CONFIG_VER}"
 
 #---->> DEPEND <<----
 

diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
index f19a385666402ce57c967e560d822c412c65b481..45542426dfa272ef192a99239f9b5c01578b1662 100644 (file)
--- a/profiles/updates/1Q-2016
+++ b/profiles/updates/1Q-2016
@@ -35,3 +35,9 @@ move dev-perl/perl-tk dev-perl/Tk
 move dev-perl/mogilefs-server dev-perl/MogileFS-Server
 move dev-perl/ogg-vorbis-header dev-perl/Ogg-Vorbis-Header
 move dev-perl/p5-Palm dev-perl/Palm
+slotmove sys-devel/gcc 4.5 4.5.4
+slotmove sys-devel/gcc 4.6 4.6.4
+slotmove sys-devel/gcc 4.7 4.7.4
+slotmove sys-devel/gcc 4.8 4.8.5
+slotmove sys-devel/gcc 4.9 4.9.3
+slotmove sys-devel/gcc 5 5.3.0

diff --git a/sys-devel/gcc/gcc-4.9.3.ebuild b/sys-devel/gcc/gcc-4.9.3.ebuild
index 85dbc89097c2411f97bcf391c2b2835c17643ff0..a66d2d6ea6a48bbd955269a644bab9ebe81bd38b 100644 (file)
--- a/sys-devel/gcc/gcc-4.9.3.ebuild
+++ b/sys-devel/gcc/gcc-4.9.3.ebuild
@@ -27,6 +27,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 RDEPEND=""
 DEPEND="${RDEPEND}
        elibc_glibc? ( >=sys-libs/glibc-2.8 )
+       !multislot? ( !<${CATEGORY}/gcc-4.9 )
        >=${CATEGORY}/binutils-2.20"
 
 if [[ ${CATEGORY} != cross-* ]] ; then

diff --git a/sys-devel/gcc/gcc-5.3.0.ebuild b/sys-devel/gcc/gcc-5.3.0.ebuild
index 4c895d40112f68a96f1aa501e0cf2c1ff851e584..5245fcced2576ed09deac0da8fb03a560df377c7 100644 (file)
--- a/sys-devel/gcc/gcc-5.3.0.ebuild
+++ b/sys-devel/gcc/gcc-5.3.0.ebuild
@@ -27,6 +27,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 RDEPEND=""
 DEPEND="${RDEPEND}
        elibc_glibc? ( >=sys-libs/glibc-2.8 )
+       !multislot? ( !<${CATEGORY}/gcc-4.9 )
        >=${CATEGORY}/binutils-2.20"
 
 if [[ ${CATEGORY} != cross-* ]] ; then