removing all refs to hgcc

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

diff --git a/ChangeLog b/ChangeLog
index a1a81a8814165dd4b85dbe6871f0eb0debc26d0d..b30781d4d048411c69b0b54a55ebb929cd399239 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.23 2004/03/05 06:24:17 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.24 2004/03/19 16:06:37 zhen Exp $
+
+  19 Mar 2004; John Davis <zhen@gentoo.org> targets/grp/grp.sh,
+  targets/stage1/stage1.sh, targets/stage3/stage3.sh:
+  removing the hardened-gcc deps since the package itself is deprecated'
 
   05 Mar 2004; John Davis <zhen@gentoo.org> catalyst:
   changing location of /etc/catalyst.conf to /etc/catalyst/catalyst.conf

diff --git a/targets/grp/grp.sh b/targets/grp/grp.sh
index 0b49299d393de41d96736d56c98ce33deb1dd196..801b44560ba4285324d9a28d81625c1e7a065ce2 100755 (executable)
--- a/targets/grp/grp.sh
+++ b/targets/grp/grp.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.9 2004/02/23 17:53:18 drobbins Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.10 2004/03/19 16:06:37 zhen Exp $
 
 case $1 in
 enter)
@@ -35,10 +35,6 @@ run)
                 /usr/bin/distcc-config --install 2>&1 > /dev/null
                 /usr/bin/distccd 2>&1 > /dev/null
     fi
-       if [ ${clst_rel_type} = "hardened" ]
-       then
-               emerge --oneshot --nodeps hardened-gcc || exit 1
-       fi
        export CONFIG_PROTECT="-*"
        
        USE="build" emerge portage

diff --git a/targets/stage1/stage1.sh b/targets/stage1/stage1.sh
index 314bd58bd18d5684dfbf74eac5a378cd5d6bf9e2..ee95008cff0029ac565460e2ffc77b0dd783c5a2 100755 (executable)
--- a/targets/stage1/stage1.sh
+++ b/targets/stage1/stage1.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1.sh,v 1.8 2004/01/29 21:53:22 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1.sh,v 1.9 2004/03/19 16:06:37 zhen Exp $
 
 case $1 in
 enter)
@@ -26,10 +26,6 @@ preclean)
 clean)
        #clean runs after preclean with bind mounts unmounted
        keepers="sys-kernel/linux-headers sys-devel/binutils sys-devel/gcc sys-apps/baselayout sys-libs/glibc virtual/glibc virtual/kernel"
-       if [ ${clst_rel_type} = "hardened" ]
-       then
-               keepers="${keepers} sys-devel/hardened-gcc"
-       fi
        # set everything to uid 999 (nouser)
        cd ${clst_chroot_path}/tmp/stage1root
        install -d var/db/pkg2 

diff --git a/targets/stage3/stage3.sh b/targets/stage3/stage3.sh
index f48ac06eeab9b9ebf9af7b08d6d4b813b0690d66..2a3e0a3d1728f356e0b2577c877f09e90a78a995 100755 (executable)
--- a/targets/stage3/stage3.sh
+++ b/targets/stage3/stage3.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3.sh,v 1.9 2004/02/11 03:31:55 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3.sh,v 1.10 2004/03/19 16:06:37 zhen Exp $
 
 case $1 in
 enter)
@@ -19,10 +19,6 @@ run)
        source /tmp/stage23
        export USE="-* \${clst_HOSTUSE} \${GRP_STAGE23_USE}"
        rm -f /tmp/stage23
-       if [ ${clst_rel_type} = "hardened" ]
-       then
-               emerge --oneshot --nodeps hardened-gcc || exit 1
-       fi
        export CONFIG_PROTECT="-*"
        
        #portage needs to be merged manually with USE="build" set to avoid frying our