summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-11-23 21:44:56 +0000
committerFabian Groffen <grobian@gentoo.org>2010-11-23 21:44:56 +0000
commit597a6674165c84b8d530947c269147e1bae478cf (patch)
tree8ea4e78ec932b79e36c01a83c228dfecfc277927
parentkeyword on ~amd64-linux (diff)
downloadgentoo-2-597a6674165c84b8d530947c269147e1bae478cf.tar.gz
gentoo-2-597a6674165c84b8d530947c269147e1bae478cf.tar.bz2
gentoo-2-597a6674165c84b8d530947c269147e1bae478cf.zip
Grabbed patch for grep-2.7 issue, drop mask
-rw-r--r--profiles/prefix/ChangeLog5
-rw-r--r--profiles/prefix/darwin/package.mask8
2 files changed, 6 insertions, 7 deletions
diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index 24a45aa64604..83e56b33964e 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for profiles/prefix
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.228 2010/11/23 20:56:25 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.229 2010/11/23 21:44:56 grobian Exp $
+
+ 23 Nov 2010; Fabian Groffen <grobian@gentoo.org> darwin/package.mask:
+ Grabbed patch for grep-2.7 issue, drop mask
23 Nov 2010; Jeremy Olexa <darkside@gentoo.org> darwin/package.mask:
Pre-emptive mask for =grep-2.7, breaks bootstrapping on macos. bug 346335
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index 3256526da91d..ac24e58f3df7 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -1,11 +1,7 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/package.mask,v 1.19 2010/11/23 20:56:25 darkside Exp $
-# $Id: package.mask,v 1.19 2010/11/23 20:56:25 darkside Exp $
-
-# Jeremy Olexa <darkside@gentoo.org> (23 Nov 2010)
-# Pre-emptive mask, breaks bootstrapping. bug 346335
-=sys-apps/grep-2.7
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/package.mask,v 1.20 2010/11/23 21:44:56 grobian Exp $
+# $Id: package.mask,v 1.20 2010/11/23 21:44:56 grobian Exp $
# Fabian Groffen <grobian@gentoo.org> (21 Apr 2010)
# Requires thread-local storage (__thread), Darwin has pthread_getspecific