summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/prefix/ChangeLog6
-rw-r--r--profiles/prefix/make.defaults4
2 files changed, 7 insertions, 3 deletions
diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index 480f170bc57c..1a0f47e373c6 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for profiles/prefix
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.24 2009/07/09 07:52:29 mduft Exp $
+# $Id: ChangeLog,v 1.25 2009/07/12 10:08:57 grobian Exp $
+
+ 12 Jul 2009; Fabian Groffen <grobian@gentoo.org> make.defaults:
+ Get collision-protect back on, thanks sping's smolt tool which made me
+ notice. Disabling this in Prefix is lethal.
09 Jul 2009; Markus Duft <mduft@gentoo.org>
+windows/interix/6.0/use.force, +windows/interix/6.0/use.mask:
diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults
index ff6822725b90..0b931a47b370 100644
--- a/profiles/prefix/make.defaults
+++ b/profiles/prefix/make.defaults
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/make.defaults,v 1.2 2009/06/30 16:34:58 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/make.defaults,v 1.3 2009/07/12 10:08:57 grobian Exp $
# Some USE-flags that only die-hards don't want:
# readline: to have some sane command line editing, e.g. in python
@@ -22,7 +22,7 @@ FEATURES="collision-protect"
#
# If in the future, there does exist a working sandbox implementation then it
# should be enabled on a per-profile basis only.
-FEATURES="-sandbox"
+FEATURES="${FEATURES} -sandbox"
# this probably already is like this, but we assure that in prefix we