Bug #296628: Expand list of tests disabled when CVS is not available.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

31 files changed, 194 insertions, 61 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 55f5d1c0179e..89ca0b4153dd 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,19 @@
 # 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.2 2010/03/24 01:18:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.3 2010/03/24 22:04:28 robbat2 Exp $
+
+  24 Mar 2010; Robin H. Johnson <robbat2@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-9999.ebuild:
+  Bug #296628: Expand list of tests disabled when CVS is not available.
 
 *git-1.7.0.3 (24 Mar 2010)
 
diff --git a/dev-vcs/git/git-1.6.3.1.ebuild b/dev-vcs/git/git-1.6.3.1.ebuild
index 46868fc696b3..31be4d5e9fbd 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.1 2010/03/17 15:13:19 sping Exp $
+# $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 $
 
 EAPI=2
 
@@ -285,7 +285,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.3.3.ebuild b/dev-vcs/git/git-1.6.3.3.ebuild
index 1efb4ccd840a..740c3c44292c 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.1 2010/03/17 15:13:19 sping Exp $
+# $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 $
 
 EAPI=2
 
@@ -285,7 +285,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.3.4.ebuild b/dev-vcs/git/git-1.6.3.4.ebuild
index 1410af354597..bf232867af0c 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.1 2010/03/17 15:13:19 sping Exp $
+# $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 $
 
 EAPI=2
 
@@ -285,7 +285,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.4.1.ebuild b/dev-vcs/git/git-1.6.4.1.ebuild
index 910502f42c9b..8bf4e6ab2e55 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.1 2010/03/17 15:13:19 sping Exp $
+# $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 $
 
 EAPI=2
 
@@ -285,7 +285,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.4.2.ebuild b/dev-vcs/git/git-1.6.4.2.ebuild
index 2d57c946b7b5..9e47b10cea1c 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.1 2010/03/17 15:13:19 sping Exp $
+# $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 $
 
 EAPI=2
 
@@ -285,7 +285,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.4.3.ebuild b/dev-vcs/git/git-1.6.4.3.ebuild
index e1c7b8d8207c..eaad9f2d515c 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.1 2010/03/17 15:13:19 sping Exp $
+# $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 $
 
 EAPI=2
 
@@ -285,7 +285,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.4.4.ebuild b/dev-vcs/git/git-1.6.4.4.ebuild
index e1fd8ed226d9..b7eb050674ed 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.1 2010/03/17 15:13:19 sping Exp $
+# $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 $
 
 EAPI=2
 
@@ -285,7 +285,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.4.ebuild b/dev-vcs/git/git-1.6.4.ebuild
index c6dd6f5b33ce..de30cf06ee19 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -285,7 +285,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
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 58447517428e..9f886698551f 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.1-r1.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -308,7 +308,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.5.1.ebuild b/dev-vcs/git/git-1.6.5.1.ebuild
index 7325c50e4105..6320f90369b8 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.1 2010/03/17 15:13:19 sping Exp $
+# $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 $
 
 EAPI=2
 
@@ -296,7 +296,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.5.2.ebuild b/dev-vcs/git/git-1.6.5.2.ebuild
index 130a7832e77f..36c6faf73792 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.2.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -308,7 +308,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.5.3.ebuild b/dev-vcs/git/git-1.6.5.3.ebuild
index f30de48ff5e2..cdc60fccbf8b 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.3.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -313,7 +313,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.5.4.ebuild b/dev-vcs/git/git-1.6.5.4.ebuild
index 19c98ecabeb6..f5ea8547adf3 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.4.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -313,7 +313,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.5.5.ebuild b/dev-vcs/git/git-1.6.5.5.ebuild
index 8626922d625a..a92e7283c763 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.5.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -313,7 +313,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.5.6.ebuild b/dev-vcs/git/git-1.6.5.6.ebuild
index 88bbcf356838..588f3a632b90 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.6.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -313,7 +313,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.5.7.ebuild b/dev-vcs/git/git-1.6.5.7.ebuild
index d5ead21d6306..f3cfa2c1ffd6 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.7.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -318,7 +318,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.5.8.ebuild b/dev-vcs/git/git-1.6.5.8.ebuild
index 7ce1368c20ca..b94032c4aaff 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.8.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -318,7 +318,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.5.ebuild b/dev-vcs/git/git-1.6.5.ebuild
index ff6192de1df5..62a067313eec 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -296,7 +296,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.5_rc1.ebuild b/dev-vcs/git/git-1.6.5_rc1.ebuild
index e78971e93e54..292da67cc2a3 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.1 2010/03/17 15:13:19 sping Exp $
+# $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 $
 
 EAPI=2
 
@@ -285,7 +285,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.5_rc2.ebuild b/dev-vcs/git/git-1.6.5_rc2.ebuild
index 59e0584789c5..4be9d48e27b9 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.1 2010/03/17 15:13:19 sping Exp $
+# $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 $
 
 EAPI=2
 
@@ -285,7 +285,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.6-r1.ebuild b/dev-vcs/git/git-1.6.6-r1.ebuild
index 59853df95bc1..c64303816f73 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6-r1.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -325,7 +325,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.6-r2.ebuild b/dev-vcs/git/git-1.6.6-r2.ebuild
index 3b8933e02c5f..7e8c196430db 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6-r2.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -325,7 +325,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.6.1.ebuild b/dev-vcs/git/git-1.6.6.1.ebuild
index 568f2541028f..6e2eb70c9200 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6.1.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -325,7 +325,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.6.2.ebuild b/dev-vcs/git/git-1.6.6.2.ebuild
index 6f2e25919e84..1bf6dd8a557f 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6.2.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -325,7 +325,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.6.ebuild b/dev-vcs/git/git-1.6.6.ebuild
index cfa4cbef6a89..52956a1a856d 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -318,7 +318,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.6_rc3.ebuild b/dev-vcs/git/git-1.6.6_rc3.ebuild
index e3d32c8083bb..e40822349ef5 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6_rc3.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -318,7 +318,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.6.6_rc4.ebuild b/dev-vcs/git/git-1.6.6_rc4.ebuild
index ca0bd4ae3d3d..4e5fb092d08e 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6_rc4.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -318,7 +318,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.7.0.3.ebuild b/dev-vcs/git/git-1.7.0.3.ebuild
index b62e2abe01ee..b21722f7ec99 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.1 2010/03/24 01:18:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.0.3.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -325,7 +325,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-1.7.0.ebuild b/dev-vcs/git/git-1.7.0.ebuild
index d3ade7ac12d8..20c7da00321f 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.0.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -325,7 +325,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 9fa252373d35..c2b42152106a 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.1 2010/03/17 15:13:19 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.2 2010/03/24 22:04:28 robbat2 Exp $
 
 EAPI=2
 
@@ -325,7 +325,11 @@ src_test() {
 	local disabled=""
 	local tests_cvs="t9200-git-cvsexportcommit.sh \
 					t9400-git-cvsserver-server.sh \
-					t9600-cvsimport.sh"
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
 	local tests_perl="t5502-quickfetch.sh \
 					t5512-ls-remote.sh \
 					t5520-pull.sh"