diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-03-12 10:53:42 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-03-15 13:56:38 -0400 |
| commit | 6fd83c0c338e901db4ba47ddb87f523482fedf33 (patch) | |
| tree | ce44e669bac2ea58fcafb9ba94e423a4b540aa4e | |
| parent | dev-perl/Canary-Stability: x86 stable wrt bug #576110 (diff) | |
| download | gentoo-6fd83c0c338e901db4ba47ddb87f523482fedf33.tar.gz gentoo-6fd83c0c338e901db4ba47ddb87f523482fedf33.tar.bz2 gentoo-6fd83c0c338e901db4ba47ddb87f523482fedf33.zip | |
toolchain.eclass: use versioned SLOT all the time
| -rw-r--r-- | eclass/toolchain.eclass | 10 | ||||
| -rw-r--r-- | profiles/updates/1Q-2016 | 6 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-4.9.3.ebuild | 1 | ||||
| -rw-r--r-- | 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 23b0fa77b3d4..7dade5cf192c 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 f19a38566640..45542426dfa2 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 85dbc89097c2..a66d2d6ea6a4 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 4c895d40112f..5245fcced257 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 |