From: Jonathan Callen <jcallen@gentoo.org>
Date: Sat, 19 Jun 2010 00:54:05 +0000 (+0000)
Subject: Moving dev-util/cvs* to dev-vcs/cvs*
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d3bc575415a661c7db346d1f927e63702bc7549;p=gentoo.git

Moving dev-util/cvs* to dev-vcs/cvs*
Package-Manager: portage-2.2_rc67/cvs/Linux i686
---

diff --git a/dev-vcs/colorcvs/ChangeLog b/dev-vcs/colorcvs/ChangeLog
index 3e777fc38c0f..2dbd5eb1edd9 100644
--- a/dev-vcs/colorcvs/ChangeLog
+++ b/dev-vcs/colorcvs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/colorcvs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/colorcvs/ChangeLog,v 1.4 2010/04/23 14:17:46 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/colorcvs/ChangeLog,v 1.5 2010/06/19 00:46:10 abcd Exp $
+
+  19 Jun 2010; Jonathan Callen <abcd@gentoo.org> colorcvs-1.4-r1.ebuild:
+  Moving dev-util/cvs* to dev-vcs/cvs*
 
   23 Apr 2010; Jeremy Olexa <darkside@gentoo.org> colorcvs-1.4-r1.ebuild,
   +files/colorcvs-1.4-prefix.patch:
diff --git a/dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild b/dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild
index db4d046142cd..bd115e84a017 100644
--- a/dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild
+++ b/dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild,v 1.2 2010/04/23 14:17:46 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/colorcvs/colorcvs-1.4-r1.ebuild,v 1.3 2010/06/19 00:46:10 abcd Exp $
 
 EAPI=3
 inherit eutils prefix
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="dev-lang/perl
-	dev-util/cvs"
+	dev-vcs/cvs"
 
 src_prepare() {
 	# fix typo
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 2cfb3e87d12b..a54385e7d937 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.11 2010/06/14 22:21:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.12 2010/06/19 00:49:43 abcd Exp $
+
+  19 Jun 2010; Jonathan Callen <abcd@gentoo.org> git-1.6.3.1.ebuild,
+  git-1.6.3.3.ebuild, git-1.6.3.4.ebuild, git-1.6.4.ebuild,
+  git-1.6.4.1.ebuild, git-1.6.4.2.ebuild, git-1.6.4.3.ebuild,
+  git-1.6.4.4.ebuild, git-1.6.5_rc1.ebuild, git-1.6.5_rc2.ebuild,
+  git-1.6.5.ebuild, git-1.6.5.1.ebuild, git-1.6.5.1-r1.ebuild,
+  git-1.6.5.2.ebuild, git-1.6.5.3.ebuild, git-1.6.5.4.ebuild,
+  git-1.6.5.5.ebuild, git-1.6.5.6.ebuild, git-1.6.5.7.ebuild,
+  git-1.6.5.8.ebuild, git-1.6.6_rc3.ebuild, git-1.6.6_rc4.ebuild,
+  git-1.6.6.ebuild, git-1.6.6-r1.ebuild, git-1.6.6-r2.ebuild,
+  git-1.6.6.1.ebuild, git-1.6.6.2.ebuild, git-1.7.0.ebuild,
+  git-1.7.0.3.ebuild, git-1.7.0.4.ebuild, git-1.7.1-r1.ebuild,
+  git-9999.ebuild:
+  Moving dev-util/cvs* to dev-vcs/cvs*
 
   14 Jun 2010; Christoph Mende <angelos@gentoo.org> git-1.7.1-r1.ebuild:
   Stable on amd64 wrt bug #321899
diff --git a/dev-vcs/git/git-1.6.3.1.ebuild b/dev-vcs/git/git-1.6.3.1.ebuild
index 31be4d5e9fbd..1c71be1a7937 100644
--- a/dev-vcs/git/git-1.6.3.1.ebuild
+++ b/dev-vcs/git/git-1.6.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.3.1.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.3.1.ebuild,v 1.3 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -313,13 +313,13 @@ src_test() {
 		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.3.3.ebuild b/dev-vcs/git/git-1.6.3.3.ebuild
index 740c3c44292c..126dcbbafd91 100644
--- a/dev-vcs/git/git-1.6.3.3.ebuild
+++ b/dev-vcs/git/git-1.6.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.3.3.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.3.3.ebuild,v 1.3 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -313,13 +313,13 @@ src_test() {
 		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.3.4.ebuild b/dev-vcs/git/git-1.6.3.4.ebuild
index bf232867af0c..74d885363e2c 100644
--- a/dev-vcs/git/git-1.6.3.4.ebuild
+++ b/dev-vcs/git/git-1.6.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.3.4.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.3.4.ebuild,v 1.3 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -313,13 +313,13 @@ src_test() {
 		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.4.1.ebuild b/dev-vcs/git/git-1.6.4.1.ebuild
index 8bf4e6ab2e55..156d5cf320cf 100644
--- a/dev-vcs/git/git-1.6.4.1.ebuild
+++ b/dev-vcs/git/git-1.6.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.1.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.1.ebuild,v 1.3 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -313,13 +313,13 @@ src_test() {
 		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.4.2.ebuild b/dev-vcs/git/git-1.6.4.2.ebuild
index 9e47b10cea1c..f7b7facb2cbd 100644
--- a/dev-vcs/git/git-1.6.4.2.ebuild
+++ b/dev-vcs/git/git-1.6.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.2.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.2.ebuild,v 1.3 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -313,13 +313,13 @@ src_test() {
 		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.4.3.ebuild b/dev-vcs/git/git-1.6.4.3.ebuild
index eaad9f2d515c..a603172f4c86 100644
--- a/dev-vcs/git/git-1.6.4.3.ebuild
+++ b/dev-vcs/git/git-1.6.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.3.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.3.ebuild,v 1.3 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -313,13 +313,13 @@ src_test() {
 		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.4.4.ebuild b/dev-vcs/git/git-1.6.4.4.ebuild
index b7eb050674ed..85c3c5fe211c 100644
--- a/dev-vcs/git/git-1.6.4.4.ebuild
+++ b/dev-vcs/git/git-1.6.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.4.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.4.ebuild,v 1.3 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -316,13 +316,13 @@ src_test() {
 		t3700-add.sh t7300-clean.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.4.ebuild b/dev-vcs/git/git-1.6.4.ebuild
index de30cf06ee19..13bbca6f085d 100644
--- a/dev-vcs/git/git-1.6.4.ebuild
+++ b/dev-vcs/git/git-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.ebuild,v 1.3 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -313,13 +313,13 @@ src_test() {
 		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.5.1-r1.ebuild b/dev-vcs/git/git-1.6.5.1-r1.ebuild
index bbb2573265a1..d20ad7ac8da4 100644
--- a/dev-vcs/git/git-1.6.5.1-r1.ebuild
+++ b/dev-vcs/git/git-1.6.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.1-r1.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.1-r1.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -49,7 +49,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -336,13 +336,13 @@ src_test() {
 		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.5.1.ebuild b/dev-vcs/git/git-1.6.5.1.ebuild
index 6320f90369b8..66f358100b37 100644
--- a/dev-vcs/git/git-1.6.5.1.ebuild
+++ b/dev-vcs/git/git-1.6.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.1.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.1.ebuild,v 1.3 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -49,7 +49,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -324,13 +324,13 @@ src_test() {
 		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.5.2.ebuild b/dev-vcs/git/git-1.6.5.2.ebuild
index 91f43393796d..e51ace9f8200 100644
--- a/dev-vcs/git/git-1.6.5.2.ebuild
+++ b/dev-vcs/git/git-1.6.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.2.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.2.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -49,7 +49,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -336,13 +336,13 @@ src_test() {
 		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.5.3.ebuild b/dev-vcs/git/git-1.6.5.3.ebuild
index 0f4458281dcc..338eb2624ebc 100644
--- a/dev-vcs/git/git-1.6.5.3.ebuild
+++ b/dev-vcs/git/git-1.6.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.3.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.3.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -348,13 +348,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.5.4.ebuild b/dev-vcs/git/git-1.6.5.4.ebuild
index 92f777f88c7d..a43a5db80d26 100644
--- a/dev-vcs/git/git-1.6.5.4.ebuild
+++ b/dev-vcs/git/git-1.6.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.4.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.4.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -348,13 +348,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.5.5.ebuild b/dev-vcs/git/git-1.6.5.5.ebuild
index f58fff6ed4f2..51e2d2b748b0 100644
--- a/dev-vcs/git/git-1.6.5.5.ebuild
+++ b/dev-vcs/git/git-1.6.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.5.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.5.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -348,13 +348,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.5.6.ebuild b/dev-vcs/git/git-1.6.5.6.ebuild
index 4218ec466f8e..eb02c4857892 100644
--- a/dev-vcs/git/git-1.6.5.6.ebuild
+++ b/dev-vcs/git/git-1.6.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.6.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.6.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -348,13 +348,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.5.7.ebuild b/dev-vcs/git/git-1.6.5.7.ebuild
index 2c5d837aa89c..baa55bbe39ae 100644
--- a/dev-vcs/git/git-1.6.5.7.ebuild
+++ b/dev-vcs/git/git-1.6.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.7.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.7.ebuild,v 1.4 2010/06/19 00:49:42 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -353,13 +353,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.5.8.ebuild b/dev-vcs/git/git-1.6.5.8.ebuild
index 7b43c33fee74..a2eb041ee6a0 100644
--- a/dev-vcs/git/git-1.6.5.8.ebuild
+++ b/dev-vcs/git/git-1.6.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.8.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.8.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -353,13 +353,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.5.ebuild b/dev-vcs/git/git-1.6.5.ebuild
index 62a067313eec..9eec795921ef 100644
--- a/dev-vcs/git/git-1.6.5.ebuild
+++ b/dev-vcs/git/git-1.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.ebuild,v 1.3 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -49,7 +49,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -324,13 +324,13 @@ src_test() {
 		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.5_rc1.ebuild b/dev-vcs/git/git-1.6.5_rc1.ebuild
index 292da67cc2a3..e866cdc2f6ea 100644
--- a/dev-vcs/git/git-1.6.5_rc1.ebuild
+++ b/dev-vcs/git/git-1.6.5_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5_rc1.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5_rc1.ebuild,v 1.3 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -313,13 +313,13 @@ src_test() {
 		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.5_rc2.ebuild b/dev-vcs/git/git-1.6.5_rc2.ebuild
index 4be9d48e27b9..509456014846 100644
--- a/dev-vcs/git/git-1.6.5_rc2.ebuild
+++ b/dev-vcs/git/git-1.6.5_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5_rc2.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5_rc2.ebuild,v 1.3 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -313,13 +313,13 @@ src_test() {
 		disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.6-r1.ebuild b/dev-vcs/git/git-1.6.6-r1.ebuild
index 8c388e6a7eb3..c30154e03537 100644
--- a/dev-vcs/git/git-1.6.6-r1.ebuild
+++ b/dev-vcs/git/git-1.6.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6-r1.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6-r1.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -360,13 +360,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.6-r2.ebuild b/dev-vcs/git/git-1.6.6-r2.ebuild
index c74f66a68374..e393d8b4b9b2 100644
--- a/dev-vcs/git/git-1.6.6-r2.ebuild
+++ b/dev-vcs/git/git-1.6.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6-r2.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6-r2.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -360,13 +360,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.6.1.ebuild b/dev-vcs/git/git-1.6.6.1.ebuild
index 209811d7c0ef..6ed14f04c7a3 100644
--- a/dev-vcs/git/git-1.6.6.1.ebuild
+++ b/dev-vcs/git/git-1.6.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6.1.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6.1.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -360,13 +360,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.6.2.ebuild b/dev-vcs/git/git-1.6.6.2.ebuild
index 969dc0613910..f81660980a74 100644
--- a/dev-vcs/git/git-1.6.6.2.ebuild
+++ b/dev-vcs/git/git-1.6.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6.2.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6.2.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -360,13 +360,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.6.ebuild b/dev-vcs/git/git-1.6.6.ebuild
index 2b06781a2606..2682403157de 100644
--- a/dev-vcs/git/git-1.6.6.ebuild
+++ b/dev-vcs/git/git-1.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -353,13 +353,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.6_rc3.ebuild b/dev-vcs/git/git-1.6.6_rc3.ebuild
index 59d60f321a43..2d5b2d09b2cd 100644
--- a/dev-vcs/git/git-1.6.6_rc3.ebuild
+++ b/dev-vcs/git/git-1.6.6_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6_rc3.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6_rc3.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -353,13 +353,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.6.6_rc4.ebuild b/dev-vcs/git/git-1.6.6_rc4.ebuild
index 45793086da16..d6a3e7e4dc4a 100644
--- a/dev-vcs/git/git-1.6.6_rc4.ebuild
+++ b/dev-vcs/git/git-1.6.6_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6_rc4.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6_rc4.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -353,13 +353,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.7.0.3.ebuild b/dev-vcs/git/git-1.7.0.3.ebuild
index c071c4067f78..4a5dfeefd5a1 100644
--- a/dev-vcs/git/git-1.7.0.3.ebuild
+++ b/dev-vcs/git/git-1.7.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.0.3.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.0.3.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -360,13 +360,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.7.0.4.ebuild b/dev-vcs/git/git-1.7.0.4.ebuild
index aa14b964df3a..180de88d47e9 100644
--- a/dev-vcs/git/git-1.7.0.4.ebuild
+++ b/dev-vcs/git/git-1.7.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.0.4.ebuild,v 1.1 2010/04/01 05:22:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.0.4.ebuild,v 1.2 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -360,13 +360,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.7.0.ebuild b/dev-vcs/git/git-1.7.0.ebuild
index 6579ae7f9804..e4cd319e78e2 100644
--- a/dev-vcs/git/git-1.7.0.ebuild
+++ b/dev-vcs/git/git-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.0.ebuild,v 1.3 2010/03/31 07:15:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.0.ebuild,v 1.4 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -360,13 +360,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-1.7.1-r1.ebuild b/dev-vcs/git/git-1.7.1-r1.ebuild
index 7f66a16efbe5..0bbb1ec5387a 100644
--- a/dev-vcs/git/git-1.7.1-r1.ebuild
+++ b/dev-vcs/git/git-1.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.1-r1.ebuild,v 1.4 2010/06/14 22:21:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.1-r1.ebuild,v 1.5 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -365,13 +365,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index c2b42152106a..a6fa9fc79d29 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.3 2010/06/19 00:49:43 abcd Exp $
 
 EAPI=2
 
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 			dev-perl/Net-SMTP-SSL
 			dev-perl/Authen-SASL
 			cgi? ( virtual/perl-CGI )
-			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
 			subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
 			)
 	gtk?
@@ -360,13 +360,13 @@ src_test() {
 		disabled="${disabled} ${tests_nonroot}"
 	else
 		[[ $cvs -gt 0 ]] && \
-			has_version dev-util/cvs && \
+			has_version dev-vcs/cvs && \
 			let cvs=$cvs+1
 		[[ $cvs -gt 1 ]] && \
-			built_with_use dev-util/cvs server && \
+			built_with_use dev-vcs/cvs server && \
 			let cvs=$cvs+1
 		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
 			disabled="${disabled} ${tests_cvs}"
 		fi
 	fi
diff --git a/dev-vcs/mcvs/ChangeLog b/dev-vcs/mcvs/ChangeLog
index c7851213ff23..c8b5d29ad177 100644
--- a/dev-vcs/mcvs/ChangeLog
+++ b/dev-vcs/mcvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/mcvs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mcvs/ChangeLog,v 1.1 2010/03/05 16:22:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mcvs/ChangeLog,v 1.2 2010/06/19 00:53:28 abcd Exp $
+
+  19 Jun 2010; Jonathan Callen <abcd@gentoo.org> mcvs-1.0.10.ebuild,
+  mcvs-1.0.13.ebuild:
+  Moving dev-util/cvs* to dev-vcs/cvs*
 
   05 Mar 2010; Ulrich Mueller <ulm@gentoo.org> +files/1.0.13-gentoo.patch,
   +mcvs-1.0.10.ebuild, +mcvs-1.0.13.ebuild, +metadata.xml:
diff --git a/dev-vcs/mcvs/mcvs-1.0.10.ebuild b/dev-vcs/mcvs/mcvs-1.0.10.ebuild
index 3129e2391d99..20a9ea644549 100644
--- a/dev-vcs/mcvs/mcvs-1.0.10.ebuild
+++ b/dev-vcs/mcvs/mcvs-1.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mcvs/mcvs-1.0.10.ebuild,v 1.1 2010/03/05 16:22:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mcvs/mcvs-1.0.10.ebuild,v 1.2 2010/06/19 00:53:28 abcd Exp $
 
 inherit common-lisp-common eutils
 
@@ -17,7 +17,7 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=">=dev-lisp/clisp-2.32
-	dev-util/cvs
+	dev-vcs/cvs
 	dev-vcs/rcs"
 
 src_unpack() {
diff --git a/dev-vcs/mcvs/mcvs-1.0.13.ebuild b/dev-vcs/mcvs/mcvs-1.0.13.ebuild
index db6422fee51b..f5611f889774 100644
--- a/dev-vcs/mcvs/mcvs-1.0.13.ebuild
+++ b/dev-vcs/mcvs/mcvs-1.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mcvs/mcvs-1.0.13.ebuild,v 1.1 2010/03/05 16:22:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mcvs/mcvs-1.0.13.ebuild,v 1.2 2010/06/19 00:53:28 abcd Exp $
 
 inherit common-lisp-common eutils
 
@@ -17,7 +17,7 @@ KEYWORDS="x86 ~ppc"
 IUSE=""
 
 DEPEND=">=dev-lisp/clisp-2.32
-	dev-util/cvs
+	dev-vcs/cvs
 	dev-vcs/rcs"
 
 src_unpack() {
diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 92c3e9a70bdd..d44f2823cfd4 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.15 2010/06/07 09:22:55 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.16 2010/06/19 00:51:03 abcd Exp $
+
+  19 Jun 2010; Jonathan Callen <abcd@gentoo.org> mercurial-1.4.1.ebuild,
+  mercurial-1.5.ebuild, mercurial-1.5.2.ebuild, mercurial-1.5.3.ebuild,
+  mercurial-1.5.4.ebuild, mercurial-9999.ebuild:
+  Moving dev-util/cvs* to dev-vcs/cvs*
 
   07 Jun 2010; Dirkjan Ochtman <djc@gentoo.org> mercurial-9999.ebuild:
   Update live ebuild to be more like the others.
diff --git a/dev-vcs/mercurial/mercurial-1.4.1.ebuild b/dev-vcs/mercurial/mercurial-1.4.1.ebuild
index 1293434764e6..a400c4edde73 100644
--- a/dev-vcs/mercurial/mercurial-1.4.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.4.1.ebuild,v 1.3 2010/03/17 15:45:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.4.1.ebuild,v 1.4 2010/06/19 00:51:03 abcd Exp $
 
 EAPI=2
 
@@ -109,7 +109,7 @@ pkg_postinst() {
 
 	elog "If you want to convert repositories from other tools using convert"
 	elog "extension please install correct tool:"
-	elog "  dev-util/cvs"
+	elog "  dev-vcs/cvs"
 	elog "  dev-vcs/darcs"
 	elog "  dev-vcs/git"
 	elog "  dev-vcs/monotone"
diff --git a/dev-vcs/mercurial/mercurial-1.5.2.ebuild b/dev-vcs/mercurial/mercurial-1.5.2.ebuild
index 884457e4adec..300881d71ed2 100644
--- a/dev-vcs/mercurial/mercurial-1.5.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.5.2.ebuild,v 1.2 2010/06/01 16:35:30 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.5.2.ebuild,v 1.3 2010/06/19 00:51:03 abcd Exp $
 
 EAPI=2
 
@@ -112,7 +112,7 @@ pkg_postinst() {
 
 	elog "If you want to convert repositories from other tools using convert"
 	elog "extension please install correct tool:"
-	elog "  dev-util/cvs"
+	elog "  dev-vcs/cvs"
 	elog "  dev-vcs/darcs"
 	elog "  dev-vcs/git"
 	elog "  dev-vcs/monotone"
diff --git a/dev-vcs/mercurial/mercurial-1.5.3.ebuild b/dev-vcs/mercurial/mercurial-1.5.3.ebuild
index 0df9adb59c5a..e64e4f05b431 100644
--- a/dev-vcs/mercurial/mercurial-1.5.3.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.5.3.ebuild,v 1.3 2010/06/01 16:35:30 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.5.3.ebuild,v 1.4 2010/06/19 00:51:03 abcd Exp $
 
 EAPI=3
 
@@ -112,7 +112,7 @@ pkg_postinst() {
 
 	elog "If you want to convert repositories from other tools using convert"
 	elog "extension please install correct tool:"
-	elog "  dev-util/cvs"
+	elog "  dev-vcs/cvs"
 	elog "  dev-vcs/darcs"
 	elog "  dev-vcs/git"
 	elog "  dev-vcs/monotone"
diff --git a/dev-vcs/mercurial/mercurial-1.5.4.ebuild b/dev-vcs/mercurial/mercurial-1.5.4.ebuild
index dc8e2729b394..8071d9e1b798 100644
--- a/dev-vcs/mercurial/mercurial-1.5.4.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.5.4.ebuild,v 1.2 2010/06/01 16:35:30 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.5.4.ebuild,v 1.3 2010/06/19 00:51:03 abcd Exp $
 
 EAPI=3
 
@@ -112,7 +112,7 @@ pkg_postinst() {
 
 	elog "If you want to convert repositories from other tools using convert"
 	elog "extension please install correct tool:"
-	elog "  dev-util/cvs"
+	elog "  dev-vcs/cvs"
 	elog "  dev-vcs/darcs"
 	elog "  dev-vcs/git"
 	elog "  dev-vcs/monotone"
diff --git a/dev-vcs/mercurial/mercurial-1.5.ebuild b/dev-vcs/mercurial/mercurial-1.5.ebuild
index 39ffe6bd0004..7bcfb1417417 100644
--- a/dev-vcs/mercurial/mercurial-1.5.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.5.ebuild,v 1.7 2010/06/03 19:56:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.5.ebuild,v 1.8 2010/06/19 00:51:03 abcd Exp $
 
 EAPI=2
 
@@ -112,7 +112,7 @@ pkg_postinst() {
 
 	elog "If you want to convert repositories from other tools using convert"
 	elog "extension please install correct tool:"
-	elog "  dev-util/cvs"
+	elog "  dev-vcs/cvs"
 	elog "  dev-vcs/darcs"
 	elog "  dev-vcs/git"
 	elog "  dev-vcs/monotone"
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index f7e27b713a08..0b4ec8b61218 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.4 2010/06/07 09:22:55 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.5 2010/06/19 00:51:02 abcd Exp $
 
 EAPI=3
 
@@ -116,7 +116,7 @@ pkg_postinst() {
 
 	elog "If you want to convert repositories from other tools using convert"
 	elog "extension please install correct tool:"
-	elog "  dev-util/cvs"
+	elog "  dev-vcs/cvs"
 	elog "  dev-vcs/darcs"
 	elog "  dev-vcs/git"
 	elog "  dev-vcs/monotone"
diff --git a/dev-vcs/qct/ChangeLog b/dev-vcs/qct/ChangeLog
index a6ea86c0604b..149c209bb498 100644
--- a/dev-vcs/qct/ChangeLog
+++ b/dev-vcs/qct/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/qct
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qct/ChangeLog,v 1.5 2010/06/15 19:25:22 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qct/ChangeLog,v 1.6 2010/06/19 00:54:05 abcd Exp $
+
+  19 Jun 2010; Jonathan Callen <abcd@gentoo.org> qct-1.7.ebuild:
+  Moving dev-util/cvs* to dev-vcs/cvs*
 
   15 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   qct-1.7.ebuild:
diff --git a/dev-vcs/qct/qct-1.7.ebuild b/dev-vcs/qct/qct-1.7.ebuild
index 72e99995c749..126d2069d08e 100644
--- a/dev-vcs/qct/qct-1.7.ebuild
+++ b/dev-vcs/qct/qct-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qct/qct-1.7.ebuild,v 1.5 2010/06/15 19:25:22 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qct/qct-1.7.ebuild,v 1.6 2010/06/19 00:54:05 abcd Exp $
 
 EAPI="2"
 NEED_PYTHON="2.4"
@@ -19,7 +19,7 @@ DEPEND="app-text/asciidoc
 	app-text/xmlto
 	dev-python/PyQt4
 	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-util/cvs )
+	cvs? ( dev-vcs/cvs )
 	mercurial? ( dev-vcs/mercurial )
 	monotone? ( dev-vcs/monotone )
 	subversion? ( dev-util/subversion )"
diff --git a/dev-vcs/statcvs/ChangeLog b/dev-vcs/statcvs/ChangeLog
index d4ab05c6917b..722e14e18009 100644
--- a/dev-vcs/statcvs/ChangeLog
+++ b/dev-vcs/statcvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/statcvs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/statcvs/ChangeLog,v 1.2 2010/06/18 18:50:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/statcvs/ChangeLog,v 1.3 2010/06/19 00:52:37 abcd Exp $
+
+  19 Jun 2010; Jonathan Callen <abcd@gentoo.org> statcvs-0.4.0.ebuild,
+  statcvs-0.4.0-r1.ebuild, statcvs-0.5.0.ebuild:
+  Moving dev-util/cvs* to dev-vcs/cvs*
 
   18 Jun 2010; Pacho Ramos <pacho@gentoo.org> statcvs-0.5.0.ebuild:
   amd64 stable, bug 275182
diff --git a/dev-vcs/statcvs/statcvs-0.4.0-r1.ebuild b/dev-vcs/statcvs/statcvs-0.4.0-r1.ebuild
index 4b900b12831b..e5e1c94dbd19 100644
--- a/dev-vcs/statcvs/statcvs-0.4.0-r1.ebuild
+++ b/dev-vcs/statcvs/statcvs-0.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/statcvs/statcvs-0.4.0-r1.ebuild,v 1.1 2010/03/05 17:50:54 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/statcvs/statcvs-0.4.0-r1.ebuild,v 1.2 2010/06/19 00:52:37 abcd Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc source test"
@@ -27,7 +27,7 @@ DEPEND=">=virtual/jdk-1.4
 	${COMMON_DEPEND}"
 
 RDEPEND=">=virtual/jre-1.4
-	dev-util/cvs
+	dev-vcs/cvs
 	dev-java/jtreemap:0
 	${COMMON_DEPEND}"
 
diff --git a/dev-vcs/statcvs/statcvs-0.4.0.ebuild b/dev-vcs/statcvs/statcvs-0.4.0.ebuild
index 86c4889b4f96..a067da98e919 100644
--- a/dev-vcs/statcvs/statcvs-0.4.0.ebuild
+++ b/dev-vcs/statcvs/statcvs-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/statcvs/statcvs-0.4.0.ebuild,v 1.1 2010/03/05 17:50:54 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/statcvs/statcvs-0.4.0.ebuild,v 1.2 2010/06/19 00:52:37 abcd Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc source test"
@@ -26,7 +26,7 @@ DEPEND=">=virtual/jdk-1.4
 	${COMMON_DEPEND}"
 
 RDEPEND=">=virtual/jre-1.4
-	dev-util/cvs
+	dev-vcs/cvs
 	dev-java/jtreemap:0
 	${COMMON_DEPEND}"
 
diff --git a/dev-vcs/statcvs/statcvs-0.5.0.ebuild b/dev-vcs/statcvs/statcvs-0.5.0.ebuild
index 6099747b0204..76ddf64788f7 100644
--- a/dev-vcs/statcvs/statcvs-0.5.0.ebuild
+++ b/dev-vcs/statcvs/statcvs-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/statcvs/statcvs-0.5.0.ebuild,v 1.2 2010/06/18 18:50:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/statcvs/statcvs-0.5.0.ebuild,v 1.3 2010/06/19 00:52:37 abcd Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc source test"
@@ -27,7 +27,7 @@ DEPEND=">=virtual/jdk-1.4
 	${COMMON_DEPEND}"
 
 RDEPEND=">=virtual/jre-1.4
-	dev-util/cvs
+	dev-vcs/cvs
 	dev-java/jtreemap:0
 	${COMMON_DEPEND}"