Added new nocvs patch to fix bug #508600

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 418 insertions, 5 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 7e978560168c..8756c7e3457d 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.257 2014/04/09 23:59:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.258 2014/04/25 10:47:14 polynomial-c Exp $
+
+  25 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> git-9999-r3.ebuild,
+  +files/git-2.0.0_rc0-optional-cvs.patch:
+  Added new nocvs patch to fix bug #508600.
 
 *git-1.9.2 (10 Apr 2014)
 *git-1.8.4.4 (10 Apr 2014)
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index d13113a74f00..391619cd6c06 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 50git-gentoo.el 472 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3 WHIRLPOOL 887682f79182f6728af3c0fd2ee0e81319d49761a987559684be5e4acae4af579a5b8d1197ddba31452cec179de3c8f5784cc85ad61f78b400e42c204c93f642
 AUX git-1.7.12-optional-cvs.patch 11683 SHA256 4ffbbef802c60315740820491c25eaa57e1bba2c74cb5b2f7115b9c28b31d1bf SHA512 9f0af51636d95f78e6708dd2612aeaa8e439308a0537035019ae85a53ee124d73c74380e48706ef718666041e37d721d5ad1c224f902e3e0f88bf16214f6cfed WHIRLPOOL abebd47297245d8da9a28bd5454b6e54c5d16fb0757d099704f6fd7abeac67d2837bc6893bc7bc06145adf9ebc967871a4eec1a86924671b4b04c0b0d72742ed
 AUX git-1.8.2-optional-cvs.patch 11737 SHA256 37e092ca2dfa3ec216df568c1439acb3bdcc7366b75feb092f39642fc5894ce4 SHA512 7f914f16efee2f81a6f42a0e7ff1d72094bf032e98fa1a22f4b1e848eebf3a056ccdea1c84b24310cff4f19737b336d79a4f9c098a0ac4b0556e1a74708ef870 WHIRLPOOL d5e66fbfe0a6ae6c956ffb886d66c7a7906a3d60eac43b87d1e40206197f58d9aed54ee57cf5bb592147b7b9ac50fe50996f3b7e94161e5e308567c3a108cf43
@@ -7,6 +10,7 @@ AUX git-1.8.5-mw-destdir.patch 1138 SHA256 4f9684b14b93ceae0426cf0ba9a3970c15f63
 AUX git-1.8.5-mw-vendor.patch 1160 SHA256 e613f8874beec8d11644ad8d12c43cccb6585f96e99485d7d8ead6618321e8c0 SHA512 6513104f28eff36c18840f90e56fb21e8e04055e4e9a304ef15e5d7e1c13c8b45c4be0380b7781e776ce3b8ee9f7371ed2200e01174cc257125a613aef43ac9b WHIRLPOOL 6a5dcb28dc40590cf4e4b1369b0d770b40f1060bf933366f252edafbb9781f39d7f46dc218c16d429f507c7d5a9479bafce2df7309178071bcb782095809ed69
 AUX git-1.8.5-optional-cvs.patch 10088 SHA256 a35732c6d3bfbe62b298a730652a85f7deac6bdd59bd842b4dddedaa6ad0f1fb SHA512 f78f82af4e51002553157e61a16fb9855743acaa9cd9b9914e047eb3ff7f7fc4aa2d89e9c7f86fb6bf9d3f5854e44519c72669c6436132c728b28a4599d184f1 WHIRLPOOL f8080b56bff0c1add20d9c3c3e2b842e351029cae02e147307260a6504de4300d01262176c03203259037e6f98ffb043e1e1b4a914b1110d666b30383ead2e24
 AUX git-1.9.0_rc3-optional-cvs.patch 11798 SHA256 3ebd298202ef9877114abbfdfccba20b28a8ab01958828079e0b2adf77525aa3 SHA512 308fd4d00803b30e2307d8665f5a5d0a6f2e2022ba462876afea35eb2ebb246ef8d82671467e2ad1744c981d523a156d5825deceaca28f17e43604695edecc60 WHIRLPOOL c4413f0233fcf41463a2ee73567a0743c436c17d14186f1c04fd78eafb38eaba95f685db2824867b6c0e900b4657cf847de5f46fa8136b40f0a0fcdad23122af
