touchup the uninstall target more

Package-Manager: portage-2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/

diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index e1501976f0cee0b81e8614b5c741f2d732af1267..986e0c5f90e7073bdb2e8afb15681d234a3ad3fa 100644 (file)
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -4,12 +4,12 @@ Hash: SHA1
 MD5 e91cdaf464f515f3528da02cf06e54a1 metadata.xml 222
 MD5 332c7e0793c9a75cd5de61fcf4e7a238 ChangeLog 4955
 MD5 c723d88c7e76371dd79cf264941cea9e crossdev-0.9.9-r2.ebuild 596
-MD5 d4724ea4d670e1c245324751b860b48e files/crossdev 12704
+MD5 596e66e68e98e2f77d02760ab321f6cb files/crossdev 12839
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.9-r2 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDE5mfgIKl8Uu19MoRAotLAJsEMhQsso2/ynnvdezpDqFpnr3ifACfSL0t
-fs7G2grl0Eiel4lW18NqFVo=
-=9+fy
+iD8DBQFDMM1ZgIKl8Uu19MoRArJ9AJwNpjXSZJ/8BAfZCDmd0To9k6WEmQCcCdT4
+Qa7HkG655CcW+NVBDKzmEt4=
+=Hkf4
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/crossdev/files/crossdev b/sys-devel/crossdev/files/crossdev
index 3bb88dd7d356b5afbb329c51e76bdddba7be1433..9ebc08a583a5e1a0b47983088357a89c8a9cd097 100755 (executable)
--- a/sys-devel/crossdev/files/crossdev
+++ b/sys-devel/crossdev/files/crossdev
@@ -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/crossdev/files/crossdev,v 1.34 2005/08/29 23:26:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.35 2005/09/21 03:02:18 vapier Exp $
 
 cd /
 
@@ -200,9 +200,15 @@ uninstall() {
        for b in addr2line ar as c++filt ld nm objcopy objdump ranlib readelf size strings strip ; do
                rm -f /usr/bin/${CTARGET}-${b} /usr/${CTARGET}/bin/${b}
        done
+       rm -f /usr/${CTARGET}/{sys-include,usr}
        rm -f /usr/bin/${CTARGET}-{gcc,{c,g}++}
        for d in /usr/${CTARGET} /usr/lib/gcc{,-lib}/${CTARGET} ; do
-               [[ -d ${d} ]] && rm -ri "${d}"
+               if [[ ! -d ${d} ]] ; then
+                       rm -f "${d}" &> /dev/null
+               else
+                       rmdir "${d}" &> /dev/null && continue
+                       rm -ri "${d}"
+               fi
        done
        rm -f /etc/env.d/{binutils,gcc}/config-${CTARGET}
        rmdir /var/db/pkg/cross-${CTARGET}