Duplicate dev-util/cvs* as dev-vcs/cvs* to keep current masks

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b24deeadd51b1d7a5264fac7b926ad13b985d2bb..328827c51c099fed3747a767ca31ed65df5d443c 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4296 2010/06/18 18:03:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4297 2010/06/19 00:22:59 abcd Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  19 Jun 2010; Jonathan Callen <abcd@gentoo.org> package.mask:
+  Duplicate dev-util/cvs* as dev-vcs/cvs* to keep current masks
+
   18 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> package.mask:
   Unmask dev-util/pkgconfig-0.25-r1.
 

diff --git a/profiles/arch/mips/ChangeLog b/profiles/arch/mips/ChangeLog
index 3cccbcc1379390c0017a91535fa3f6ca7209515b..0f222231d7ac223262b7fc3979a5b724bcde7f54 100644 (file)
--- a/profiles/arch/mips/ChangeLog
+++ b/profiles/arch/mips/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/MIPS profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.21 2010/03/13 15:00:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.22 2010/06/19 00:23:00 abcd Exp $
+
+  19 Jun 2010; Jonathan Callen <abcd@gentoo.org> package.use.mask:
+  Duplicate dev-util/cvs* as dev-vcs/cvs* to keep current masks
 
   13 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> package.mask:
   Mask libpng-1.4 pending on texlive-core-2009 unmasking.

diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index bc07234405689f11ed26ba3a06e1bdefc3a594a5..38aaefdacbd0886264e3deda0399f872a700b4c0 100644 (file)
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -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/arch/mips/package.use.mask,v 1.19 2010/04/27 06:37:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/package.use.mask,v 1.20 2010/06/19 00:23:00 abcd Exp $
 
 # uses games-board/ggz-gtk-client
 games-strategy/freeciv ggz
@@ -33,6 +33,7 @@ sys-apps/paludis ruby
 # dependency can't be fulfilled at the moment
 kde-base/kdelibs kerberos
 dev-util/cvs kerberos
+dev-vcs/cvs kerberos
 net-mail/fetchmail kerberos
 
 # Jim Ramsay <lack@gentoo.org> (7 Sep 2007)

diff --git a/profiles/package.mask b/profiles/package.mask
index d02f8eee1b99dd58be75a5eeb33180ab1b752eba..9555d838030f7ea3ce65227063d584bf7154c046 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11661 2010/06/18 18:03:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11662 2010/06/19 00:22:59 abcd 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. Please be extremely
@@ -1244,6 +1244,7 @@ app-benchmarks/ltp
 # Robin H. Johnson <robbat2@gentoo.org> (11 Feb 2006)
 # zlib interaction is badly broken. See bug #124733.
 =dev-util/cvs-1.12.13*
+=dev-vcs/cvs-1.12.13*
 
 # Fernando J. Pereda <ferdy@gentoo.org> (25 April 2005)
 # mask these until the new mailwrapper/mailer-config scheme is ready

diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index d05f5680f592947225dc9cd806606e97ced1c8c8..72d00d2b3c330542a7f25beb1573806e9307f096 100644 (file)
--- 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.184 2010/06/16 06:48:50 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.185 2010/06/19 00:23:00 abcd Exp $
+
+  19 Jun 2010; Jonathan Callen <abcd@gentoo.org> package.mask:
+  Duplicate dev-util/cvs* as dev-vcs/cvs* to keep current masks
 
   16 Jun 2010; Fabian Groffen <grobian@gentoo.org>
   darwin/macos/10.5/ppc/package.use.mask:

diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index c9e0002002e35a95bf39070310976b9cb589e771..338f882f9690fb6eaaafb5c373ee34ff52f89066 100644 (file)
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Id: package.mask,v 1.63 2010/06/09 13:12:39 darkside Exp $
+# $Id: package.mask,v 1.64 2010/06/19 00:23:00 abcd Exp $
 # When you add an entry to this file, add your name, the date, and an
 # explanation of why something is getting masked.  This file is for
 # Prefix profiles only!
@@ -182,3 +182,4 @@ sys-devel/native-cctools
 # dies with "exhausted memory" errors on Darwin, doesn't understand
 # arguments on Solaris.  Probably more problems...
 =dev-util/cvs-1.12.12*
+=dev-vcs/cvs-1.12.12*