From cf2360b0c6a7949f33ae0eb11b5c81f2d87d9823 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Tue, 10 Feb 2015 07:22:00 +0000 Subject: [PATCH] Revert unreviewed commit which breaks the tree --- eclass/ChangeLog | 5 ++++- eclass/toolchain.eclass | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index a1473d1c0e9f..ae8ddc368b7f 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1526 2015/02/10 00:46:32 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1527 2015/02/10 07:22:00 jlec Exp $ + + 10 Feb 2015; Justin Lecher toolchain.eclass: + Revert unreviewed commit which breaks the tree 10 Feb 2015; Anthony G. Basile toolchain.eclass: Remove halcy0n from the gentoo_urls for toolchain.eclass, per his diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 6b4aa4519937..d34fff93032f 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.652 2015/02/10 00:46:32 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.653 2015/02/10 07:22:00 jlec Exp $ # Maintainer: Toolchain Ninjas @@ -155,7 +155,7 @@ fi IUSE+=" ${IUSE_DEF[*]}" # Support upgrade paths here or people get pissed -if ! tc_version_is_at_least 4.6 || is_crosscompile || use multislot ; then +if use multislot ; then SLOT="${GCC_CONFIG_VER}" else SLOT="${GCC_BRANCH_VER}" -- 2.26.2