Revert unreviewed commit which breaks the tree

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index a1473d1c0e9f6b68c998cd1c51df51ec94d97230..ae8ddc368b7f454c9ecdb75ef4a33b5237e0d373 100644 (file)
--- 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 <jlec@gentoo.org> toolchain.eclass:
+  Revert unreviewed commit which breaks the tree
 
   10 Feb 2015; Anthony G. Basile <blueness@gentoo.org> toolchain.eclass:
   Remove halcy0n from the gentoo_urls for toolchain.eclass, per his

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 6b4aa4519937f4452a67d7ae19c438f52ec305e6..d34fff93032f66c42fd32ed8582437784a95cf52 100644 (file)
--- 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 <toolchain@gentoo.org>
 
@@ -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}"