Revert "chroot-functions.sh: emerge sys-apps/shadow before distcc"

This reverts commit a4968878f0bf3bf32e0c5fb0c4b6d88a0ebb8084.

Shadow is now built in stage 1, so we do not need this.

diff --git a/ChangeLog b/ChangeLog
index 0e1b89fa45b50731eff58b24901e6801be7df110..b6df4d53fd3f8a0104131204988f09ef8be9f0cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,10 +3,6 @@
 # Distributed under the GPL v2
 # $Id$
 
-  26 Jun 2011; Matt Turner <mattst88@gentoo.org>
-  targets/support/chroot-functions.sh:
-  Emerge sys-apps/shadow before distcc
-
   26 Jun 2011; Matt Turner <mattst88@gentoo.org>
   targets/support/chroot-functions.sh:
   Don't run 'distcc-config --install'

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 0b81e657e7b5694ed87cec4667f397d57fcb3d18..e739f0aa3dde61bbbc86d306812418127b6d5ddd 100644 (file)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -72,19 +72,18 @@ setup_myfeatures(){
                export clst_myfeatures="${clst_myfeatures} distcc"
                export DISTCC_HOSTS="${clst_distcc_hosts}"
                [ -e /etc/make.conf ] && \
-                       echo 'USE="${USE} -avahi -gtk -gnome -cracklib -pam"' >> /etc/make.conf
+                       echo 'USE="${USE} -avahi -gtk -gnome"' >> /etc/make.conf
                # We install distcc to / on stage1, then use --noreplace, so we need to
                # have some way to check if we need to reinstall distcc without being
                # able to rely on USE, so we check for the distcc user and force a
                # reinstall if it isn't found.
                if [ "$(getent passwd distcc | cut -d: -f1)" != "distcc" ]
                then
-                       clst_root_path=/ run_merge --oneshot --nodeps sys-apps/shadow || exit 1
                        clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1
                else
                        clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1
                fi
-               sed -i '/USE="${USE} -avahi -gtk -gnome -cracklib -pam"/d' /etc/make.conf
+               sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
                mkdir -p /etc/distcc
                echo "${clst_distcc_hosts}" > /etc/distcc/hosts