[gentoo-commits] proj/catalyst:catalyst_2 commit in: /, targets/support/

["William Hubbs" <williamh@gentoo.org>]

commit:     202e345f8b1910aa17fef4512828ffd5a94e7e15
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Jul 14 01:29:24 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 01:29:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=202e345f

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.

---
 ChangeLog                           |    4 ----
 targets/support/chroot-functions.sh |    5 ++---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e1b89f..b6df4d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,10 +5,6 @@
 
   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'
 
   26 Jun 2011; Sebastian Pipping <sping@gentoo.org>

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 0b81e65..e739f0a 100644
--- 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