tweak cleaning a bit more and add support for dietlibc/freebsd CTARGETs

Package-Manager: portage-2.0.53_rc5

diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 5902b7f057e9e66df012e2be5e787a9e598108be..14e75941879bbb18e1fa7b35a674d2d2d3bf5e1a 100644 (file)
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 MD5 582c83b33545f1de39861e08f42859e2 ChangeLog 5215
 MD5 091fb844f716a3f89969a7c6cc9a5eea crossdev-0.9.9-r3.ebuild 596
-MD5 ca512ff9d212a5315b935ff81339a85a files/crossdev 12877
+MD5 c479cccda54cd6225a140f732e0c3106 files/crossdev 13066
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.9-r3 0
 MD5 e91cdaf464f515f3528da02cf06e54a1 metadata.xml 222
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDSzEGgIKl8Uu19MoRAn8fAJ90j85LddpDE7FXzp9y9Mvo8y6xrwCdG45j
-ZylHwk2FrT5CO+ctUnXMxTc=
-=ZwMb
+iD8DBQFDUitkgIKl8Uu19MoRAm3SAJ42FqynoH6U6i+9r5R5NeDhILFqewCfYpMX
+KbjnxmAlYSiLnrTPqDNgr58=
+=EJGN
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/crossdev/files/crossdev b/sys-devel/crossdev/files/crossdev
index f6a3fc27811851d766546cbaeb590c0db9f891a3..a7426be7c06d41c26dd07cfeaed44cb63e141cd8 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.37 2005/10/11 03:25:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.38 2005/10/16 10:26:27 vapier Exp $
 
 cd /
 
@@ -11,6 +11,7 @@ if [[ ${ROOT:-/} != "/" ]] ; then
 fi
 
 source /sbin/functions.sh || exit 1
+esyslog() { :; }
 die() {
        echo
        eerror $*
@@ -190,6 +191,7 @@ uninstall() {
                exit 1
        fi
 
+       export CLEAN_DELAY=0
        cd /var/db/pkg
        for p in cross-${CTARGET}/* ; do
                emerge -C =${p} || exit 1
@@ -199,6 +201,7 @@ uninstall() {
        done
        rm -f /usr/${CTARGET}/{sys-include,usr}
        rm -f /usr/bin/${CTARGET}-{gcc,{c,g}++}
+       rmdir /usr/${CTARGET}/{include/asm,include} &> /dev/null
        for d in /usr/${CTARGET} /usr/lib/gcc{,-lib}/${CTARGET} ; do
                if [[ ! -d ${d} ]] ; then
                        rm -f "${d}" &> /dev/null
@@ -282,8 +285,10 @@ done
 [[ -z ${CTARGET} ]] && usage 1
 [[ ${STAGE} == "COW" ]] && STAGE=${STAGE_C_CPP}
 case ${CTARGET} in
-       *-uclibc) LPKG="uclibc";;
-       *-klibc)  LPKG="klibc";;
+       *-dietlibc) LPKG="dietlibc";;
+       *-freebsd*) LPKG="freebsd-lib" KPKG="freebsd-headers";;
+       *-klibc)    LPKG="klibc";;
+       *-uclibc)   LPKG="uclibc";;
 esac
 
 #####################