+AUX git-2.0.0_rc0-optional-cvs.patch 11711 SHA256 be659e46b51f400c1c52b1d571a9e4313e5550d00763a15139f6230af0af8560 SHA512 121d2fd3d078f5e06bdae176ac235a51f0b3a8540989cf44e3f17276a013f30b1b88c9b71884d4607b0f42f22274220c576aabbf128183f646f6640af70c8d73 WHIRLPOOL 83a5e4898eddbbd9037b91ca59301884626e8cf27b20ce9b54366a4f8fba62138c52d055640759d87c21996ffa50d70b7304766ab10d213ab17e4f873202b7f7
 AUX git-daemon-r1.initd 485 SHA256 421e68201619bfbf7535d8b1a0030390b7ffab998e025f7cbd7e879c677c2819 SHA512 cd1635bf8bbd39e93d5fd44a7c3f46ad01a57894525da4d8cf05c1d2099bd0dd80440e67eb73848fe26d0442361bef9e551f5180139f46f3c65ca6c9bb739072 WHIRLPOOL c8a14e7c49d03f4c4b189a234fbd991deedf1b8f378f6bdaded8b95060f6f6a8b78f3d5bbe19fa49c1b263ed25ee0a3a9afc8ccec38af801ace207a08d8e6e35
 AUX git-daemon.confd 712 SHA256 9bf02170dcf73e930a992adf44326ed7c27159d41a503ca4d9371861ee5030c9 SHA512 bf715ce0d3cd6a5be405d7739bc06252b95f93f9874716dadf666d33063be6ab3e37ae1ee253ed291bfb4f66df268b44d9653672851e1bb40112c0aae08fc4ea WHIRLPOOL 13643f53cd2f9675867ff194d680cd8ffe91bccbd0b15ae41b45471ec7310c09af8335619ff2a1562a835d8449eb44f9a9e9453c3ba15005763497c668d59181
 AUX git-daemon.initd 738 SHA256 48e7e1228c9811079dce8fecc560000cf645de5b4bb697f8f8ad3f906906330b SHA512 2b1cff1e1bf85db1674bd130639a7557fd4bb1ee2e9b2e7d1e2dc28274b6fa6c6c150acf37d0e652173980c640cb0f7ac36332012182955ecc4d21c6258bfd4d WHIRLPOOL c47dd7d0f3b183e14f3ca4e499b1ceef0b88f11675c7f6dee225516f062f556bfd41aa7f87d6cdf490411101ae541ab5fe173069dbfab6b1473a2b3d951ce901
@@ -56,8 +60,25 @@ EBUILD git-1.9.1.ebuild 18331 SHA256 917144afdb6c4d630b6f12053e6573b0f52e1a3b25c
 EBUILD git-1.9.2.ebuild 18331 SHA256 88b5163edf05f203ce88584de8f90c78f73c22e743751b8aa60cd16151082b07 SHA512 f347e54b89472615f8c7ecd46c3db9e4fd94404f954a988594c37c6305b1a81af2f76aad12c007ddcac5d6d90c58f07609ab324984e0f300320f3d0d771cff72 WHIRLPOOL 62f52622d149af1cc05ef1cc65916b482c0ad0ee90c069b98ac2fe5bbc42478fe9b46be17b42536a0daab774a160c537c0e93a01bde57e7d97ff25c8b3ed2677
 EBUILD git-9999-r1.ebuild 18351 SHA256 0b619797d439af7a9911a00cff0b08d11baceefbce731e049d503520bc35cec8 SHA512 ff1354eb6183d7dd487ad7181b38b68592e01b3d3223efe6fa069cd10a25047e9003771d3b63ce5fb8f6e83daa4aeadcc75d6695e1a6359ff8e609d65e4d2381 WHIRLPOOL 02e58bce26e71bbebdd05895f3655624b7c10073f5a8572c73880cef1916b6b887e69e09adf0f952391f40f9662955bbdd390e6dd281b1046cad47a2acbca4fa
 EBUILD git-9999-r2.ebuild 18350 SHA256 64886b9c2a7c7071372d705519e74e1e37d81e693142e0dcff0c8d3e870f6f7d SHA512 3337e7f6289680a0c77540d80c68a95e8bcd100d68eacfc6c460d63d8f64af20533de61f19808ec5ae9e4375d9194f9baccaf115dbf9e6fbe7b1df49b9ce16d3 WHIRLPOOL 4c21230ac25034862756293062553afbde045f3dcc8a559d0806f75ee687266c41e99428b0775bab52ea775ed35351adc205479472fe8e13456d7c821201646a
