Set FEATURES=-news before emerging ccache/distcc/icecream

[catalyst.git] / targets / support / chroot-functions.sh

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 72fee20d6aae02f2e757da76ba836a0f5a7d1caf..1a44c92ff8e9b5ad1964d506c592db334b778328 100644 (file)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -61,6 +61,7 @@ get_libdir() {
 
 setup_myfeatures(){
        setup_myemergeopts
+       export FEATURES="-news"
        if [ -n "${clst_CCACHE}" ]
        then
                export clst_myfeatures="${clst_myfeatures} ccache"
@@ -86,17 +87,15 @@ setup_myfeatures(){
                sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
                mkdir -p /etc/distcc
                echo "${clst_distcc_hosts}" > /etc/distcc/hosts
-               # We need to run distcc-config, since it might not have gotten run
-               [ -x /usr/bin/distcc-config ] && /usr/bin/distcc-config --install
 
                # This sets up automatic cross-distcc-fu according to
                # http://www.gentoo.org/doc/en/cross-compiling-distcc.xml
                CHOST=$(portageq envvar CHOST)
-               # TODO: change to use get_libdir
-               cd /usr/lib/distcc/bin
+               LIBDIR=$(get_libdir)
+               cd /usr/${LIBDIR}/distcc/bin
                rm cc gcc g++ c++ 2>/dev/null
-               echo -e '#!/bin/bash\nexec /usr/lib/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
-               chmod a+x /usr/lib/distcc/bin/${CHOST}-wrapper
+               echo -e '#!/bin/bash\nexec /usr/'${LIBDIR}'/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
+               chmod a+x /usr/${LIBDIR}/distcc/bin/${CHOST}-wrapper
                for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done
        fi
 
@@ -116,7 +115,7 @@ setup_myfeatures(){
                export PATH="/usr/lib/icecc/bin:${PATH}"
                export PREROOTPATH="/usr/lib/icecc/bin"
        fi
-       export FEATURES="${clst_myfeatures}"
+       export FEATURES="${clst_myfeatures} -news"
 }
 
 setup_myemergeopts(){
@@ -172,13 +171,13 @@ setup_pkgmgr(){
 }
 
 cleanup_distcc() {
+       LIBDIR=$(get_libdir)
        rm -rf /etc/distcc/hosts
        for i in cc gcc c++ g++; do
-               # TODO: change to use get_libdir
-               rm -f /usr/lib/distcc/bin/${i}
-               ln -s /usr/bin/distcc /usr/lib/distcc/bin/${i}
+               rm -f /usr/${LIBDIR}/distcc/bin/${i}
+               ln -s /usr/bin/distcc /usr/${LIBDIR}/distcc/bin/${i}
        done
-       rm -f /usr/lib/distcc/bin/*-wrapper
+       rm -f /usr/${LIBDIR}/distcc/bin/*-wrapper
 }
 
 cleanup_icecream() {