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

This reverts commit 11a7b5cb09e2d7b7f4f88496fc7816a7cad030d4.

We do not need this now since shadow is part of stage 1.

diff --git a/ChangeLog b/ChangeLog
index 813086207299edb4f445f38a6137810f233ed882..965171ae2903759fc69828baca7987d38d091265 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 4e707d275a4c97638d6cd86266e79871d86b1686..638ef678211cfbe6017a9479da97ef3d6a1f060b 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