-EBUILD git-9999-r3.ebuild 18348 SHA256 c0c58a1a5bce4778a24f432b97cdc1a391d666b7a4f108bf955ec37506e5448b SHA512 2426268f2a56bedf6f2d44672b1494265bf319205ef54b50a77ff20481aab612319fc76705cb9fd4f28b4ee8f74fd667f94e0a215d210a498f3e6274e1659cb7 WHIRLPOOL b296607eca4c9342f2e74ef4cf719687484ae41a505b172865d7ee7db4e79b5383d966d316daac8f97a6a709d66f1f31f1fcbae52bd50d9c5698f6b64bd54642
+EBUILD git-9999-r3.ebuild 18353 SHA256 ffa7eb06ec8d294f67c4a86e689d7e253cc971890afa169249a27b03558ff352 SHA512 103a7d889d8dfe011759be8919037b8640ab0099900480beb8c1bba25c58bfe6a9bfa96d7e25c21347b4d1a5a7541c769928e093334fcba4127d329d92f8e404 WHIRLPOOL 866b3f4d81df7b10485ae8851b5e0961e0cacffd3456aa27cbd90c148c1ec5bcb7de7f4b9b60b766ae8a4079c9eeb54d2923c10853311198dd5a244a2d089b5d
 EBUILD git-9999.ebuild 18350 SHA256 90cad2eaf6bd0558996331210c9de028d4ad81d9b2e374cb2868db7311972b01 SHA512 dc8011ebf3fae80a93d7c91641b847ff66e11a9eac36dd4dec782de10bb47f8c8520b658ff088d75bf005d15073d5177284b6b5992d0aaa4fcfff9b807852414 WHIRLPOOL 128e9cfab049d362471d17510ffe2ff4cfd580cb22af65048234adfa17d2776f5e7224ddd0462d13e5829778b86b6e72a166c4c31618093603d5d736c4d64ad7
-MISC ChangeLog 14640 SHA256 93e5716b0507feccca7491368318d70253258477da99b1847df3cb3591829941 SHA512 33bf68b1b61093c8e9369136a68137d26db31dc4ba812ddc73409f75ef7d0b697c7b74b763254c11b2e4e3a4affb63925d068296f2cec8247caf3d5ff4950b30 WHIRLPOOL d7350b8dd141c5abdcd140ac6fb65ee3d831502b5989dda174282fcf01c9abf9a62c90809e8aa8f2bc9db640218c79836e8f8f46a9357daa4bd66ac340d0a52b
+MISC ChangeLog 14807 SHA256 f80334ab975dcb500c93f9db8ade43903afd9b61b6b4a47d2f393273748130ff SHA512 6dcf9d346c276c71fe3d713012ab7b656d95f4dbe416f3aae547481214b1313c0bd8ac5986b4afc47ad387cc5a34a19ede025601cbacebcb4ee19b592e0776f2 WHIRLPOOL 0b6334835c8b9b6e6bd3e7648c7debd46d03a6d37596d404ed8e7289f7dfb258a8838767353f391025bc182e50fd21cb14b7073b5328cea40f65fcb367021a82
 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
 MISC metadata.xml 1877 SHA256 74e93a953d9484c1f5806efc9c80bfa729b4d53415a00168e5ffec255750f7bd SHA512 3ef0d74206f67c27b82cefa40602cd33e432cc0f06ce900766d32f1ebd0a71d6cfa750ae77660531fc61a1117f7959d7df6ec10f439cfa2ee372d54d7ac87c5c WHIRLPOOL b9d97eb6b92a1894d965a5e9fbfbfd0d64625b31318fab2eb11b4dcb331133dbf678f62a7216c12b53a2546fa5d6a07c6240bddfa7784a925eafed602a7ffa75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJTWj00AAoJEPiazRVxLXTFioYP+wYOXk5p53xjaN4kk/Foa11x
