Exclude distcc and and ccache setup from the "setup" phase. Also make the redundant...

svn path=/main/branches/2.0/; revision=2101

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index c06876eaa33fa45b9147a09e70c8f8b201ac05ff..7187cb81b988cd2d101f483537986f1f02451d11 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1669,7 +1669,7 @@ remove_path_entry() {
 # === === === === === functions end, main part begins === === === === ===
 # === === === === === === === === === === === === === === === === === ===
 
-if [ "$*" != "depend" ] && [ "$*" != "clean" ]; then
+if [ "$*" != "depend" ] && [ "$*" != "clean" ] && [ "$*" != "setup" ]; then
        cd ${PORTAGE_TMPDIR} &> /dev/null
        cd ${BUILD_PREFIX} &> /dev/null
 
@@ -1705,7 +1705,7 @@ if [ "$*" != "depend" ] && [ "$*" != "clean" ]; then
                        export PATH="/usr/bin/ccache:${PATH}"
                fi
 
-               [ -z "${CCACHE_DIR}" ] && export CCACHE_DIR="/root/.ccache"
+               [ -z "${CCACHE_DIR}" ] && export CCACHE_DIR="/var/tmp/ccache"
 
                addread "${CCACHE_DIR}"
                addwrite "${CCACHE_DIR}"
@@ -1726,7 +1726,7 @@ killparent() {
 }
 trap "killparent" INT
 
-fi # "$*"!="depend" && "$*"!="clean"
+fi # "$*"!="depend" && "$*"!="clean" && "$*" != "setup"
 
 export SANDBOX_ON="1"
 export S=${WORKDIR}/${P}