Finish move of dev-util/cvs* to dev-vcs/cvs*

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 328827c51c099fed3747a767ca31ed65df5d443c..c4b95fb4fcc15c8172d7510d0d840d4d131f1fde 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4297 2010/06/19 00:22:59 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4298 2010/06/19 01:13:15 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,
+  updates/2Q-2010:
+  Finish move of dev-util/cvs* to dev-vcs/cvs*
+
   19 Jun 2010; Jonathan Callen <abcd@gentoo.org> package.mask:
   Duplicate dev-util/cvs* as dev-vcs/cvs* to keep current masks
 

diff --git a/profiles/arch/mips/ChangeLog b/profiles/arch/mips/ChangeLog
index 0f222231d7ac223262b7fc3979a5b724bcde7f54..05526cdf6d0677e4266541a98dd6d7624fdc0339 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.22 2010/06/19 00:23:00 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/ChangeLog,v 1.23 2010/06/19 01:13:16 abcd Exp $
+
+  19 Jun 2010; Jonathan Callen <abcd@gentoo.org> package.use.mask:
+  Finish move of dev-util/cvs* to dev-vcs/cvs*
 
   19 Jun 2010; Jonathan Callen <abcd@gentoo.org> package.use.mask:
   Duplicate dev-util/cvs* as dev-vcs/cvs* to keep current masks

diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 38aaefdacbd0886264e3deda0399f872a700b4c0..edf56196b2dedbff9365260d9d5fba9df8e24ebd 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.20 2010/06/19 00:23:00 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/package.use.mask,v 1.21 2010/06/19 01:13:16 abcd Exp $
 
 # uses games-board/ggz-gtk-client
 games-strategy/freeciv ggz
@@ -32,7 +32,6 @@ sys-apps/paludis ruby
 # Chris Gianelloni <cgianelloni@gentoo.org> (22 Sep 2007)
 # dependency can't be fulfilled at the moment
 kde-base/kdelibs kerberos
-dev-util/cvs kerberos
 dev-vcs/cvs kerberos
 net-mail/fetchmail kerberos
 

diff --git a/profiles/package.mask b/profiles/package.mask
index 9555d838030f7ea3ce65227063d584bf7154c046..fe33e89fa23ab957ca91b6e6517f9851e4e5f0d4 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11662 2010/06/19 00:22:59 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11663 2010/06/19 01:13:15 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
@@ -1243,7 +1243,6 @@ 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)

diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index 72d00d2b3c330542a7f25beb1573806e9307f096..ba85c6d854a5a921d9e15970aac8a43189349c98 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.185 2010/06/19 00:23:00 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.186 2010/06/19 01:13:16 abcd Exp $
+
+  19 Jun 2010; Jonathan Callen <abcd@gentoo.org> package.mask:
+  Finish move of dev-util/cvs* to dev-vcs/cvs*
 
   19 Jun 2010; Jonathan Callen <abcd@gentoo.org> package.mask:
   Duplicate dev-util/cvs* as dev-vcs/cvs* to keep current masks

diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index 338f882f9690fb6eaaafb5c373ee34ff52f89066..28bc56ef07c46ba6cbba76b268c7ad005a4ad1e0 100644 (file)
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Id: package.mask,v 1.64 2010/06/19 00:23:00 abcd Exp $
+# $Id: package.mask,v 1.65 2010/06/19 01:13:16 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!
@@ -181,5 +181,4 @@ 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-util/cvs-1.12.12*
 =dev-vcs/cvs-1.12.12*

diff --git a/profiles/updates/2Q-2010 b/profiles/updates/2Q-2010
index 4c6b165a5e845e5b951988e8b5e0209a1a9dbe17..00fb7b327b032b1a71ecb17dc0555c6bf8c5618d 100644 (file)
--- a/profiles/updates/2Q-2010
+++ b/profiles/updates/2Q-2010
@@ -25,3 +25,10 @@ move x11-libs/libjwc_f dev-libs/libjwc_f
 slotmove <=media-libs/libpng-1.2.43 1.2 0
 move dev-util/tig dev-vcs/tig
 slotmove x11-themes/gtk-theme-switch 2 0
+move dev-util/cvs dev-vcs/cvs
+move dev-util/cvs2cl dev-vcs/cvs2cl
+move dev-util/cvsd dev-vcs/cvsd
+move dev-util/cvsgraph dev-vcs/cvsgraph
+move dev-util/cvsps dev-vcs/cvsps
+move dev-util/cvsq dev-vcs/cvsq
+move dev-util/cvsutils dev-vcs/cvsutils