From fb1b77f73f5aa93e05df9ea7238ffe7483720915 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 7 Dec 2004 00:09:02 +0000
Subject: tweak the SLOT logic

---
 eclass/toolchain.eclass | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'eclass')

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 8f7125ce399e..408f2daa4983 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.62 2004/12/05 21:05:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.63 2004/12/07 00:09:02 vapier Exp $
 
 
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
@@ -99,9 +99,14 @@ else
 	if [ -n "${HTB_VER}" ] ; then
 		IUSE="${IUSE} boundschecking"
 	fi
-	use multislot \
-		&& SLOT="${CTARGET}-${MY_PV_FULL}" \
-		|| SLOT="${CTARGET}-${MY_PV}"
+	# Support upgrade paths here or people get pissed
+	if use multislot ; then
+		SLOT="${CTARGET}-${MY_PV_FULL}"
+	elif [[ ${CTARGET} != ${CHOST} ]] ; then
+		SLOT="${CTARGET}-${MY_PV}"
+	else
+		SLOT="${MY_PV}"
+	fi
 fi
 #----<< SLOT+IUSE logic >>----
 
-- 
cgit v1.2.3-65-gdbad