remove bash3ism and delete env.d files when uninstalling

(Portage version: 2.0.51-r12)

1 files changed, 22 insertions, 22 deletions

diff --git a/sys-devel/binutils-config/files/binutils-config-1.7 b/sys-devel/binutils-config/files/binutils-config-1.7
index 9f3ef2cdf340..d0e8d6c329f6 100755
--- a/sys-devel/binutils-config/files/binutils-config-1.7
+++ b/sys-devel/binutils-config/files/binutils-config-1.7
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.7,v 1.1 2005/01/14 03:28:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.7,v 1.2 2005/01/15 00:54:05 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -16,26 +16,24 @@ source /etc/init.d/functions.sh || {
 umask 022
 
 usage() {
-	cat <<-USAGE_END
-	${HILITE}binutils-config${NORMAL}:
-	  Change the current binutils profile or give info about profiles.
-
-	Usage: ${HILITE}binutils-config${NORMAL} ${GOOD}[options]${NORMAL} ${BRACKET}[binutils profile]${NORMAL}
-	
-	${HILITE}General Options:${NORMAL}
-	  ${GOOD}-c, --get-current-profile${NORMAL}  Print current profile
-	  ${GOOD}-l, --list-profiles${NORMAL}        Print a list of available profiles
-	  ${GOOD}-u, --uninstall${NORMAL}            Remove all signs of specified target
-	
-	${HILITE}Specific Cruft:${NORMAL}
-	  ${GOOD}--x86${NORMAL}                      Install extra x86 links (i[3-6]86)
-	  ${GOOD}--amd64${NORMAL}                    Install extra amd64 links (x86_64)
-	
-	Profile names are of the form:  ${BRACKET}<CTARGET>-<binutils version>${NORMAL}
-	For example:                    ${BRACKET}i686-pc-linux-gnu-2.15.92.0.2${NORMAL}
-	
-	For more info, please see ${HILITE}binutils-config${NORMAL}(8).
-	USAGE_END
+cat << USAGE_END
+
+Usage: ${HILITE}binutils-config${NORMAL} ${GOOD}[options]${NORMAL} ${BRACKET}[binutils profile]${NORMAL}
+
+${HILITE}General Options:${NORMAL}
+  ${GOOD}-c, --get-current-profile${NORMAL}  Print current profile
+  ${GOOD}-l, --list-profiles${NORMAL}        Print a list of available profiles
+  ${GOOD}-u, --uninstall${NORMAL}            Remove all signs of specified target
+
+${HILITE}Specific Cruft:${NORMAL}
+  ${GOOD}--x86${NORMAL}                      Install extra x86 links (i[3-6]86)
+  ${GOOD}--amd64${NORMAL}                    Install extra amd64 links (x86_64)
+
+Profile names are of the form:  ${BRACKET}<CTARGET>-<binutils version>${NORMAL}
+For example:                    ${BRACKET}i686-pc-linux-gnu-2.15.92.0.2${NORMAL}
+
+For more info, please see ${HILITE}binutils-config${NORMAL}(8).
+USAGE_END
 }
 
 switch_profile() {
@@ -188,6 +186,8 @@ uninstall_target() {
 		rm -f "${ROOT}"/usr/${TARGET}/include/${x}
 	done
 	rm -f "${ROOT}"/usr/${TARGET}/lib/ldscripts
+
+	rm -f "${ENV_D}"/${TARGET}-*
 }
 
 get_current_profile() {
@@ -271,7 +271,7 @@ while [[ $# -gt 0 ]] ; do
 			exit 0
 			;;
 		-v|--version)
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.7,v 1.1 2005/01/14 03:28:15 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.7,v 1.2 2005/01/15 00:54:05 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			echo "binutils-config-${cvsver%%,v *}"
 			exit 0