From 34b3bbc056b93b826b77cdb25f68864f3bf2962c Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Fri, 1 May 2015 02:25:00 +0200
Subject: [PATCH] git: update to 2.4.0

- split CVS functionality into the -cvs subpkg
- git-perl: move missing man pages
- git-gui: fix short_desc
---
 srcpkgs/git-cvs      |  1 +
 srcpkgs/git/template | 47 +++++++++++++++++++++++++++++++-------------
 2 files changed, 34 insertions(+), 14 deletions(-)
 create mode 120000 srcpkgs/git-cvs

diff --git a/srcpkgs/git-cvs b/srcpkgs/git-cvs
new file mode 120000
index 00000000000..0899c2993da
--- /dev/null
+++ b/srcpkgs/git-cvs
@@ -0,0 +1 @@
+git
\ No newline at end of file
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index c900f87c1a9..cb18d7ebcc6 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for "git"
 pkgname=git
-version=2.3.7
+version=2.4.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-curl --with-expat --with-tcltk
@@ -10,15 +10,15 @@ hostmakedepends="xmlto asciidoc perl python tk"
 makedepends="libressl-devel libcurl-devel expat-devel tk-devel"
 # Required by https://
 depends="ca-certificates"
-replaces="git-docs>=0"
+replaces="git<2.3.7_1"
 short_desc="GIT Tree History Storage Tool"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://git-scm.com/"
 license="GPL-2"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=eb4696943f82ab55be71048d6e640942b78cd179ec501989aff8706b57f6515b
+checksum=b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24
 
-subpackages="git-svn git-perl gitk git-gui"
+subpackages="git-cvs git-svn git-perl gitk git-gui"
 
 post_build() {
 	make ${makejobs} -C Documentation man
@@ -32,20 +32,39 @@ post_install() {
 
 git-perl_package() {
 	noarch=yes
-	depends="git>=${version}_${revision} perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
-	short_desc+=" - perl utilities"
+	replaces="git<2.3.7_1"
+	depends="git-${version}_${revision} perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
+	short_desc+=" - Perl utilities"
 	pkg_install() {
-		for f in add--interactive archimport cvsexportcommit cvsimport \
-			cvsserver difftool difftool--helper relink send-email; do
+		for f in add--interactive archimport difftool difftool--helper \
+			relink send-email; do
 			vmove usr/libexec/git-core/git-${f}
 		done
 		vmove usr/share/perl5
 		vmove usr/share/man/man3
+		vmove usr/share/man/man1/git-archimport.1
+		vmove usr/share/man/man1/git-difftool.1
+		vmove usr/share/man/man1/git-relink.1
+		vmove usr/share/man/man1/git-send-email.1
+	}
+}
+git-cvs_package() {
+	noarch=yes
+	depends="git-perl-${version}_${revision} cvs cvsps2 perl-DBD-SQlite"
+	short_desc+=" - CVS support"
+	pkg_install() {
+		vmove usr/bin/git-cvsserver
+		vmove usr/libexec/git-core/git-cvsexportcommit
+		vmove usr/libexec/git-core/git-cvsimport
+		vmove usr/libexec/git-core/git-cvsserver
+		vmove usr/share/man/man1/git-cvsexportcommit.1
+		vmove usr/share/man/man1/git-cvsimport.1
+		vmove usr/share/man/man1/git-cvsserver.1
 	}
 }
 git-svn_package() {
-	depends="git-perl>=${version}_${revision} subversion-perl perl-Term-ReadKey"
-	short_desc+=" - subversion support"
+	depends="git-perl-${version}_${revision} subversion-perl perl-Term-ReadKey"
+	short_desc+=" - Subversion support"
 	pkg_install() {
 		vmove "usr/share/perl5/vendor_perl/Git/SVN*"
 		vmove usr/libexec/git-core/git-remote-testsvn
@@ -56,7 +75,7 @@ git-svn_package() {
 }
 gitk_package() {
     noarch=yes
-    depends="git>=${version}_${revision} tk"
+    depends="git-${version}_${revision} tk"
     short_desc="The Git repository browser"
     pkg_install() {
         vmove usr/bin/gitk
@@ -66,12 +85,12 @@ gitk_package() {
 }
 git-gui_package() {
     noarch=yes
-    depends="git>=${version}_${revision} tk"
-    short_desc+="A portable graphical interface to Git"
+    depends="git-${version}_${revision} tk"
+    short_desc+=" - GUI tool"
     pkg_install() {
         vmove usr/libexec/git-core/git-gui--askpass
         vmove usr/libexec/git-core/git-gui
         vmove usr/share/man/man1/git-gui.1
-        vmove usr/share/git-gui/
+        vmove usr/share/git-gui
     }
 }