when we uninstall, delete the libs left behind in /usr/$HOST/$TARGET/lib

(Portage version: 2.0.51.22-r1)

3 files changed, 8 insertions, 3 deletions

diff --git a/sys-devel/binutils-config/binutils-config-1.8-r3.ebuild b/sys-devel/binutils-config/binutils-config-1.8-r4.ebuild
index 859b410a5b04..3c04e26535a9 100644
--- a/sys-devel/binutils-config/binutils-config-1.8-r3.ebuild
+++ b/sys-devel/binutils-config/binutils-config-1.8-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-1.8-r3.ebuild,v 1.1 2005/06/13 04:51:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/binutils-config-1.8-r4.ebuild,v 1.1 2005/06/24 21:55:28 vapier Exp $
 
 DESCRIPTION="Utility to change the binutils version being used"
 HOMEPAGE="http://www.gentoo.org/"
diff --git a/sys-devel/binutils-config/files/binutils-config-1.8 b/sys-devel/binutils-config/files/binutils-config-1.8
index 258ce417e2c6..f2bd18a9665a 100755
--- a/sys-devel/binutils-config/files/binutils-config-1.8
+++ b/sys-devel/binutils-config/files/binutils-config-1.8
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 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.8,v 1.3 2005/06/13 04:51:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.4 2005/06/24 21:55:28 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -181,6 +181,7 @@ uninstall_target() {
 
 	rm -f "${ENV_D}"/config-${TARGET}
 
+	# XXX: we still leave behind FAKE_TARGETS in /usr/bin ...
 	for x in addr2line ar as c++filt ld nm objcopy \
 	         objdump ranlib readelf size strings strip ; do
 		rm -f "${ROOT}"/usr/bin/${TARGET}-${x}
@@ -189,6 +190,10 @@ uninstall_target() {
 	for x in ansidecl.h bfd.h bfdlink.h dis-asm.h symcat.h ; do
 		rm -f "${ROOT}"/usr/${TARGET}/include/${x}
 	done
+	for x in bfd iberty opcodes ; do
+		rm -f "${ROOT}"/usr/${HOST}/${TARGET}/lib/lib${x}{{-*,}.so,.a,.la}
+	done
+	rmdir "${ROOT}"/usr/${HOST}/${TARGET}/lib "${ROOT}"/usr/${HOST}/${TARGET} 2>/dev/null
 	rm -f "${ROOT}"/usr/${TARGET}/lib/ldscripts
 	rmdir "${ROOT}"/usr/${TARGET}/{bin,include,lib} "${ROOT}"/usr/${TARGET} 2>/dev/null
 	rmdir "${ROOT}"/var/db/pkg/cross-${TARGET} 2>/dev/null
@@ -281,7 +286,7 @@ while [[ $# -gt 0 ]] ; do
 			exit 0
 			;;
 		-v|--version)
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.3 2005/06/13 04:51:12 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-1.8,v 1.4 2005/06/24 21:55:28 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			echo "binutils-config-${cvsver%%,v *}"
 			exit 0
diff --git a/sys-devel/binutils-config/files/digest-binutils-config-1.8-r3 b/sys-devel/binutils-config/files/digest-binutils-config-1.8-r4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-devel/binutils-config/files/digest-binutils-config-1.8-r3
+++ b/sys-devel/binutils-config/files/digest-binutils-config-1.8-r4