Initial import of Catalyst 2.0.0

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@573 d1e1f19c-881f-0410-ab34-b69fee027534

4 files changed, 49 insertions, 70 deletions

diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index 4a79a078..c9f5d0f8 100755
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.sh
@@ -1,43 +1,25 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.14 2005/01/28 18:37:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.15 2005/04/04 17:48:33 rocket Exp $
+
+. /tmp/chroot-functions.sh
 
 # check portage version in seed stage
-portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \
-	| cut -d/ -f2 | cut -d- -f2,3`
-if [ `echo ${portage_version} | cut -d- -f1 | cut -d. -f3` -lt 51 ]
-then
-	echo "ERROR: Your portage version is too low in your seed stage.  Portage version"
-	echo "2.0.51 or greater is required."
-	exit 1
-fi
+check_portage_version
 
-/usr/sbin/env-update
-source /etc/profile
+update_env_settings
 
 [ -f /tmp/envscript ] && source /tmp/envscript
 
-if [ -n "${clst_CCACHE}" ]
-then
-	export clst_myfeatures="${clst_myfeatures} ccache"
-	emerge --oneshot --nodeps -b -k ccache || exit 1
-fi
-
-if [ -n "${clst_DISTCC}" ]
-then   
-	export clst_myfeatures="${clst_myfeatures} distcc"
-	export DISTCC_HOSTS="${clst_distcc_hosts}"
-
-	USE="-gnome -gtk" emerge --oneshot --nodeps -b -k distcc || exit 1
-fi
+setup_myfeatures
 
 # setup the environment
 export FEATURES="${clst_myfeatures}"
 export CONFIG_PROTECT="-*"
 
 ## START BUILD
-USE="build" emerge portage
+setup_portage
 
 #turn off auto-use:
 export USE_ORDER="env:pkg:conf:defaults"
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
new file mode 100755
index 00000000..1465621b
--- /dev/null
+++ b/targets/grp/grp-controller.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-controller.sh,v 1.1 2005/04/04 17:48:33 rocket Exp $
+. ${clst_sharedir}/targets/support/functions.sh
+
+case $1 in
+	enter)
+		${clst_CHROOT} ${clst_chroot_path}
+	;;
+	run)
+		shift
+		export clst_grp_type=$1
+		shift
+		export clst_grp_target=$1
+		shift
+
+		export clst_grp_packages="$*"
+		exec_in_chroot ${clst_sharedir}/targets/grp/grp-chroot.sh
+	;;
+
+	preclean)
+		exec_in_chroot ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh
+		exit 0
+	;;
+
+	clean)
+		exit 0
+	;;
+	
+	*)
+		exit 1
+	;;
+
+esac
+exit 0
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
index 550dd6e4..f55630df 100755
--- a/targets/grp/grp-preclean-chroot.sh
+++ b/targets/grp/grp-preclean-chroot.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-preclean-chroot.sh,v 1.6 2005/01/29 14:54:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-preclean-chroot.sh,v 1.7 2005/04/04 17:48:33 rocket Exp $
 
-/usr/sbin/env-update
-source /etc/profile
+
+. /tmp/chroot-functions.sh
+update_env_settings
+
+gconftool-2 --shutdown
diff --git a/targets/grp/grp.sh b/targets/grp/grp.sh
deleted file mode 100755
index c25ebd08..00000000
--- a/targets/grp/grp.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.22 2005/03/05 05:12:58 wolf31o2 Exp $
-
-case $1 in
-	enter)
-		${clst_CHROOT} ${clst_chroot_path}
-	;;
-	run)
-		shift
-		export clst_grp_type=$1
-		shift
-		export clst_grp_target=$1
-		shift
-				
-		cp ${clst_sharedir}/targets/grp/grp-chroot.sh ${clst_chroot_path}/tmp
-		clst_grp_packages="$*" ${clst_CHROOT} ${clst_chroot_path} /tmp/grp-chroot.sh || exit 1
-		rm -f ${clst_chroot_path}/tmp/grp-chroot.sh
-	;;
-
-	preclean)
-		if [ `pidof gconfd-2` ]
-		then
-			gconftool-2 --shutdown
-		fi
-		#cp ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh ${clst_chroot_path}/tmp
-		#${clst_CHROOT} ${clst_chroot_path} /tmp/grp-preclean-chroot.sh || exit 1
-		#rm -f ${clst_chroot_path}/tmp/grp-preclean-chroot.sh
-		exit 0
-	;;
-
-	clean)
-		exit 0
-	;;
-	
-	*)
-		exit 1
-	;;
-
-esac
-exit 0