When uninstalling, clean out a few more dirs if they are empty.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 34 insertions, 7 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index 42cb995a94d7..54780a6170b6 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/binutils-config
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.15 2005/04/03 19:14:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.16 2005/06/13 04:51:12 vapier Exp $
+
+*binutils-config-1.8-r3 (13 Jun 2005)
+
+  13 Jun 2005; Mike Frysinger <vapier@gentoo.org> files/binutils-config-1.8,
+  +binutils-config-1.8-r3.ebuild:
+  When uninstalling, clean out a few more dirs if they are empty.
 
 *binutils-config-1.8-r2 (03 Apr 2005)
 
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 300f2064745b..0ba0bf3f7dbe 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -1,6 +1,6 @@
-MD5 41f1bef3d219f2191a51b5cdaff70093 ChangeLog 2743
+MD5 efaca3f93c7f97a98402711502625ac1 ChangeLog 2960
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 e9bc7c7af572ef1c0979c7a805c67f5e binutils-config-1.8-r2.ebuild 577
-MD5 f9bb80294cc5c10feb1fe7eaad8a2506 files/binutils-config-1.8 9155
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.8-r2 0
+MD5 3f585cdf53a3ce0272638a558e2be98f binutils-config-1.8-r3.ebuild 577
+MD5 19211fb35938712e33d8d151e2d6571b files/binutils-config-1.8 9296
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-binutils-config-1.8-r3 0
 MD5 953efbc2a688428dfb75ecfa3c2d3d43 files/binutils-config.8 2989
diff --git a/sys-devel/binutils-config/binutils-config-1.8-r3.ebuild b/sys-devel/binutils-config/binutils-config-1.8-r3.ebuild
new file mode 100644
index 000000000000..859b410a5b04
--- /dev/null
+++ b/sys-devel/binutils-config/binutils-config-1.8-r3.ebuild
@@ -0,0 +1,19 @@
+# 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 $
+
+DESCRIPTION="Utility to change the binutils version being used"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+DEPEND="app-shells/bash"
+
+src_install() {
+	newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die
+	doman "${FILESDIR}"/${PN}.8
+}
diff --git a/sys-devel/binutils-config/files/binutils-config-1.8 b/sys-devel/binutils-config/files/binutils-config-1.8
index 4400beba8329..258ce417e2c6 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.2 2005/04/03 19:14:33 vapier Exp $
+# $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 $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -190,6 +190,8 @@ uninstall_target() {
 		rm -f "${ROOT}"/usr/${TARGET}/include/${x}
 	done
 	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
 
 	rm -f "${ENV_D}"/${TARGET}-*
 }
@@ -279,7 +281,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.2 2005/04/03 19:14:33 vapier Exp $"
+			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=${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-r3
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/binutils-config/files/digest-binutils-config-1.8-r3