4 files changed, 15 insertions, 10 deletions
diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index ac2e5714002f..c8dcaa2b0873 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for profiles/prefix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.351 2012/05/26 12:18:40 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.352 2012/06/06 14:45:39 heroxbd Exp $
+
+  06 Jun 2012; Benda Xu <heroxbd@gentoo.org> darwin/package.mask, package.mask,
+  sunos/solaris/package.mask:
+  move =dev-vcs/cvs-1.12.12* mask to darwin and solaris arch dir
 
   26 May 2012; Fabian Groffen <grobian@gentoo.org> -package.provided:
   Don't package.provide a member of a virtual (shadow)
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index 1b14b4ef73f1..5c5a6832a92b 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -1,7 +1,6 @@
 # Copyright 1999-2012 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.32 2012/05/05 13:35:17 grobian Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/package.mask,v 1.33 2012/06/06 14:45:40 heroxbd Exp $
 
 # Fabian Groffen <grobian@gentoo.org> (19 Feb 2012)
 # Using FSF GCC on Mac OS X is not supported by Gentoo Prefix.  While
@@ -51,3 +50,6 @@ sci-libs/blas-atlas
 # darwin-miscutils are only available on darwin
 -sys-apps/darwin-miscutils
 
+# Fabian Groffen <grobian@gentoo.org> (21 Jan 2007)
+# dies with "exhausted memory" errors on Darwin
+=dev-vcs/cvs-1.12.12*
diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index e7d89542931d..8316b14fce49 100644
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/package.mask,v 1.107 2012/05/23 15:22:52 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/package.mask,v 1.108 2012/06/06 14:45:39 heroxbd Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked.  This file is for
@@ -116,8 +116,3 @@ app-emacs/jde
 # Don't use this, it is only provided for experimentation and as tool to
 # recover from broken linker situations.
 sys-devel/native-cctools
-
-# Fabian Groffen <grobian@gentoo.org> (21 Jan 2007)
-# dies with "exhausted memory" errors on Darwin, doesn't understand
-# arguments on Solaris.  Probably more problems...
-=dev-vcs/cvs-1.12.12*
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask
index 715aaad22f43..4042ebd0d1ff 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/package.mask,v 1.35 2012/05/09 11:17:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/package.mask,v 1.36 2012/06/06 14:45:40 heroxbd Exp $
 
 # Fabian Groffen <grobian@gentoo.org> (09 May 2012)
 # Installing libelf will hurt your system.  In particular libkvm needs
@@ -34,3 +34,7 @@ dev-libs/libelf
 # Fabian Groffen <grobian@gentoo.org> (02 Oct 2008)
 # Doesn't compile on Solaris.
 =app-shells/ksh-93.20081104
+
+# Fabian Groffen <grobian@gentoo.org> (21 Jan 2007)
+# doesn't understand arguments on Solaris
+=dev-vcs/cvs-1.12.12*