From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Fri, 4 Feb 2005 16:55:59 +0000 (+0000)
Subject: Removed ccache from default options as it breaks catalyst when merged with USE=-ccache.
X-Git-Tag: CATALYST_2_0_6_916~828
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bbebedcf05f66b494dabff696aa856266efc6d84;p=catalyst.git

Removed ccache from default options as it breaks catalyst when merged with USE=-ccache.


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

diff --git a/ChangeLog b/ChangeLog
index 4bb06a75..9845d5c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.171 2005/02/04 16:46:42 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.172 2005/02/04 16:55:59 wolf31o2 Exp $
+
+  04 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/catalyst.conf:
+  Removed ccache from default options as it breaks catalyst when merged with
+  USE=-ccache.
 
   04 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/snapshot_target.py:
diff --git a/files/catalyst.conf b/files/catalyst.conf
index 035fe9cb..1abe4eb4 100644
--- a/files/catalyst.conf
+++ b/files/catalyst.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/files/catalyst.conf,v 1.8 2004/10/22 04:23:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/files/catalyst.conf,v 1.9 2005/02/04 16:55:59 wolf31o2 Exp $
 
 # Simple desriptions of catalyst settings. Please refer to the online
 # documentation for more information.
@@ -17,7 +17,7 @@ distdir="/usr/portage/distfiles"
 #	prematurely)
 # kerncache = keeps a tbz2 of your built kernel and modules (useful if your
 #	build stops in livecd-stage2)
-options="ccache pkgcache kerncache"
+options="pkgcache kerncache"
 
 # sharedir specifies where all of the catalyst runtime executables are. Most users do
 # not need to change this.