Only tell users to source /etc/profile when they really need to source it.

(Portage version: 2.1_rc3-r5)

2 files changed, 23 insertions, 5 deletions

diff --git a/app-admin/eselect-compiler/ChangeLog b/app-admin/eselect-compiler/ChangeLog
index 1a71021bb221..bcca634c23bb 100644
--- a/app-admin/eselect-compiler/ChangeLog
+++ b/app-admin/eselect-compiler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/eselect-compiler
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/ChangeLog,v 1.17 2006/06/01 09:41:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/ChangeLog,v 1.18 2006/06/02 18:08:01 eradicator Exp $
+
+  02 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  eselect-compiler-2.0.0_rc1-r4.ebuild:
+  Only tell users to source /etc/profile when they really need to source it.
 
 *eselect-compiler-2.0.0_rc1-r4 (01 Jun 2006)
 
diff --git a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r4.ebuild b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r4.ebuild
index 31c2fe3e1d40..1a0a4df290b0 100644
--- a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r4.ebuild
+++ b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r4.ebuild
@@ -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/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r4.ebuild,v 1.1 2006/06/01 09:41:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r4.ebuild,v 1.2 2006/06/02 18:08:01 eradicator Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -45,8 +45,8 @@ pkg_postinst() {
 	if [[ ! -f "${ROOT}/etc/eselect/compiler/selection.conf" ]] ; then
 		ewarn "This looks like the first time you are installing eselect-compiler.  We are"
 		ewarn "activating toolchain profiles for the CTARGETs needed by your portage"
-		ewarn "profile You should have profiles installed from compilers that you emerged"
-		ewarn "after October, 2005. If a compiler you have installed is missing an"
+		ewarn "profile.  You should have profiles installed from compilers that you emerged"
+		ewarn "after October, 2005.  If a compiler you have installed is missing an"
 		ewarn "eselect-compiler profile, you can either re-emerge the compiler, create the"
 		ewarn "profile yourself, or you can migrate profiles from gcc-config-1.x by doing:"
 		ewarn "# eselect compiler migrate"
@@ -110,9 +110,23 @@ pkg_postinst() {
 		eselect compiler update
 	fi
 
-	if rm -f ${ROOT}/etc/env.d/05gcc* &> /dev/null ; then
+	local file
+	local resource_profile=0
+	for file in ${ROOT}/etc/env.d/05gcc* ; do
+		if [[ -f ${file} ]] ; then
+			ewarn "Removing env.d entry which was used by gcc-config:"
+			ewarn "    ${file}"
+
+			rm -f ${file}
+
+			resource_profile=1
+		fi
+	done
+
+	if [[ ${resource_profile} == 1 ]] ; then
 		echo
 		ewarn "You should source /etc/profile in your open shells."
+
 	fi
 }