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

[Matt Turner]

commit:     72f6115834b157c2cfd1abbd90b2ec2b95f2d60e
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Sep 26 00:14:43 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Sep 28 01:23:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=72f61158

Don't emerge ccache/distcc/icecream with --nodeps

ccache-3.1.8 changed to using tar.xz sources, which exposed a problem in
catalyst where an old stage without xz would fail to seed a new stage
using ccache.

ccache's dependencies are zlib (and xz for >=ccache-3.1.8). distcc's are
already part of stages: dev-libs/popt, virtual/pkgconfig, and
sys-devel/gcc-config. icecream has no dependencies (???).

Emerging with --nodeps only has the potential to cause problems.

---
 targets/support/chroot-functions.sh |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 18e7a38..fecbad4 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -68,7 +68,7 @@ setup_myfeatures(){
 	if [ -n "${clst_CCACHE}" ]
 	then
 		export clst_myfeatures="${clst_myfeatures} ccache"
-		clst_root_path=/ run_merge --oneshot --nodeps --noreplace dev-util/ccache || exit 1
+		clst_root_path=/ run_merge --oneshot --noreplace dev-util/ccache || exit 1
 	fi
 
 	if [ -n "${clst_DISTCC}" ]
@@ -83,9 +83,9 @@ setup_myfeatures(){
 		# reinstall if it isn't found.
 		if [ "$(getent passwd distcc | cut -d: -f1)" != "distcc" ]
 		then
-			clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1
+			clst_root_path=/ run_merge --oneshot sys-devel/distcc || exit 1
 		else
-			clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1
+			clst_root_path=/ run_merge --oneshot --noreplace sys-devel/distcc || exit 1
 		fi
 		sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/portage/make.conf
 		mkdir -p /etc/distcc
@@ -104,7 +104,7 @@ setup_myfeatures(){
 
 	if [ -n "${clst_ICECREAM}" ]
 	then
-		clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/icecream || exit 1
+		clst_root_path=/ run_merge --oneshot --noreplace sys-devel/icecream || exit 1
 
 		# This sets up automatic cross-icecc-fu according to
 		# http://gentoo-wiki.com/HOWTO_Setup_An_ICECREAM_Compile_Cluster#Icecream_and_cross-compiling