[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, eclass/, sys-devel/gcc/

[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, eclass/, sys-devel/gcc/

[Mike Frysinger]

commit:     6fd83c0c338e901db4ba47ddb87f523482fedf33
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 15:53:42 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 17:56:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd83c0c

toolchain.eclass: use versioned SLOT all the time

 eclass/toolchain.eclass        | 10 +---------
 profiles/updates/1Q-2016       |  6 ++++++
 sys-devel/gcc/gcc-4.9.3.ebuild |  1 +
 sys-devel/gcc/gcc-5.3.0.ebuild |  1 +
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 23b0fa7..7dade5c 100644
--- 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 f19a385..4554242 100644
--- 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 85dbc89..a66d2d6 100644
--- 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 4c895d4..5245fcc 100644
--- 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