+h9Vq3ZgE7QIDu+ZO4+qvjzjbAy3G1Bsg1x9alUFUeiesPtUIfpxI9Q2JRIcY4Qc7
+p93ug6xiO10V4rd2ApD4ome1WBKPP43h7udssd9tWUU0O/CFTeC5aIXYOTIt6QvD
+KPG63xHoIxFhQsCiXDoclySMryoLVkGyJ3Povkpbj/dqg5kUQemLtBc5rhUxTEWo
+3hNmeUF225MM1JNUm0lG1qltyxou9Tz/Qe2RWUSJyE0MA7d9a7tJmll0U5mXZyya
+56Pp9zxKmA8Sehhm2WLm1w5PPcn8p3LElZZi+HWh9CwmN4t7EuXCVICsIpcX77wx
+XDdrqvZYnjEp4FX2zLEHuIxbIdstBc1GW9+/6g/bRgP1M6ksNx7CSxTDdTFwI6iP
+LMqxPdCp+vWsZC7IJqeQndvaoPxJETrl7oKQaiHfwmGgtT6NElx9HVyn1ustjnmc
+AT63jN9h0Zpqhzj/feRHaXpyASf9lBWZtIgKx24i7653olff8oCiyF3KRV9CpYpH
+YuyqLcw/7gEUCAbpkeLA+8qgZbvdxyy+BDDa3t8wgsEFlBSVMP78ntj6t3gr9mKA
+F3ZZLBC+bkSdRl+/6FDUW2/aATM/Xxw1eANJCwOBSWKGgndoW8t1GGCVUxcoT+6P
+jhVUlWS72n6mRY7A7VVM
+=cN/J
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/files/git-2.0.0_rc0-optional-cvs.patch b/dev-vcs/git/files/git-2.0.0_rc0-optional-cvs.patch
new file mode 100644
index 000000000000..e35cee1d3fca
--- /dev/null
+++ b/dev-vcs/git/files/git-2.0.0_rc0-optional-cvs.patch
@@ -0,0 +1,388 @@
+From e19ad5a8492d83db79a09b459cb17ccee78e0001 Mon Sep 17 00:00:00 2001
+From: Robin Johnson <robbat2@gentoo.org>
+Date: Fri, 25 Apr 2014 12:30:42 +0200
+Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
+ utilities
+
+Forward-ported from 1.7.12 to current git.git v1.8.4
+Forward-ported from v1.8.4 to v1.8.5.1
+Forward-ported from v1.8.5.3 to v1.9.0_rc3
+Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+diff --git a/Makefile b/Makefile
+index a5e06dd..7813c5d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -263,6 +263,8 @@ all::
+ #
+ # Define NO_TCLTK if you do not want Tcl/Tk GUI.
+ #
++# Define NO_CVS if you do not want any CVS interface utilities.
++#
+ # The TCL_PATH variable governs the location of the Tcl interpreter
+ # used to optimize git-gui for your system.  Only used if NO_TCLTK
+ # is not set.  Defaults to the bare 'tclsh'.
+@@ -452,6 +454,7 @@ LIB_OBJS =
+ PROGRAM_OBJS =
+ PROGRAMS =
+ SCRIPT_PERL =
++SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -491,13 +494,14 @@ SCRIPT_LIB += git-sh-i18n
+ SCRIPT_PERL += git-add--interactive.perl
+ SCRIPT_PERL += git-difftool.perl
+ SCRIPT_PERL += git-archimport.perl
+-SCRIPT_PERL += git-cvsexportcommit.perl
+-SCRIPT_PERL += git-cvsimport.perl
+-SCRIPT_PERL += git-cvsserver.perl
+ SCRIPT_PERL += git-relink.perl
+ SCRIPT_PERL += git-send-email.perl
+ SCRIPT_PERL += git-svn.perl
+ 
++SCRIPT_PERL_CVS += git-cvsexportcommit.perl
++SCRIPT_PERL_CVS += git-cvsimport.perl
++SCRIPT_PERL_CVS += git-cvsserver.perl
++
+ SCRIPT_PYTHON += git-p4.py
+ SCRIPT_PYTHON += git-remote-hg.py
+ SCRIPT_PYTHON += git-remote-bzr.py
+@@ -506,7 +510,7 @@ NO_INSTALL += git-remote-testgit
+ 
+ # Generated files for scripts
+ SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
+-SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
++SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS))
+ SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
+ 
+ SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
+@@ -1830,8 +1834,18 @@ git.res: git.rc GIT-VERSION-FILE
+ 	  $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
+ 	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
+ 
++_SCRIPT_PERL_BUILD = 
++_SCRIPT_PERL_NOBUILD = 
++
+ ifndef NO_PERL
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
++
++_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
++
++ifndef NO_CVS
++_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
++else # NO_CVS
++_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
++endif # NO_CVS
+ 
+ perl/perl.mak: perl/PM.stamp
+ 
+@@ -1847,7 +1861,7 @@ $(eval $(call make-var,PERL-DEFINES,perl-specific parameters,\
+ 	:$(PERL_PATH)\
+ 	:$(PERLLIB_EXTRA)\
+ ))
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak MAKE/PERL-DEFINES GIT-VERSION-FILE
++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl perl/perl.mak MAKE/PERL-DEFINES GIT-VERSION-FILE
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
+ 	INSTLIBDIR_EXTRA=$(call sq,$(PERLLIB_EXTRA)) && \
+@@ -1874,14 +1888,17 @@ git-instaweb: git-instaweb.sh MAKE/SCRIPT-DEFINES
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+ else # NO_PERL
+-$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
++_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
++endif # NO_PERL
++
++# This is any perl scripts that were disabled it might be empty...
++$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	sed -e '1s|#!.*/sh|#!$(call sqi,$(SHELL_PATH))|' \
+ 	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
+ 	    unimplemented.sh >$@+ && \
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+-endif # NO_PERL
+ 
+ ifndef NO_PYTHON
+ $(eval $(call make-var,PYTHON-VARS,Python interpreter location,$(PYTHON_PATH)))
+diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
+index 812c9cd..906532a 100755
+--- a/t/t9200-git-cvsexportcommit.sh
++++ b/t/t9200-git-cvsexportcommit.sh
+@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then
+ 	test_done
+ fi
+ 
++if ! test_have_prereq CVS; then
++	skip_all='skipping git cvsexportcommit tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
+index 6146c3f..2a675e3 100755
+--- a/t/t9400-git-cvsserver-server.sh
++++ b/t/t9400-git-cvsserver-server.sh
+@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server'
+ . ./test-lib.sh
+ 
+ if ! test_have_prereq PERL; then
+-	skip_all='skipping git cvsserver tests, perl not available'
++	skip_all='skipping git-cvsserver tests, perl not available'
+ 	test_done
+ fi
++
++if ! test_have_prereq CVS; then
++	skip_all='skipping git-cvsserver tests, cvs not available'
++	test_done
++fi
++
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
+index 5a4ed28..04814cb 100755
+--- a/t/t9401-git-cvsserver-crlf.sh
++++ b/t/t9401-git-cvsserver-crlf.sh
+@@ -57,15 +57,20 @@ check_status_options() {
+     return $stat
+ }
+ 
+-cvs >/dev/null 2>&1
+-if test $? -ne 1
++if ! test_have_prereq PERL
+ then
+-    skip_all='skipping git-cvsserver tests, cvs not found'
++    skip_all='skipping git-cvsserver tests, perl not available'
+     test_done
+ fi
+-if ! test_have_prereq PERL
++if ! test_have_prereq CVS
+ then
+-    skip_all='skipping git-cvsserver tests, perl not available'
++    skip_all='skipping git-cvsserver tests, cvs not available'
++    test_done
++fi
++cvs >/dev/null 2>&1
++if test $? -ne 1
++then
++    skip_all='skipping git-cvsserver tests, cvs not found'
+     test_done
+ fi
+ perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
+index 4c384ff..d601f32 100755
+--- a/t/t9600-cvsimport.sh
++++ b/t/t9600-cvsimport.sh
+@@ -3,14 +3,25 @@
+ test_description='git cvsimport basic tests'
+ . ./lib-cvs.sh
+ 
+-test_expect_success PERL 'setup cvsroot environment' '
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
++test_expect_success 'setup cvsroot environment' '
+ 	CVSROOT=$(pwd)/cvsroot &&
+ 	export CVSROOT
+ '
+ 
+-test_expect_success PERL 'setup cvsroot' '$CVS init'
++test_expect_success 'setup cvsroot' '$CVS init'
+ 
+-test_expect_success PERL 'setup a cvs module' '
++test_expect_success 'setup a cvs module' '
+ 
+ 	mkdir "$CVSROOT/module" &&
+ 	$CVS co -d module-cvs module &&
+@@ -42,23 +53,23 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'import a trivial module' '
++test_expect_success 'import a trivial module' '
+ 
+ 	git cvsimport -a -R -z 0 -C module-git module &&
+ 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
+ 
+ '
+ 
+-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
++test_expect_success 'pack refs' '(cd module-git && git gc)'
+ 
+-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
++test_expect_success 'initial import has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 	(cd module-cvs &&
+ 	cat <<EOF >o_fortuna &&
+ O Fortune,
+@@ -86,7 +97,7 @@ EOF
+ 	)
+ '
+ 
+-test_expect_success PERL 'update git module' '
++test_expect_success 'update git module' '
+ 
+ 	(cd module-git &&
+ 	git config cvsimport.trackRevisions true &&
+@@ -97,7 +108,7 @@ test_expect_success PERL 'update git module' '
+ 
+ '
+ 
+-test_expect_success PERL 'update has correct .git/cvs-revisions' '
++test_expect_success 'update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
+@@ -105,7 +116,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
++test_expect_success 'update cvs module' '
+ 
+ 	(cd module-cvs &&
+ 		echo 1 >tick &&
+@@ -114,7 +125,7 @@ test_expect_success PERL 'update cvs module' '
+ 	)
+ '
+ 
+-test_expect_success PERL 'cvsimport.module config works' '
++test_expect_success 'cvsimport.module config works' '
+ 
+ 	(cd module-git &&
+ 		git config cvsimport.module module &&
+@@ -126,7 +137,7 @@ test_expect_success PERL 'cvsimport.module config works' '
+ 
+ '
+ 
+-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
++test_expect_success 'second update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
+@@ -135,7 +146,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' '
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'import from a CVS working tree' '
++test_expect_success 'import from a CVS working tree' '
+ 
+ 	$CVS co -d import-from-wt module &&
+ 	(cd import-from-wt &&
+@@ -148,12 +159,12 @@ test_expect_success PERL 'import from a CVS working tree' '
+ 
+ '
+ 
+-test_expect_success PERL 'no .git/cvs-revisions created by default' '
++test_expect_success 'no .git/cvs-revisions created by default' '
+ 
+ 	! test -e import-from-wt/.git/cvs-revisions
+ 
+ '
+ 
+-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
++test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
+ 
+ test_done
+diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
+index 827d39f..d730a41 100755
+--- a/t/t9601-cvsimport-vendor-branch.sh
++++ b/t/t9601-cvsimport-vendor-branch.sh
+@@ -34,6 +34,17 @@
+ test_description='git cvsimport handling of vendor branches'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9601
+ 
+ test_expect_success PERL 'import a module with a vendor branch' '
+diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
+index e1db323..68f0974 100755
+--- a/t/t9602-cvsimport-branches-tags.sh
++++ b/t/t9602-cvsimport-branches-tags.sh
+@@ -6,6 +6,17 @@
+ test_description='git cvsimport handling of branches and tags'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9602
+ 
+ test_expect_success PERL 'import module' '
+diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
+index 52034c8..db4d682 100755
+--- a/t/t9603-cvsimport-patchsets.sh
++++ b/t/t9603-cvsimport-patchsets.sh
+@@ -14,6 +14,17 @@
+ test_description='git cvsimport testing for correct patchset estimation'
+ . ./lib-cvs.sh
+ 
++if ! test_have_prereq PERL
++then
++    skip_all='skipping git cvsimport tests, perl not available'
++    test_done
++fi
++if ! test_have_prereq CVS
++then
++    skip_all='skipping git cvsimport tests, cvs not available'
++    test_done
++fi
++
+ setup_cvs_test_repository t9603
+ 
+ test_expect_failure 'import with criss cross times on revisions' '
+diff --git a/t/test-lib.sh b/t/test-lib.sh
+index 831a2fe..4ae9fee 100644
+--- a/t/test-lib.sh
++++ b/t/test-lib.sh
+@@ -889,6 +889,7 @@ case $(uname -s) in
+ esac
+ 
+ ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
++test -z "$NO_CVS" && test_set_prereq CVS
+ test -z "$NO_PERL" && test_set_prereq PERL
+ test -z "$NO_PYTHON" && test_set_prereq PYTHON
+ test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
+-- 
+1.9.2
+
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index f002bf623c37..f25dc081c58f 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.1 2014/02/22 02:07:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.2 2014/04/25 10:47:14 polynomial-c Exp $
 
 EAPI=5
 
@@ -225,7 +225,7 @@ src_unpack() {
 
 src_prepare() {
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-1.9.0_rc3-optional-cvs.patch
+	epatch "${FILESDIR}"/git-2.0.0_rc0-optional-cvs.patch
 
 	# install mediawiki perl modules also in vendor_dir
 	# hack, needs better upstream solution