From 82b1dd690e50e572a2e55726d888f384e3c12ab7 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 26 May 2006 03:46:03 +0000
Subject: revert r1.275 for #130772 as it causes more problems that it solves

---
 eclass/toolchain.eclass | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'eclass')

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index d3771a7cae41..54ef7469aa59 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.282 2006/05/23 05:47:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.283 2006/05/26 03:46:03 vapier Exp $
 
 HOMEPAGE="http://gcc.gnu.org/"
 LICENSE="GPL-2 LGPL-2.1"
@@ -896,16 +896,6 @@ gcc-compiler_pkg_postrm() {
 		return 0
 	fi
 
-	# If user is *uninstalling* the active version, we need to switch to
-	# a different version for them #130772
-	if [[ ! -e ${ROOT}/etc/env.d/${CTARGET}-${GCC_CONFIG_VER} ]] ; then
-		if has_version 'app-admin/eselect-compiler' ; then
-			do_eselect_compiler
-		else
-			do_gcc_config
-		fi
-	fi
-
 	# ROOT isnt handled by the script
 	[[ ${ROOT} != "/" ]] && return 0
 
@@ -2055,12 +2045,7 @@ do_gcc_config() {
 		use_specs=""
 	fi
 
-	current_gcc_config="${CTARGET}-${GCC_CONFIG_VER}${use_specs}"
-	if [[ ! -e ${ROOT}/etc/env.d/gcc/${current_gcc_config} ]] ; then
-		# hrm let's try and pick something better
-		current_gcc_config=$(env -i gcc-config -l | grep ${CTARGET} | awk '{print $NF}' | head -n 1)
-	fi
-	gcc-config ${current_gcc_config}
+	gcc-config ${CTARGET}-${GCC_CONFIG_VER}${use_specs}
 }
 
 should_we_eselect_compiler() {
-- 
cgit v1.2.3-65-gdbad