* [gentoo-commits] dev/dilfridge:master commit in: dev-vcs/git/, dev-vcs/git/files/
@ 2014-01-04 19:55 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2014-01-04 19:55 UTC (permalink / raw
To: gentoo-commits
commit: fbc84bdfc33665ed20e6d164cf5398825c2e35b2
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 4 19:51:55 2014 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 4 19:56:24 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=fbc84bdf
[dev-vcs/git] copy from main tree
---
dev-vcs/git/ChangeLog | 288 +++
dev-vcs/git/ChangeLog-2012 | 2705 ++++++++++++++++++++
dev-vcs/git/Manifest | 61 +
dev-vcs/git/files/50git-gentoo.el | 13 +
.../git/files/git-1.7.12-git-svn-backport.patch | 1288 ++++++++++
dev-vcs/git/files/git-1.7.12-optional-cvs.patch | 368 +++
dev-vcs/git/files/git-1.8.2-optional-cvs.patch | 369 +++
dev-vcs/git/files/git-1.8.2-texinfo.patch | 19 +
dev-vcs/git/files/git-1.8.4-optional-cvs.patch | 370 +++
dev-vcs/git/files/git-1.8.5-optional-cvs.patch | 362 +++
dev-vcs/git/files/git-daemon.confd | 19 +
dev-vcs/git/files/git-daemon.initd | 30 +
dev-vcs/git/files/git-daemon.socket | 9 +
dev-vcs/git/files/git-daemon.xinetd | 13 +
dev-vcs/git/files/git-daemon_at.service | 13 +
dev-vcs/git/git-1.8.1.5-r1.ebuild | 600 +++++
dev-vcs/git/git-1.8.1.5.ebuild | 598 +++++
dev-vcs/git/git-1.8.2.1.ebuild | 610 +++++
dev-vcs/git/git-1.8.3.2-r1.ebuild | 614 +++++
dev-vcs/git/git-1.8.4.5.ebuild | 619 +++++
dev-vcs/git/git-1.8.5.1.ebuild | 619 +++++
dev-vcs/git/git-1.8.5.2.ebuild | 619 +++++
dev-vcs/git/git-9999.ebuild | 618 +++++
dev-vcs/git/metadata.xml | 40 +
24 files changed, 10864 insertions(+)
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
new file mode 100644
index 0000000..ab73814
--- /dev/null
+++ b/dev-vcs/git/ChangeLog
@@ -0,0 +1,288 @@
+# ChangeLog for dev-vcs/git
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.236 2013/12/18 12:19:15 polynomial-c Exp $
+
+*git-1.8.5.2 (18 Dec 2013)
+
+ 18 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> +git-1.8.5.2.ebuild:
+ Version bump.
+
+ 11 Dec 2013; Sergey Popov <pinkbyte@gentoo.org> git-1.8.3.2-r1.ebuild:
+ Stable on arm, wrt bug #480306
+
+ 11 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> git-1.8.1.5.ebuild,
+ git-1.8.1.5-r1.ebuild, git-1.8.2.1.ebuild, git-1.8.3.2-r1.ebuild,
+ git-1.8.4.5.ebuild, git-1.8.5.1.ebuild, git-9999.ebuild:
+ Added t9402-git-cvsserver-refs.sh and t9604-cvsimport-timestamps.sh to the
+ cvs-only tests (bug #492556).
+
+ 09 Dec 2013; Mikle Kolyada <zlogene@gentoo.org> git-1.8.3.2-r1.ebuild:
+ ia64 stable wrt bug #480306
+
+ 07 Dec 2013; Johannes Huber <johu@gentoo.org> git-1.8.3.2-r1.ebuild:
+ x86 stable, bug #480306
+
+ 06 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> git-1.8.1.5.ebuild,
+ git-1.8.1.5-r1.ebuild, git-1.8.2.1.ebuild, -git-1.8.3.2.ebuild,
+ -git-1.8.4.ebuild, -git-1.8.4.2.ebuild, -git-1.8.4.3.ebuild,
+ -git-1.8.4.4.ebuild:
+ Fixed remaining ebuilds who suffer from bug #485166. Removed some older
+ versions.
+
+ 05 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> git-9999.ebuild:
+ Added changes to live ebuild.
+
+*git-1.8.5.1 (05 Dec 2013)
+
+ 05 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> -git-1.6.4.5.ebuild,
+ -git-1.7.2.5.ebuild, -git-1.7.3.4-r1.ebuild, -git-1.7.8.6.ebuild,
+ -git-1.7.12.4.ebuild, -git-1.8.0.2.ebuild, +git-1.8.5.1.ebuild,
+ -files/git-1.6.6.1-interix6.patch, -files/git-1.7.1-interix.patch,
+ -files/git-1.7.2-always-install-js.patch, -files/git-1.7.3.2-interix.patch,
+ -files/git-1.7.3.4-avoid-shell-issues.patch,
+ -files/git-1.7.3.4-fix-perl-test-prereq.patch,
+ -files/git-1.7.3.5-optional-cvs.patch, -files/git-1.7.11-optional-cvs.patch,
+ +files/git-1.8.5-optional-cvs.patch, metadata.xml:
+ Version bump. Removed old.
+
+*git-1.8.4.5 (04 Dec 2013)
+
+ 04 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> +git-1.8.4.5.ebuild:
+ Version bump (bug #493348).
+
+*git-1.8.4.4 (21 Nov 2013)
+
+ 21 Nov 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.4.4.ebuild:
+ Bump.
+
+ 09 Nov 2013; Pacho Ramos <pacho@gentoo.org> git-1.8.3.2-r1.ebuild:
+ amd64 stable, bug #480306
+
+*git-1.8.4.3 (09 Nov 2013)
+
+ 09 Nov 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.4.3.ebuild:
+ Bump.
+
+ 06 Nov 2013; Patrick Lauer <patrick@gentoo.org> git-1.8.3.2-r1.ebuild:
+ Un-stabling for amd64 as dependencies are not ready
+
+ 05 Nov 2013; Mikle Kolyada <zlogene@gentoo.org> git-1.8.3.2-r1.ebuild:
+ amd64 stable wrt bug #480306
+
+ 03 Nov 2013; Matt Turner <mattst88@gentoo.org> git-1.8.3.2-r1.ebuild:
+ alpha stable, bug 480306.
+
+ 03 Nov 2013; Matthew Thode <prometheanfire@gentoo.org> metadata.xml:
+ just adding myself to the list of maintianers
+
+ 01 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> metadata.xml:
+ Added myself as maintainer.
+
+*git-1.8.4.2 (28 Oct 2013)
+
+ 28 Oct 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.4.2.ebuild:
+ Bump.
+
+ 20 Oct 2013; Fabian Groffen <grobian@gentoo.org> git-1.8.4.ebuild,
+ git-9999.ebuild:
+ Fix sed expression not to be too greedy, bug #488440
+
+ 17 Oct 2013; Jeroen Roovers <jer@gentoo.org> git-1.8.3.2-r1.ebuild:
+ Stable for HPPA (bug #480306).
+
+*git-1.8.3.2-r1 (15 Oct 2013)
+
+ 15 Oct 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.3.2-r1.ebuild:
+ Backport fixes for bug #477096: Fix git-remote-bzr file collision & bug
+ #479628: Fix pthread usage to 1.8.3.
+
+*git-1.8.4 (15 Oct 2013)
+
+ 15 Oct 2013; Robin H. Johnson <robbat2@gentoo.org>
+ +files/git-1.8.4-optional-cvs.patch, +git-1.8.4.ebuild, git-9999.ebuild:
+ Bug #485844: Bump. Bug #477096: Fix git-remote-bzr file collision. Bug
+ #479628: Fix pthread usage.
+
+ 15 Oct 2013; Mikle Kolyada <zlogene@gentoo.org> git-1.8.1.5-r1.ebuild:
+ x86 stable wrt bug #480054
+
+ 14 Oct 2013; Tony Vroon <chainsaw@gentoo.org> git-1.8.1.5-r1.ebuild:
+ Marked stable on AMD64 based on arch tester report by Elijah "Armageddon" El
+ Lazkani in bug #480054.
+
+ 07 Oct 2013; William Hubbs <williamh@gentoo.org> git-9999.ebuild:
+ sync live ebuild
+
+ 07 Oct 2013; Rick Farina <zerochaos@gentoo.org> git-1.8.3.2.ebuild:
+ changing dep to make error message more useful because earlier version of dev-
+ python/pygtksourceview:2 have no []
+
+ 06 Oct 2013; Jeroen Roovers <jer@gentoo.org> git-1.8.1.5-r1.ebuild:
+ Stable for HPPA (bug #480054).
+
+ 06 Oct 2013; Markus Meier <maekke@gentoo.org> git-1.8.1.5-r1.ebuild:
+ arm stable, bug #480054
+
+*git-1.8.1.5-r1 (28 Sep 2013)
+
+ 28 Sep 2013; Pacho Ramos <pacho@gentoo.org> +git-1.8.1.5-r1.ebuild:
+ Backport unit files to allow faster stabilization
+
+ 16 Sep 2013; Michał Górny <mgorny@gentoo.org> git-1.8.3.2.ebuild,
+ git-9999.ebuild:
+ Use ${PYTHON} rather than $(python_get_PYTHON). It is exported anyway.
+
+ 31 Jul 2013; Matt Turner <mattst88@gentoo.org> git-1.8.3.2.ebuild,
+ git-9999.ebuild:
+ Allow building against >=dev-lang/perl-5.16 without 'build' in IUSE.
+
+ 26 Jul 2013; William Hubbs <williamh@gentoo.org> git-9999.ebuild:
+ non-maintainer commit: sync live ebuild with git-1.8.3.2.
+
+ 15 Jul 2013; Jonathan Callen <abcd@gentoo.org> git-1.8.3.2.ebuild:
+ Non-maintainer update: make ${PYTHON_REQUIRED_USE} conditional on USE=python;
+ fix pygtk and pygtksourceview deps to require that they be built with the same
+ version of python as this package; replace built_with_use calls with
+ has_version; remove python 2.5 support as none of the dependencies support it.
+
+ 11 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> git-1.8.3.2.ebuild:
+ Non-maintainer commit: Fixed test failure when built with USE="-perl" (bug
+ #476472). Also fixed wrong located python_optimize call. Thanks to Arfrever
+ for pointing this out in IRC and mgorny for giving advice how to fix this.
+
+*git-1.8.3.2 (09 Jul 2013)
+
+ 09 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> +git-1.8.3.2.ebuild:
+ Non-maintainer commit: Version bump (bug #467856). Converted ebuild to EAPI-5
+ and python-single-r1 eclass. Added gtk -> python REQUIRED_USE (bug #451374).
+ Hopefully fixed test failure with USE=-perl (bug #470592). Added installation
+ of git-remote-hg (bug #465808) and git-remote-bzr with USE=python.
+
+ 18 May 2013; Fabio Erculiani <lxnay@gentoo.org> git-1.8.2.1.ebuild,
+ git-9999.ebuild, +files/git-daemon.socket, +files/git-daemon_at.service:
+ add systemd unit supporting socket activation to 1.8.21 and 9999, fix bug
+ #468846
+
+ 19 Apr 2013; Mike Frysinger <vapier@gentoo.org> git-1.8.2.1.ebuild:
+ Add missing pthreads linkage for svn-fe #466178 by Mike Gilbert.
+
+ 17 Apr 2013; Robin H. Johnson <robbat2@gentoo.org> git-1.8.2.1.ebuild:
+ Bug #466178: better use of variables to make svn-fe always compile right.
+
+*git-1.8.2.1 (16 Apr 2013)
+
+ 16 Apr 2013; Robin H. Johnson <robbat2@gentoo.org>
+ +files/git-1.8.2-optional-cvs.patch, +files/git-1.8.2-texinfo.patch,
+ +git-1.8.2.1.ebuild:
+ Verbump. Bug #464210: fix texinfo 5.1 @anchor handling.
+
+ 19 Mar 2013; Agostino Sarubbo <ago@gentoo.org> -git-1.7.12-r1.ebuild,
+ -git-1.7.12-r2.ebuild, -git-1.7.12.3-r1.ebuild, -git-1.7.12.3.ebuild,
+ -git-1.7.12.ebuild, -git-1.8.0-r1.ebuild, -git-1.8.0.ebuild,
+ -git-1.8.1.1.ebuild, -git-1.8.1.2.ebuild, -git-1.8.1.4.ebuild,
+ -git-1.8.1.ebuild:
+ Remove old
+
+ 10 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
+ Stable for s390, wrt bug #459158
+
+ 09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
+ Stable for sparc, wrt bug #459158
+
+ 09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
+ Stable for ia64, wrt bug #459158
+
+ 09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
+ Stable for alpha, wrt bug #459158
+
+ 09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
+ Stable for ppc64, wrt bug #459158
+
+ 08 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
+ Stable for arm, wrt bug #459158
+
+ 06 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
+ Stable for sh, wrt bug #459158
+
+ 05 Mar 2013; Jeroen Roovers <jer@gentoo.org> git-1.8.1.5.ebuild:
+ Stable for HPPA (bug #459158).
+
+ 04 Mar 2013; Brent Baude <ranger@gentoo.org> git-1.8.1.5.ebuild:
+ Marking git-1.8.1.5 ppc for bug 459158
+
+ 04 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
+ Stable for x86, wrt bug #459158
+
+ 04 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
+ Stable for amd64, wrt bug #459158
+
+*git-1.8.1.5 (01 Mar 2013)
+
+ 01 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.1.5.ebuild:
+ Bump.
+
+ 24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
+ Stable for sh, wrt bug #436704
+
+ 22 Feb 2013; Zac Medico <zmedico@gentoo.org> git-1.8.1.2.ebuild,
+ git-1.8.1.4.ebuild, git-9999.ebuild:
+ Add ~arm-linux keywords.
+
+*git-1.8.1.4 (20 Feb 2013)
+
+ 20 Feb 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.1.4.ebuild:
+ Bump.
+
+ 20 Feb 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
+ Stable for s390, wrt bug #436704
+
+ 29 Jan 2013; Fabian Groffen <grobian@gentoo.org> git-1.8.0.2.ebuild,
+ git-1.8.1.2.ebuild:
+ Do not install git daemon init.d script on Prefix
+
+*git-1.8.1.2 (28 Jan 2013)
+
+ 28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.1.2.ebuild:
+ Autobump.
+
+ 21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
+ Stable for sparc, wrt bug #436704
+
+ 21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
+ Stable for ia64, wrt bug #436704
+
+ 20 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
+ Stable for alpha, wrt bug #436704
+
+ 16 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
+ Stable for ppc64, wrt bug #436704
+
+ 16 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
+ Stable for ppc, wrt bug #436704
+
+ 15 Jan 2013; Markus Meier <maekke@gentoo.org> git-1.7.12.4.ebuild:
+ arm stable, bug #436704
+
+*git-1.8.1.1 (15 Jan 2013)
+
+ 15 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.1.1.ebuild:
+ Bump.
+
+ 15 Jan 2013; Jeroen Roovers <jer@gentoo.org> git-1.7.12.4.ebuild:
+ Stable for HPPA (bug #436704).
+
+ 10 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
+ Stable for x86, wrt bug #436704
+
+ 10 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
+ Stable for amd64, wrt bug #436704
+
+*git-1.8.1 (03 Jan 2013)
+
+ 03 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.1.ebuild:
+ Bump.
+
+ 01 Jan 2013; Andreas K. Huettel <dilfridge@gentoo.org> +ChangeLog-2012:
+ Split ChangeLog.
+
+ For previous entries, please see ChangeLog-2012.
diff --git a/dev-vcs/git/ChangeLog-2012 b/dev-vcs/git/ChangeLog-2012
new file mode 100644
index 0000000..0efb9f3
--- /dev/null
+++ b/dev-vcs/git/ChangeLog-2012
@@ -0,0 +1,2705 @@
+# ChangeLog for dev-vcs/git
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog-2012,v 1.1 2013/01/01 13:19:51 dilfridge Exp $
+
+*git-1.8.0.2 (11 Dec 2012)
+
+ 11 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.0.2.ebuild:
+ Bump.
+
+ 06 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> git-1.8.0-r1.ebuild,
+ git-9999.ebuild:
+ Bug #441740: Update doc build deps.
+
+ 18 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+ Bug #439154: Copy latest ebuild back to 9999 revision.
+
+ 09 Nov 2012; Fabian Groffen <grobian@gentoo.org> git-1.8.0-r1.ebuild,
+ git-9999.ebuild:
+ Fix linking on Solaris, it needs libiconv
+
+*git-1.8.0-r1 (02 Nov 2012)
+
+ 02 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.0-r1.ebuild:
+ Update contrib extras, per bug #434098.
+
+*git-1.8.0 (02 Nov 2012)
+
+ 02 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.0.ebuild:
+ Bump.
+
+ 31 Oct 2012; Mike Frysinger <vapier@gentoo.org> metadata.xml:
+ Add information on USE=curl.
+
+*git-1.7.12.4 (18 Oct 2012)
+
+ 18 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.12.4.ebuild:
+ Bump.
+
+*git-1.7.12.3-r1 (11 Oct 2012)
+
+ 11 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.12.3-r1.ebuild:
+ 1.7.12.3 was based off 1.7.12-r1 instead of 1.7.12-r2, revbump to get the
+ other fixes again.
+
+*git-1.7.12.3 (10 Oct 2012)
+
+ 10 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.12.3.ebuild:
+ Version bump per bug 437870.
+
+ 24 Aug 2012; Robin H. Johnson <robbat2@gentoo.org>
+ -files/git-1.7.10.2-optional-cvs.patch,
+ -files/git-1.7.11.1-optional-cvs.patch, -files/git-1.7.5-interix.patch,
+ -files/git-1.7.6-interix.patch,
+ -files/git-1.7.8-git-svn-1.7-canonical-path.patch, -git-1.7.10.2.ebuild,
+ -git-1.7.10.ebuild, -git-1.7.11.1.ebuild, -git-1.7.9.1.ebuild,
+ -git-1.7.9.2.ebuild, -git-1.7.9.3.ebuild, -git-1.7.9.4.ebuild,
+ -git-1.7.9.7.ebuild, -git-1.7.9.ebuild, -git-1.7.9_rc2.ebuild:
+ Trim versions that were always masked.
+
+ 24 Aug 2012; Robin H. Johnson <robbat2@gentoo.org> git-1.7.12-r2.ebuild,
+ git-1.7.8.6.ebuild:
+ Warn about the bash completion split: prompt is now in a seperate bashcomp
+ file.
+
+ 24 Aug 2012; Zac Medico <zmedico@gentoo.org> git-1.7.10.2.ebuild,
+ git-1.7.10.ebuild, git-1.7.11.1.ebuild, git-1.7.12-r1.ebuild,
+ git-1.7.12-r2.ebuild, git-1.7.12.ebuild, git-1.7.9.1.ebuild,
+ git-1.7.9.2.ebuild, git-1.7.9.3.ebuild, git-1.7.9.4.ebuild,
+ git-1.7.9.7.ebuild, git-1.7.9.ebuild, git-1.7.9_rc2.ebuild, git-9999.ebuild:
+ Fix IUSE.missing for new highlight flag.
+
+ 23 Aug 2012; Robin H. Johnson <robbat2@gentoo.org> git-1.6.4.5.ebuild,
+ git-1.7.10.2.ebuild, git-1.7.10.ebuild, git-1.7.11.1.ebuild,
+ git-1.7.12-r1.ebuild, git-1.7.12-r2.ebuild, git-1.7.12.ebuild,
+ git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild, git-1.7.8.6.ebuild,
+ git-1.7.9.1.ebuild, git-1.7.9.2.ebuild, git-1.7.9.3.ebuild,
+ git-1.7.9.4.ebuild, git-1.7.9.7.ebuild, git-1.7.9.ebuild,
+ git-1.7.9_rc2.ebuild, git-9999.ebuild, metadata.xml:
+ Bug #432388: Make app-text/highlight optional as has heavy dependencies and is
+ disabled by default in gitweb.
+
+*git-1.7.12-r2 (23 Aug 2012)
+
+ 23 Aug 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.12-r2.ebuild,
+ files/git-daemon.confd:
+ Bug #373335: missing --base-path in conf.d/git. Bug #414437: OpenSSL is
+ required for more parts of Git now. Bug #423605: OSX keychain helper. Bug
+ #432328: Upstream has split the bash completion in two parts: git & git-
+ prompt; the latter defines __git_ps1 for your nice prompt.
+
+ 22 Aug 2012; Zac Medico <zmedico@gentoo.org> git-1.7.12-r1.ebuild:
+ Quick fix for USE=-perl.
+
+ 22 Aug 2012; Robin H. Johnson <robbat2@gentoo.org> git-1.7.12-r1.ebuild,
+ git-1.7.12.ebuild, git-9999.ebuild:
+ ~amd64-fbsd was not placed in all ebuilds. Also sync live ebuild.
+
+*git-1.7.12-r1 (22 Aug 2012)
+*git-1.7.12 (22 Aug 2012)
+
+ 22 Aug 2012; Robin H. Johnson <robbat2@gentoo.org>
+ +files/git-1.7.12-git-svn-backport.patch,
+ +files/git-1.7.12-optional-cvs.patch, +git-1.7.12-r1.ebuild,
+ +git-1.7.12.ebuild:
+ Finally, a Git that works with SVN 1.7, per bug #418431! 1.7.12-r1 contains
+ backported ms/git-svn-1.7 branch that will be merged into Git 1.7.13.
+ 1.7.12-r0 excludes that backport but is otherwise identical. Thanks to Michael
+ Schwern for the development work!
+
+ 19 Aug 2012; Raúl Porcel <armin76@gentoo.org> git-1.7.8.6.ebuild:
+ alpha/s390/sh/sparc stable wrt #418381
+
+ 27 Jul 2012; Fabian Groffen <grobian@gentoo.org> git-1.7.8.6.ebuild,
+ git-1.7.9.7.ebuild:
+ Fix compilation on Solaris (libiconv), set perl path correctly for Prefix,
+ drop applied/commented out interix patches
+
+ 14 Jul 2012; Markus Meier <maekke@gentoo.org> git-1.7.8.6.ebuild:
+ arm stable, bug #418381
+
+ 10 Jul 2012; Brent Baude <ranger@gentoo.org> git-1.7.8.6.ebuild:
+ Marking git-1.7.8.6 ppc64 for bug 418381
+
+ 10 Jul 2012; Akinori Hattori <hattya@gentoo.org> git-1.7.8.6.ebuild:
+ ia64 stable wrt bug #418381
+
+ 08 Jul 2012; Michael Weber <xmw@gentoo.org> git-1.7.8.6.ebuild:
+ ppc stable (bug 418381)
+
+*git-1.7.11.1 (07 Jul 2012)
+
+ 07 Jul 2012; Robin H. Johnson <robbat2@gentoo.org>
+ +files/git-1.7.11.1-optional-cvs.patch, +git-1.7.11.1.ebuild:
+ Version bump. Still suffers from bug #391707: git-svn failures.
+
+ 03 Jul 2012; Jeroen Roovers <jer@gentoo.org> git-1.7.8.6.ebuild:
+ Stable for HPPA (bug #418381).
+
+ 02 Jul 2012; Jeff Horelick <jdhore@gentoo.org> git-1.7.8.6.ebuild:
+ marked x86 per bug 418381
+
+ 27 Jun 2012; Agostino Sarubbo <ago@gentoo.org> git-1.7.8.6.ebuild:
+ Stable for amd64, wrt bug #418381
+
+ 26 Jun 2012; Jeremy Olexa <darkside@gentoo.org> -git-1.7.3.5-r2.ebuild,
+ -git-1.7.4.5.ebuild, -git-1.7.5.3.ebuild, -git-1.7.6.4.ebuild,
+ -git-1.7.7.6.ebuild, -git-1.7.7.7.ebuild, -git-1.7.8.ebuild,
+ -git-1.7.8.1.ebuild, -git-1.7.8.2.ebuild, -git-1.7.8.3.ebuild,
+ -git-1.7.8.4.ebuild, -git-1.7.8.5.ebuild:
+ Cleanup some unstable ebuilds
+
+ 14 Jun 2012; Mike Frysinger <vapier@gentoo.org> git-1.7.10.2.ebuild,
+ git-1.7.10.ebuild, git-1.7.9.1.ebuild, git-1.7.9.2.ebuild, git-1.7.9.3.ebuild,
+ git-1.7.9.4.ebuild, git-1.7.9.7.ebuild, git-1.7.9.ebuild, git-9999.ebuild,
+ metadata.xml:
+ Put gpg dep behind a USE flag as this signing requirement only really matters
+ to the client side when signing is in use.
+
+ 14 Jun 2012; Mike Frysinger <vapier@gentoo.org> git-1.7.9.1.ebuild,
+ git-1.7.9.2.ebuild, git-1.7.9.3.ebuild, git-1.7.9.4.ebuild,
+ git-1.7.9.7.ebuild, git-1.7.9.ebuild, git-1.7.10.ebuild,
+ git-1.7.10.2.ebuild, git-9999.ebuild:
+ Add USE=nls support to control gettext requirement.
+
+ 14 Jun 2012; Mike Frysinger <vapier@gentoo.org> git-1.7.8.1.ebuild,
+ git-1.7.8.2.ebuild, git-1.7.8.3.ebuild, git-1.7.8.4.ebuild,
+ git-1.7.8.5.ebuild, git-1.7.8.6.ebuild, git-1.7.8.ebuild, git-1.7.9.1.ebuild,
+ git-1.7.9.2.ebuild, git-1.7.9.3.ebuild, git-1.7.9.4.ebuild,
+ git-1.7.9.7.ebuild, git-1.7.9.ebuild, git-1.7.9_rc2.ebuild,
+ git-1.7.10.ebuild, git-1.7.10.2.ebuild, git-9999.ebuild:
+ Re-enable USE=-iconv support now that the bug originally disabling it was
+ fixed in upstream, and make sure we default to USE=iconv so that
+ unicode/etc... messages "just work" out of the box #355467 by Tom Lloyd.
+
+*git-1.7.10.2 (20 May 2012)
+
+ 20 May 2012; Robin H. Johnson <robbat2@gentoo.org>
+ +files/git-1.7.10.2-optional-cvs.patch, +files/git-1.7.11-optional-cvs.patch,
+ +git-1.7.10.2.ebuild, git-9999.ebuild:
+ Version bump, update optional CVS patch to apply on latest git HEAD and
+ 1.7.10.2 release. Port libpcre changes to live ebuild.
+
+ 09 May 2012; Alexis Ballier <aballier@gentoo.org> git-1.7.8.6.ebuild:
+ keyword ~amd64-fbsd
+
+*git-1.7.9.7 (26 Apr 2012)
+*git-1.7.7.7 (26 Apr 2012)
+*git-1.7.8.6 (26 Apr 2012)
+
+ 26 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.7.ebuild,
+ +git-1.7.8.6.ebuild, +git-1.7.9.7.ebuild:
+ Version bump.
+
+ 23 Apr 2012; Mike Frysinger <vapier@gentoo.org> git-1.7.10.ebuild,
+ git-1.7.9.1.ebuild, git-1.7.9.2.ebuild, git-1.7.9.3.ebuild,
+ git-1.7.9.4.ebuild, git-1.7.9.ebuild:
+ Kill spurious backslash.
+
+*git-1.7.10 (08 Apr 2012)
+
+ 08 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.10.ebuild:
+ Version bump. Still no keywords due to major git-svn breakage.
+
+*git-1.7.9.4 (12 Mar 2012)
+
+ 12 Mar 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.9.4.ebuild:
+ Version bump.
+
+*git-1.7.9.3 (06 Mar 2012)
+
+ 06 Mar 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.9.3.ebuild:
+ Version bump. SVN problem still not fixed by upstream.
+
+*git-1.7.8.5 (28 Feb 2012)
+
+ 28 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8.5.ebuild:
+ Version bump.
+
+*git-1.7.9.2 (23 Feb 2012)
+
+ 23 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.9.2.ebuild:
+ Version bump.
+
+*git-1.7.9.1 (15 Feb 2012)
+
+ 15 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.9.1.ebuild:
+ Version bump.
+
+*git-1.7.9 (05 Feb 2012)
+
+ 05 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.9.ebuild:
+ Version bump. Please be careful of git-svn functionality with SVN 1.7 if your
+ SVN repo URL, branch name or tag names contains characters that need URL
+ escaping.
+
+ 28 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> git-1.7.9_rc2.ebuild,
+ git-9999.ebuild:
+ Bug #384233: Fix the gitweb syntax highlighting implicit dependency on
+ highlight.
+
+ 20 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.3.5-r1.ebuild,
+ -git-1.7.3.5.ebuild, -git-1.7.4.1.ebuild, -git-1.7.4.4.ebuild,
+ -git-1.7.4.ebuild, -git-1.7.5_rc1.ebuild, -git-1.7.5_rc3.ebuild,
+ -git-1.7.6.1.ebuild, -git-1.7.6.ebuild, -git-1.7.7.1-r1.ebuild,
+ -git-1.7.7.1.ebuild, -git-1.7.7.2.ebuild, -git-1.7.7.3.ebuild,
+ -git-1.7.7.4.ebuild, -git-1.7.7.ebuild:
+ Clean up some unstable ebuilds.
+
+*git-1.7.7.6 (20 Jan 2012)
+*git-1.7.8.4 (20 Jan 2012)
+
+ 20 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.6.ebuild,
+ +git-1.7.8.4.ebuild:
+ Version bump.
+
+*git-1.7.9_rc2 (20 Jan 2012)
+
+ 20 Jan 2012; Robin H. Johnson <robbat2@gentoo.org>
+ +files/git-1.7.8-git-svn-1.7-canonical-path.patch, +git-1.7.9_rc2.ebuild,
+ git-9999.ebuild:
+ Version bump, keywords temporarily removed as git-svn has issues still.
+
+ 13 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+ Propogate libpcre change to live ebuild.
+
+*git-1.7.8.3 (07 Jan 2012)
+
+ 07 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8.3.ebuild:
+ Version bump.
+
+*git-1.7.8.2 (02 Jan 2012)
+
+ 02 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8.2.ebuild:
+ Version bump.
+
+*git-1.7.8.1 (21 Dec 2011)
+
+ 21 Dec 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8.1.ebuild:
+ Version bump.
+
+*git-1.7.8 (03 Dec 2011)
+
+ 03 Dec 2011; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.8_rc1.ebuild,
+ -git-1.7.8_rc1-r1.ebuild, -git-1.7.8_rc3.ebuild, -git-1.7.8_rc4.ebuild,
+ +git-1.7.8.ebuild:
+ Version bump.
+
+*git-1.7.8_rc4 (29 Nov 2011)
+
+ 29 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8_rc4.ebuild:
+ Version bump.
+
+ 22 Nov 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+ Drop maintainer due retirement, bug #195316
+
+*git-1.7.7.4 (18 Nov 2011)
+
+ 18 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.4.ebuild:
+ Version bump.
+
+*git-1.7.8_rc3 (17 Nov 2011)
+
+ 17 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8_rc3.ebuild:
+ Version bump.
+
+*git-1.7.8_rc1-r1 (16 Nov 2011)
+
+ 16 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8_rc1-r1.ebuild:
+ Bug #377883: build correctly with libpcre for git-grep -P.
+
+*git-1.7.7.3 (09 Nov 2011)
+
+ 09 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.3.ebuild:
+ Version bump.
+
+*git-1.7.8_rc1 (08 Nov 2011)
+
+ 08 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8_rc1.ebuild:
+ Version bump.
+
+*git-1.7.7.2 (02 Nov 2011)
+
+ 02 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.2.ebuild:
+ Version bump.
+
+*git-1.7.7.1-r1 (24 Oct 2011)
+
+ 24 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.1-r1.ebuild,
+ git-9999.ebuild:
+ EAPI=4 and bash-completion-r1 support now that python.eclass has EAPI4, now
+ uses REQUIRED_USE instead of warning blocks. Patch by Tomas Chvatal
+ <scarabeus@gentoo.org>.
+
+*git-1.7.7.1 (24 Oct 2011)
+
+ 24 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.1.ebuild:
+ Version bump.
+
+ 03 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+ Update live ebuild to sync.
+
+*git-1.7.7 (01 Oct 2011)
+*git-1.7.6.4 (01 Oct 2011)
+
+ 01 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.6.4.ebuild,
+ +git-1.7.7.ebuild:
+ Version bump. Was delayed by getting html/manpage tarballs on the alternative
+ mirroring location.
+
+*git-1.7.6.1 (25 Aug 2011)
+
+ 25 Aug 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.6.1.ebuild:
+ Version bump.
+
+ 19 Aug 2011; Jeremy Olexa <darkside@gentoo.org> git-1.7.2.5.ebuild,
+ git-1.7.3.4-r1.ebuild, git-1.7.3.5.ebuild, git-1.7.3.5-r1.ebuild,
+ git-1.7.3.5-r2.ebuild, git-1.7.4.ebuild, git-1.7.4.1.ebuild,
+ git-1.7.4.4.ebuild, git-1.7.4.5.ebuild, git-1.7.5_rc1.ebuild,
+ git-1.7.5_rc3.ebuild, git-1.7.5.3.ebuild, git-1.7.6.ebuild, git-9999.ebuild:
+ Remove useless/redundant built_with_use check for subversion[perl] since the
+ addition of USE-deps. Signed off by maintainer. Tangentially related to bug
+ 250179
+
+ 13 Jul 2011; Markus Duft <mduft@gentoo.org> git-1.7.6.ebuild,
+ +files/git-1.7.6-interix.patch:
+ re-added interix prefix specific patch, as some things didnt make it into the
+ current release.
+
+*git-1.7.6 (27 Jun 2011)
+
+ 27 Jun 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.6.ebuild,
+ git-9999.ebuild:
+ Version bump. Bug #354439: instructions for bash completion. Bug #352693:
+ revert env perl change from bug #326625. Bug #370579: One more test that
+ requires FEATURES=userpriv.
+
+ 30 May 2011; Markus Duft <mduft@gentoo.org> git-1.7.5.3.ebuild,
+ git-9999.ebuild, +files/git-1.7.5-interix.patch:
+ add build fix for interix.
+
+*git-1.7.5.2 (30 May 2011)
+
+ 30 May 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.5.3.ebuild,
+ git-9999.ebuild:
+ Version bump. Sync keywords to -9999 ebuild.
+
+ 03 May 2011; Fabian Groffen <grobian@gentoo.org> git-1.7.5_rc3.ebuild:
+ Marked ~x64-freebsd
+
+*git-1.7.5_rc3 (27 Apr 2011)
+*git-1.7.4.5 (27 Apr 2011)
+
+ 27 Apr 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4.5.ebuild,
+ +git-1.7.5_rc3.ebuild:
+ Version bump.
+
+ 20 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> git-9999.ebuild:
+ Migrate to git-2 eclass. Update live/stable logic conditionals.
+
+*git-1.7.5_rc1 (06 Apr 2011)
+*git-1.7.4.4 (06 Apr 2011)
+
+ 06 Apr 2011; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.4_rc1.ebuild,
+ -git-1.7.4_rc1-r1.ebuild, -git-1.7.4_rc1-r2.ebuild, -git-1.7.4_rc2.ebuild,
+ -git-1.7.4_rc3.ebuild, +git-1.7.4.4.ebuild, +git-1.7.5_rc1.ebuild:
+ Clean up old 1.7.4_rc versions. Version bump to other new versions.
+
+ 04 Apr 2011; Pacho Ramos <pacho@gentoo.org> git-1.6.4.5.ebuild,
+ git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild, git-1.7.3.5.ebuild,
+ git-1.7.3.5-r1.ebuild, git-1.7.3.5-r2.ebuild, git-1.7.4_rc1.ebuild,
+ git-1.7.4_rc1-r1.ebuild, git-1.7.4_rc1-r2.ebuild, git-1.7.4_rc2.ebuild,
+ git-1.7.4_rc3.ebuild, git-1.7.4.ebuild, git-1.7.4.1.ebuild, git-9999.ebuild:
+ RDEPEND only in dev-python/pygtksourceview:2 as
+ dev-python/gtksourceview-python will be dropped soon (bug #355049 with Robin
+ Johnson authorization).
+
+ 12 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> -git-1.6.4.4.ebuild,
+ -git-1.6.4.4-r1.ebuild, -files/git-1.6.4.5-gitweb-cve-2010-3906.patch,
+ -files/git-1.7.0-always-install-js.patch,
+ -files/git-1.7.1-always-install-js.patch,
+ -files/git-1.7.1-noiconv-segfault-fix.patch, -git-1.7.2.2.ebuild,
+ -git-1.7.2.3.ebuild, -git-1.7.2.4.ebuild, -git-1.7.2.4-r1.ebuild,
+ -git-1.7.3.2.ebuild, -git-1.7.3.2-r1.ebuild, -git-1.7.3.3.ebuild,
+ -git-1.7.3.4.ebuild:
+ Cleanup old files.
+
+*git-1.7.4.1 (12 Feb 2011)
+
+ 12 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4.1.ebuild:
+ Version bump.
+
+*git-1.7.4 (01 Feb 2011)
+
+ 01 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4.ebuild:
+ Version bump.
+
+*git-1.7.4_rc3 (24 Jan 2011)
+
+ 24 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4_rc3.ebuild:
+ version bump
+
+*git-1.7.4_rc2 (15 Jan 2011)
+
+ 15 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4_rc2.ebuild,
+ git-9999.ebuild:
+ Version bump.
+
+ 12 Jan 2011; Michael Haubenwallner <haubi@gentoo.org>
+ git-1.7.4_rc1-r2.ebuild:
+ aix lacks FNMATCH_CASEFOLD
+
+ 10 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ git-1.7.3.5-r2.ebuild, git-1.7.4_rc1-r2.ebuild, git-9999.ebuild:
+ Call python_mod_optimize() and python_mod_cleanup() (bug #329479).
+
+ 08 Jan 2011; Fabian Groffen <grobian@gentoo.org> git-1.7.3.5-r2.ebuild,
+ git-1.7.4_rc1-r2.ebuild, git-9999.ebuild:
+ Fix for Prefix
+
+ 08 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.4-r1.ebuild:
+ Backport bug #350330 automagic CVS to stable ebuild.
+
+ 08 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.5-r2.ebuild,
+ -git-1.7.3.5-r2.ebuild.orig, git-1.7.4_rc1-r2.ebuild, git-9999.ebuild:
+ Fix missing argument in call to python_convert_shebangs, and drop accidently
+ added .orig file.
+
+ 07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+ Also import python improvements to 9999 ebuild.
+
+*git-1.7.4_rc1-r2 (07 Jan 2011)
+*git-1.7.3.5-r2 (07 Jan 2011)
+
+ 07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.5-r2.ebuild,
+ +git-1.7.3.5-r2.ebuild.orig, +git-1.7.4_rc1-r2.ebuild:
+ Bug #329479: improve python usage to new python eclass. Does not support
+ multiple active versions of python easily.
+
+ 07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.4_rc1-r1.ebuild,
+ git-9999.ebuild:
+ Port bug #350330 fixes to newer ebuilds.
+
+ 07 Jan 2011; Markos Chandras <hwoarang@gentoo.org> git-1.6.4.5.ebuild,
+ git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild:
+ Stable on amd64 wrt bug #349045
+
+ 07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.5-r1.ebuild,
+ +files/git-1.7.3.5-optional-cvs.patch:
+ Bug #350330: Avoid automagic CVS.
+
+ 07 Jan 2011; Fabian Groffen <grobian@gentoo.org> git-1.7.3.5-r1.ebuild,
+ git-1.7.4_rc1-r1.ebuild, git-9999.ebuild:
+ Fix gitweb removal for Prefix
+
+*git-1.7.4_rc1-r1 (07 Jan 2011)
+
+ 07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4_rc1-r1.ebuild,
+ git-9999.ebuild:
+ Port the 1.7.3.5-r1 Prefix USE=python code to newer ebuilds since Prefix team
+ has tested.
+
+*git-1.7.3.5-r1 (06 Jan 2011)
+
+ 06 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.5-r1.ebuild:
+ Bug #320647 redux: Full ability to disable Python usage for Prefix (needed to
+ work around circular dependency loop).
+
+*git-1.7.4_rc1 (06 Jan 2011)
+
+ 06 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4_rc1.ebuild:
+ Version bump for new major release.
+
+*git-1.7.3.5 (06 Jan 2011)
+
+ 06 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.4-r1.ebuild,
+ +git-1.7.3.5.ebuild:
+ Version bump. Also backport minor improvement to testsuite running to get
+ cleaner repeat results.
+
+ 01 Jan 2011; Raúl Porcel <armin76@gentoo.org> git-1.6.4.5.ebuild,
+ git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild:
+ alpha/arm/ia64/s390/sh/sparc stable wrt #349045
+
+ 31 Dec 2010; Christian Faulhammer <fauli@gentoo.org>
+ git-1.7.3.4-r1.ebuild:
+ stable x86, security bug 349045
+
+ 29 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.4-r1.ebuild,
+ +files/git-1.7.3.4-fix-perl-test-prereq.patch:
+ Bug #350075: t/t9001: fix missing prereq on some tests.
+
+ 27 Dec 2010; Brent Baude <ranger@gentoo.org> git-1.6.4.5.ebuild,
+ git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild:
+ marking -1.6.4.5 -1.7.2.5 -1.7.3.4-r1 ppc64 stable for bug 349045
+
+ 26 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.2.ebuild,
+ git-1.7.3.2-r1.ebuild, git-1.7.3.3.ebuild, git-1.7.3.4.ebuild,
+ git-1.7.3.4-r1.ebuild, +files/git-1.7.3.4-avoid-shell-issues.patch:
+ Bug #349083: Fix a false positive in the Git testsuite, triggered when the
+ portage user had a shell of /bin/false.
+
+ 25 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.2.5.ebuild,
+ git-1.7.3.4-r1.ebuild:
+ Minor fail with displaying aggregate-results to fix.
+
+ 25 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.2.5.ebuild,
+ git-1.7.3.4-r1.ebuild:
+ Improve output phase of src_test block for new stables.
+
+ 23 Dec 2010; Jeroen Roovers <jer@gentoo.org> git-1.7.3.4-r1.ebuild:
+ Stable for HPPA PPC (bug #349045).
+
+ 23 Dec 2010; Jeroen Roovers <jer@gentoo.org> git-1.6.4.5.ebuild,
+ git-1.7.2.5.ebuild:
+ Stable for PPC (bug #349045).
+
+ 22 Dec 2010; Jeroen Roovers <jer@gentoo.org> git-1.7.2.5.ebuild:
+ Stable for HPPA (bug #349045).
+
+ 22 Dec 2010; Jeroen Roovers <jer@gentoo.org> git-1.6.4.5.ebuild:
+ Stable for HPPA (bug #349045).
+
+ 20 Dec 2010; Tobias Klausmann <klausman@gentoo.org> git-1.7.3.4-r1.ebuild:
+ Stable on alpha, bug #349045
+
+ 20 Dec 2010; Tobias Klausmann <klausman@gentoo.org> git-1.7.2.5.ebuild:
+ Stable on alpha, bug #349045
+
+ 20 Dec 2010; Tobias Klausmann <klausman@gentoo.org> git-1.6.4.5.ebuild:
+ Stable on alpha, bug #349045
+
+ 20 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.6.4.4.ebuild,
+ git-1.6.4.4-r1.ebuild, git-1.6.4.5.ebuild, git-1.7.2.2.ebuild,
+ git-1.7.2.3.ebuild, git-1.7.2.4.ebuild, git-1.7.2.4-r1.ebuild,
+ git-1.7.2.5.ebuild, git-1.7.3.2.ebuild:
+ Backport the doman cosmetic fix to ALL ebuilds since I got yet another bug
+ about it.
+
+ 19 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> git-1.6.4.5.ebuild,
+ git-1.7.2.5.ebuild:
+ x86 stable wrt security bug #349045
+
+*git-1.7.3.4-r1 (19 Dec 2010)
+
+ 19 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.4-r1.ebuild:
+ Bug #339278: Do not install gitweb with USE=-cgi. Bug #320647: Python path
+ for G/FreeBSD. Bug #326625: Perl path with local::lib. Bug #333405: no color
+ for test output to make log parsing easier.
+
+*git-1.7.2.5 (19 Dec 2010)
+*git-1.6.4.5 (19 Dec 2010)
+
+ 19 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.5.ebuild,
+ +git-1.7.2.5.ebuild:
+ Version bump to official releases with gitweb XSS fixes, rather than our
+ revbumps with the patch.
+
+*git-1.7.3.4 (16 Dec 2010)
+*git-1.7.2.4-r1 (16 Dec 2010)
+*git-1.6.4.4-r1 (16 Dec 2010)
+
+ 16 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.4-r1.ebuild,
+ +files/git-1.6.4.5-gitweb-cve-2010-3906.patch, +git-1.7.2.4-r1.ebuild,
+ +git-1.7.3.4.ebuild:
+ Version bump. Contains fix for CVE-2010-3906: gitweb XSS.
+
+*git-1.7.3.3 (07 Dec 2010)
+*git-1.7.2.4 (07 Dec 2010)
+
+ 07 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.0.ebuild,
+ -git-1.7.1-r1.ebuild, -git-1.7.1.1.ebuild, -git-1.7.2.ebuild,
+ -git-1.7.2-r2.ebuild, +git-1.7.2.4.ebuild, -git-1.7.3.ebuild,
+ -git-1.7.3.1.ebuild, +git-1.7.3.3.ebuild:
+ Version bump and cleanup.
+
+ 11 Nov 2010; Sebastian Pipping <sping@gentoo.org> git-1.7.3.2-r1.ebuild:
+ Merge changes to 9999 back into latest release ebuild.
+
+ 11 Nov 2010; Sebastian Pipping <sping@gentoo.org> git-9999.ebuild:
+ Make live ebuild depend on asciidoc and xmlto independent of flag "doc"
+ (bug #343063)
+
+ 09 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.2.3.ebuild,
+ git-1.7.3.ebuild, git-1.7.3.1.ebuild, git-1.7.3.2.ebuild,
+ git-1.7.3.2-r1.ebuild:
+ Fix useless extra KEYWORDS.
+
+ 29 Oct 2010; Mark Loeser <halcy0n@gentoo.org> git-9999.ebuild:
+ Remove ~ppc and ~ppc64
+
+ 27 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+ Bump live build.
+
+ 27 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.2-r1.ebuild:
+ Bug #342845: fix contrib install and doman warning.
+
+*git-1.7.3.2-r1 (26 Oct 2010)
+
+ 26 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.2-r1.ebuild:
+ revbump with installing more of new contrib.
+
+ 22 Oct 2010; Daniel Pielmeier <billie@gentoo.org>
+ +files/git-1.6.6.1-interix6.patch, +files/git-1.7.1-interix.patch:
+ Interix patches are still needed for some older versions.
+
+*git-1.7.3.2 (22 Oct 2010)
+
+ 22 Oct 2010; Markus Duft <mduft@gentoo.org> git-1.7.3.2.ebuild,
+ +files/git-1.7.3.2-interix.patch,
+ -files/git-1.6.6.1-interix6.patch,
+ -files/git-1.7.1-interix.patch:
+ removed obsolete patches, added a new one instead. the new patch matches
+ more the spirit of upstream, and has been submitted there.
+
+ 22 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.2.ebuild:
+ Version bump.
+
+*git-1.7.3.1 (30 Sep 2010)
+
+ 30 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.1.ebuild:
+ Version bump.
+
+*git-1.7.3 (19 Sep 2010)
+
+ 19 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.ebuild:
+ Version bump.
+
+*git-1.7.2.3 (13 Sep 2010)
+
+ 13 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.2.3.ebuild:
+ Bug #337104: verbump.
+
+ 11 Sep 2010; Raúl Porcel <armin76@gentoo.org> git-1.7.2.2.ebuild:
+ arm/ia64/s390/sh/sparc stable wrt #335891
+
+ 10 Sep 2010; Jeroen Roovers <jer@gentoo.org> git-1.7.2.2.ebuild:
+ Stable for HPPA (bug #335891).
+
+ 10 Sep 2010; Tobias Klausmann <klausman@gentoo.org> git-1.7.2.2.ebuild:
+ Stable on alpha, bug #335891
+
+ 07 Sep 2010; Jeroen Roovers <jer@gentoo.org> git-1.7.2.2.ebuild:
+ Stable for PPC (bug #335891).
+
+ 06 Sep 2010; Brent Baude <ranger@gentoo.org> git-1.7.2.2.ebuild:
+ Marking git-1.7.2.2 ppc64 for bug 335891
+
+ 06 Sep 2010; Markos Chandras <hwoarang@gentoo.org> git-1.7.2.2.ebuild:
+ Stable on amd64 wrt bug #335891
+
+ 06 Sep 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> git-1.7.2.2.ebuild:
+ x86 stable wrt security bug #335891
+
+ 03 Sep 2010; Christian Faulhammer <fauli@gentoo.org> git-1.7.2.2.ebuild:
+ add ~x86-freebsd
+
+ 29 Aug 2010; Sven Wegener <swegener@gentoo.org> git-1.7.2.ebuild,
+ git-1.7.2-r2.ebuild, git-1.7.2.2.ebuild:
+ Install static gitweb files into correct location.
+
+*git-1.7.2.2 (23 Aug 2010)
+
+ 23 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.2.2.ebuild:
+ Version bump.
+
+ 16 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.6.4.4.ebuild,
+ git-1.7.0.ebuild, git-1.7.1-r1.ebuild, git-1.7.1.1.ebuild,
+ git-1.7.2.ebuild, git-1.7.2-r2.ebuild, git-9999.ebuild:
+ Bug #332935: In newer EAPIs, perl-module brings in dev-lang/perl as well,
+ which we do not always want.
+
+*git-1.7.2-r2 (09 Aug 2010)
+
+ 09 Aug 2010; Fabian Groffen <grobian@gentoo.org> -git-1.7.2-r1.ebuild,
+ +git-1.7.2-r2.ebuild:
+ Change SHELL_PATH from bash to sh to resolve problems with git's shell
+ scripts for some people, bug #331031
+
+ 31 Jul 2010; Fabian Groffen <grobian@gentoo.org> git-1.7.2-r1.ebuild:
+ Fix compilation with USE=-iconv on non-glibc platforms since disabling of
+ iconv is still ignored due to bugs mentioned in the ebuild
+
+ 30 Jul 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.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, -files/git-1.6.6-always-install-js.patch,
+ -git-1.7.0.3.ebuild, -git-1.7.0.4.ebuild:
+ Cleanup old versions.
+
+*git-1.7.2-r1 (22 Jul 2010)
+
+ 22 Jul 2010; Jeremy Olexa <darkside@gentoo.org>
+ +files/git-1.6.6.1-interix6.patch, +files/git-1.7.1-interix.patch,
+ +git-1.7.2-r1.ebuild:
+ Migrate changes from Gentoo Prefix overlay. Convert to EAPI3, add patches,
+ modify paths, etc. Approved by maintainer, reference bug 329273. Revbump
+ per request but no substantial changes for the end user
+
+*git-1.7.2 (22 Jul 2010)
+
+ 22 Jul 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.2.ebuild,
+ +files/git-1.7.2-always-install-js.patch:
+ Version bump.
+
+ 18 Jul 2010; Raúl Porcel <armin76@gentoo.org> git-1.7.1-r1.ebuild:
+ alpha/arm/ia64/s390/sh/sparc stable wrt #321899
+
+ 18 Jul 2010; <nixnut@gentoo.org> git-1.7.0.ebuild:
+ ppc stable #321899
+
+*git-1.7.1.1 (30 Jun 2010)
+
+ 30 Jun 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.1.1.ebuild:
+ Version bump.
+
+ 22 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@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, metadata.xml:
+ dev-util/subversion renamed to dev-vcs/subversion.
+
+ 22 Jun 2010; Jeroen Roovers <jer@gentoo.org> git-1.7.1-r1.ebuild:
+ Stable for HPPA (bug #321899).
+
+ 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
+
+ 05 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> git-1.7.1-r1.ebuild:
+ x86 stable wrt bug #321899
+
+ 31 May 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.1-r1.ebuild:
+ Bug #322205: The iconv patch added for -r1 just stopped the segfaults, the
+ testsuite still fails, so forcing USE=iconv for now.
+
+ 28 May 2010; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.1.ebuild:
+ Remove broken 1.7.1.
+
+*git-1.7.1-r1 (28 May 2010)
+
+ 28 May 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.1-r1.ebuild,
+ +files/git-1.7.1-noiconv-segfault-fix.patch:
+ Bug #321895: patch from upstream to avoid segfault with USE=-iconv.
+
+*git-1.7.1 (01 May 2010)
+
+ 01 May 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.1.ebuild,
+ +files/git-1.7.1-always-install-js.patch:
+ Bug #317953: Version bump.
+
+*git-1.7.0.4 (01 Apr 2010)
+
+ 01 Apr 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.0.4.ebuild:
+ Version bump.
+
+ 31 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> 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:
+ Forward-port ~ppc64 keyword to other ebuilds since it came back in bug
+ #290163.
+
+ 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)
+
+ 24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.0.2.ebuild,
+ +git-1.7.0.3.ebuild:
+ Bug #310967: 1.7.0.2 has a segfault bug in git-daemon, remove and replace
+ with 1.7.0.3
+
+ 17 Mar 2010; Sebastian Pipping <sping@gentoo.org> +files/50git-gentoo.el,
+ +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,
+ +files/git-1.6.6-always-install-js.patch, +git-1.7.0.ebuild,
+ +git-1.7.0.2.ebuild, +files/git-1.7.0-always-install-js.patch,
+ +git-9999.ebuild, +files/git-daemon.confd, +files/git-daemon.initd,
+ +files/git-daemon.xinetd, +metadata.xml:
+ New package (copied from dev-util/git)
+
+*git-1.7.0.2 (07 Mar 2010)
+
+ 07 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.0.2.ebuild:
+ version bump.
+
+ 28 Feb 2010; Sebastian Pipping <sping@gentoo.org> git-9999.ebuild:
+ Sync live ebuild with latest (bug #305157)
+
+*git-1.7.0 (13 Feb 2010)
+
+ 13 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.0.ebuild,
+ +files/git-1.7.0-always-install-js.patch:
+ Version bump.
+
+*git-1.6.6.2 (13 Feb 2010)
+
+ 13 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6.2.ebuild:
+ Version bump.
+
+*git-1.6.6.1 (21 Jan 2010)
+*git-1.6.5.8 (21 Jan 2010)
+
+ 21 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.8.ebuild,
+ +git-1.6.6.1.ebuild:
+ Version bump.
+
+ 02 Jan 2010; Brent Baude <ranger@gentoo.org> git-1.6.5.1-r1.ebuild:
+ Marking git-1.6.5.1-r1 ~ppc64 for bug 290163
+
+*git-1.6.6-r2 (26 Dec 2009)
+
+ 26 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6-r2.ebuild,
+ git-9999.ebuild:
+ Bug #298390: All the Subversion ebuilds now offer perl, so we can USE-dep
+ on it.
+
+*git-1.6.6-r1 (26 Dec 2009)
+
+ 26 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6-r1.ebuild,
+ +files/git-1.6.6-always-install-js.patch, git-9999.ebuild:
+ Bug #298277: Fixup JS install for Gitweb. Also port all recent fixes to
+ the live ebuild.
+
+*git-1.6.6 (24 Dec 2009)
+
+ 24 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6.ebuild:
+ Version bump.
+
+*git-1.6.6_rc4 (21 Dec 2009)
+
+ 21 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6_rc4.ebuild:
+ Version bump.
+
+*git-1.6.6_rc3 (17 Dec 2009)
+
+ 17 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6_rc3.ebuild:
+ Version bump for the upstream rc.
+
+*git-1.6.5.7 (17 Dec 2009)
+
+ 17 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.7.ebuild:
+ Version bump and fix bug #296310 for Perl 5.10 users.
+
+*git-1.6.5.6 (11 Dec 2009)
+
+ 11 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.6.ebuild:
+ version bump
+
+*git-1.6.5.5 (06 Dec 2009)
+
+ 06 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.5.ebuild:
+ Version bump.
+
+*git-1.6.5.4 (03 Dec 2009)
+
+ 03 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.4.ebuild:
+ Version bump.
+
+ 18 Nov 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.5.1-r1.ebuild,
+ git-1.6.5.2.ebuild, git-1.6.5.3.ebuild:
+ Add ~alpha/~ia64 wrt #290163
+
+ 17 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5.3.ebuild:
+ Bug #290163: rekeyword for arm. Tested on mv78100.
+
+ 17 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5.3.ebuild:
+ Bug #290465: uclibc needs an additional define to select a codepath that
+ it will compile against.
+
+ 17 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5.3.ebuild:
+ Bug #290131: cpio is only needed for building git-gui now, and nothing
+ else at runtime.
+
+*git-1.6.5.3 (17 Nov 2009)
+
+ 17 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.3.ebuild:
+ Version bump. Testcases updated to run a working subset with
+ FEATURES=-userpriv per bug #292865.
+
+ 16 Nov 2009; Jeremy Olexa <darkside@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-9999.ebuild:
+ Since app-misc/git was removed from the tree, remove that invalid atom
+ from the CDEPEND variable in dev-util/git ebuilds
+
+*git-1.6.5.2 (30 Oct 2009)
+
+ 30 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.2.ebuild:
+ Bug #291107: version bump.
+
+ 23 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> 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-9999.ebuild:
+ USE-default on doc was unpopular, and got even more so with USE=doc now
+ bringing in dependencies. Turn off the default.
+
+*git-1.6.5.1-r1 (22 Oct 2009)
+
+ 22 Oct 2009; Sebastian Pipping <sping@gentoo.org> +git-1.6.5.1-r1.ebuild,
+ git-9999.ebuild:
+ Build and install info pages (bug 287112), add dependency on texinfo, drop
+ keywords: alpha arm ia64 ppc64
+
+ 22 Oct 2009; Tobias Klausmann <klausman@gentoo.org> git-1.6.4.4.ebuild:
+ Added two more test sets to the black list for UID-0 testing
+
+*git-1.6.5.1 (18 Oct 2009)
+
+ 18 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.1.ebuild:
+ Version bump
+
+ 12 Oct 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.4.4.ebuild:
+ ia64/s390/sh/sparc stable wrt #287031
+
+*git-1.6.5 (11 Oct 2009)
+
+ 11 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.ebuild,
+ git-9999.ebuild:
+ Version bump. Bug #287101: fix manpage formatting. Bug #287104: build
+ manpages as needed.
+
+ 11 Oct 2009; Tobias Klausmann <klausman@gentoo.org> git-1.6.4.4.ebuild:
+ Stable on alpha, bug #287031
+
+ 09 Oct 2009; Markus Meier <maekke@gentoo.org> git-1.6.4.4.ebuild:
+ arm/x86 stable, bug #287031
+
+ 09 Oct 2009; Markus Meier <maekke@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-9999.ebuild:
+ fix dev-util/cvs detection in src_test due to built_with_use change for
+ non-existant package
+
+ 02 Oct 2009; Joseph Jezak <josejx@gentoo.org> git-1.6.4.4.ebuild:
+ Marked ppc/ppc64 stable for bug #287031.
+
+ 01 Oct 2009; Jeroen Roovers <jer@gentoo.org> git-1.6.4.4.ebuild:
+ Stable for HPPA (bug #287031).
+
+ 30 Sep 2009; Dawid Węgliński <cla@gentoo.org> git-1.6.4.4.ebuild:
+ Stable on amd64 (bu #287031)
+
+ 30 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5_rc2.ebuild:
+ No git-svn by default.
+
+*git-1.6.5_rc2 (29 Sep 2009)
+
+ 29 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5_rc2.ebuild,
+ git-9999.ebuild, metadata.xml:
+ Version bump again. Also handle bug #285238 to use the new SHA1
+ implementation by default (and add other IUSE defaults too).
+
+*git-1.6.4.4 (18 Sep 2009)
+
+ 18 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.4.ebuild:
+ Bug #285418: Version bump
+
+ 16 Sep 2009; 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.5_rc1.ebuild, git-9999.ebuild:
+ Bug #283732: Perl module should be installed to vendor_perl instead of
+ site_perl.
+
+ 16 Sep 2009; 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.5_rc1.ebuild:
+ Bug #278738: Do not use FEATURES.
+
+ 16 Sep 2009; 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.5_rc1.ebuild, git-9999.ebuild:
+ Bug #267853: Update deps for gtksourceviewer with newer GNOME.
+
+*git-1.6.5_rc1 (13 Sep 2009)
+
+ 13 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5_rc1.ebuild:
+ Version bump
+
+*git-1.6.4.3 (13 Sep 2009)
+
+ 13 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.3.ebuild:
+ Version bump
+
+*git-1.6.4.2 (30 Aug 2009)
+
+ 30 Aug 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.2.ebuild:
+ Version bump.
+
+*git-1.6.4.1 (27 Aug 2009)
+
+ 27 Aug 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.1.ebuild:
+ Bug #282667: version bump.
+
+ 30 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
+ -files/20080626-git-1.5.6.1-noperl.patch,
+ -files/20081123-git-1.6.0.4-noperl-cvsserver.patch, -git-1.6.0.6.ebuild,
+ -git-1.6.1.ebuild, -git-1.6.1.1.ebuild,
+ -files/20090126-git-1.6.1.1-noperl.patch, -git-1.6.1.2.ebuild,
+ -git-1.6.1.3.ebuild, -git-1.6.2.ebuild, -git-1.6.2.2.ebuild,
+ -git-1.6.2.2-r1.ebuild, -git-1.6.2.3.ebuild, -git-1.6.2.5.ebuild,
+ -git-1.6.2.5-r1.ebuild, -files/20090505-git-1.6.2.5-getopt-fixes.patch,
+ -files/20090305-git-1.6.2-noperl.patch, -git-1.6.3.ebuild,
+ -files/vim-ftdetect-gitcommit.vim:
+ Trim old version.
+
+*git-1.6.4 (29 Jul 2009)
+*git-1.6.3.4 (29 Jul 2009)
+
+ 29 Jul 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3.4.ebuild,
+ +git-1.6.4.ebuild:
+ New upstream releases.
+
+ 30 Jun 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.3.3.ebuild:
+ arm/ia64/s390/sh/sparc stable wrt #273905
+
+ 27 Jun 2009; Brent Baude <ranger@gentoo.org> git-1.6.3.3.ebuild:
+ Marking git-1.6.3.3 ppc64 and ppc for bug 273905
+
+ 27 Jun 2009; Christian Faulhammer <fauli@gentoo.org> git-1.6.3.3.ebuild:
+ stable x86, security bug 273905
+
+ 26 Jun 2009; Tobias Heinlein <keytoaster@gentoo.org> git-1.6.3.3.ebuild:
+ amd64 stable, security bug ##273905
+
+ 26 Jun 2009; Tobias Klausmann <klausman@gentoo.org> git-1.6.3.3.ebuild:
+ Stable on alpha, bug #273905
+
+ 24 Jun 2009; Jeroen Roovers <jer@gentoo.org> git-1.6.3.3.ebuild:
+ Stable for HPPA (bug #273905).
+
+*git-1.6.3.3 (22 Jun 2009)
+
+ 22 Jun 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3.3.ebuild:
+ Version bump per bugs 274608 and 273905, has DoS fixes for gid-daemon.
+
+*git-1.6.3.1 (18 May 2009)
+
+ 18 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3.1.ebuild:
+ Version bump.
+
+ 10 May 2009; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+ getopt fixes in HEAD.
+
+ 08 May 2009; Robin H. Johnson <robbat2@gentoo.org> +files/50git-gentoo.el:
+ Accidently removed a used file.
+
+ 08 May 2009; Robin H. Johnson <robbat2@gentoo.org> -git-1.5.1.6.ebuild,
+ -git-1.5.3.7-r1.ebuild, -git-1.5.3.8.ebuild,
+ -files/git-1.5.3.8-t9101.patch, -files/git-1.5.3.8-t9106.patch,
+ -files/20080322-git-1.5.4.4-noperl.patch, -git-1.5.5.4.ebuild,
+ -files/70git-gentoo.el, -files/git-1.5.0-symlinks.patch,
+ -git-1.5.4.5.ebuild, -files/20080423-git-1.5.5.1-noperl.patch,
+ -git-1.5.5.3.ebuild, -git-1.5.5.3-r1.ebuild,
+ -files/20080528-git-1.5.5.3-noperl.patch, -git-1.5.6.1.ebuild,
+ -files/50git-gentoo.el, -git-1.5.6.2.ebuild, -files/72git-gentoo.el,
+ -files/git-1.5.3-symlinks.patch, -git-1.5.6.3.ebuild, -git-1.5.6.4.ebuild,
+ -git-1.5.6.5.ebuild, -git-1.6.0.ebuild, -git-1.6.0.1.ebuild,
+ -git-1.6.0.2.ebuild, -git-1.6.0.3.ebuild, -git-1.6.0.4.ebuild,
+ -git-1.6.0.4-r1.ebuild, -git-1.6.0.4-r2.ebuild, -git-1.6.3_rc4.ebuild:
+ Cleanup old ebuilds and files.
+
+*git-1.6.3 (08 May 2009)
+
+ 08 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3.ebuild:
+ Version bump.
+
+*git-1.6.2.5-r1 (08 May 2009)
+
+ 08 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.5-r1.ebuild:
+ Bug 268817: Accidently dropped the noperl patch, it's only merged in
+ upstreams 1.6.3.x series.
+
+ 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.5.ebuild,
+ git-1.6.3_rc4.ebuild, git-9999.ebuild:
+ Fix bug #267853: dev-python/gtksourceview-python needed for gitview.
+ Update git-9999 for getopt fixes.
+
+ 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.5.ebuild,
+ git-1.6.3_rc4.ebuild:
+ Backport a fix from the live ebuild.
+
+ 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.5.ebuild,
+ +files/20090505-git-1.6.2.5-getopt-fixes.patch, git-1.6.3_rc4.ebuild:
+ Fix Getopt::Long usage bug, patch submitted to upstream as well.
+
+*git-1.6.2.5 (05 May 2009)
+
+ 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.5.ebuild:
+ Version bump.
+
+*git-1.6.3_rc4 (05 May 2009)
+
+ 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3_rc4.ebuild:
+ Version bump to release candidate for 1.6.3. In package.mask for the
+ moment.
+
+*git-1.6.2.3 (13 Apr 2009)
+
+ 13 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.3.ebuild:
+ Version bump.
+
+ 13 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.2-r1.ebuild,
+ git-9999.ebuild:
+ Bug #221179, do not install perl .packlist.
+
+ 12 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.2-r1.ebuild,
+ git-9999.ebuild:
+ Manpages were missed in live ebuild.
+
+ 05 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+ Upstream is mergign the noperl patch now.
+
+ 05 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+ Forgot a bit.
+
+ 05 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.2-r1.ebuild:
+ Refix bug #237210, missed a part.
+
+*git-9999 (03 Apr 2009)
+*git-1.6.2.2-r1 (03 Apr 2009)
+
+ 03 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.2-r1.ebuild,
+ +git-9999.ebuild:
+ Bug #238023 - add an scm-capable ebuild for Git, use it to tidy up the
+ ebuild a bit too. Based on the work by Sebastian Pipping
+ <webmaster@hartwork.org>.
+
+*git-1.6.2.2 (03 Apr 2009)
+
+ 03 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.2.ebuild:
+ Version bump, also fixes bug #237210 for Emacs users.
+
+ 03 Apr 2009; Robin H. Johnson <robbat2@gentoo.org>
+ files/20090305-git-1.6.2-noperl.patch:
+ Fix testsuite functionality with USE=-perl, the add-interactive test uses
+ perl and was not excluded.
+
+ 23 Mar 2009; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+ Update metadata, ricmm is joining as a maintainer.
+
+ 21 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ metadata.xml:
+ Removing ferdy as a maintainer since he was retired.
+
+ 06 Mar 2009; Christian Faulhammer <fauli@gentoo.org> git-1.6.2.ebuild:
+ fix HOMEPAGE
+
+*git-1.6.2 (06 Mar 2009)
+
+ 06 Mar 2009; Robin H. Johnson <robbat2@gentoo.org>
+ +files/20090305-git-1.6.2-noperl.patch, +git-1.6.2.ebuild:
+ Version bump per bug #261241. Also fix bugs #256964, #238586. EAPI2 now in
+ use.
+
+*git-1.6.1.3 (11 Feb 2009)
+
+ 11 Feb 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.1.3.ebuild:
+ Version bump.
+
+*git-1.6.1.2 (02 Feb 2009)
+
+ 02 Feb 2009; Greg Kroah-Hartman <gregkh@gentoo.org> +git-1.6.1.2.ebuild:
+ version bump to 1.6.1.2 to fix pack-objects problem in 1.6.1.1
+
+*git-1.6.1.1 (26 Jan 2009)
+
+ 26 Jan 2009; Robin H. Johnson <robbat2@gentoo.org>
+ +files/20090126-git-1.6.1.1-noperl.patch, +git-1.6.1.1.ebuild:
+ Version bump. Also bug #254029 - fix noperl patch.
+
+ 08 Jan 2009; Brent Baude <ranger@gentoo.org> git-1.6.0.6.ebuild:
+ Marking git-1.6.0.6 ppc64 for bug 251343
+
+*git-1.6.1 (06 Jan 2009)
+
+ 06 Jan 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.1.ebuild:
+ Version bump, bug 250321.
+
+ 01 Jan 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.0.6.ebuild:
+ s390/sh stable wrt #251343
+
+ 29 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> git-1.6.0.6.ebuild:
+ ppc stable, bug #251343
+
+ 25 Dec 2008; Jeroen Roovers <jer@gentoo.org> git-1.6.0.6.ebuild:
+ Stable for HPPA (bug #251343).
+
+ 23 Dec 2008; Raúl Porcel <armin76@gentoo.org> git-1.6.0.6.ebuild:
+ alpha/arm/ia64 stable wrt #251343
+
+ 23 Dec 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.6.0.6.ebuild:
+ Factor out the long emake invocation so that we can consistently call it
+ and avoid triggering a rebuild during install or test.
+
+ 23 Dec 2008; Markus Meier <maekke@gentoo.org> git-1.6.0.6.ebuild:
+ amd64/x86 stable, bug #251343
+
+ 23 Dec 2008; Ferris McCormick <fmccor@gentoo.org> git-1.6.0.6.ebuild:
+ Sparc stable --- Security Bug #251343 --- all tests expected to pass do pass.
+
+*git-1.6.0.6 (23 Dec 2008)
+
+ 23 Dec 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.6.ebuild:
+ Version bump.
+
+ 27 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> files/git-daemon.initd:
+ Refix bug #238351 so that it works under baselayout1 and baselayout2.
+
+*git-1.6.0.4-r2 (24 Nov 2008)
+
+ 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> files/git-daemon.initd,
+ +git-1.6.0.4-r2.ebuild:
+ Fix dumb typo, revbump to ensure any users that got the typo also get the
+ fix.
+
+ 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+ Document what USE=gtk does for Git.
+
+ 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.6.0.4-r1.ebuild:
+ Bug #240280, fix to use CFLAGS/LDFLAGS better.
+
+ 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.5.ebuild,
+ git-1.5.5.3.ebuild, git-1.5.5.3-r1.ebuild, git-1.5.5.4.ebuild,
+ git-1.5.6.1.ebuild, git-1.5.6.2.ebuild, git-1.5.6.3.ebuild,
+ git-1.5.6.4.ebuild, git-1.5.6.5.ebuild, git-1.6.0.ebuild,
+ git-1.6.0.1.ebuild, git-1.6.0.2.ebuild, git-1.6.0.3.ebuild,
+ git-1.6.0.4.ebuild, git-1.6.0.4-r1.ebuild:
+ Even better fixup for bug #238129.
+
+ 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.6.0.4-r1.ebuild:
+ Bug #238586, issue a warning for dev-util/subversion[dso].
+
+ 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.5.ebuild,
+ git-1.5.5.3.ebuild, git-1.5.5.3-r1.ebuild, git-1.5.5.4.ebuild,
+ git-1.5.6.1.ebuild, git-1.5.6.2.ebuild, git-1.5.6.3.ebuild,
+ git-1.5.6.4.ebuild, git-1.5.6.5.ebuild, git-1.6.0.ebuild,
+ git-1.6.0.1.ebuild, git-1.6.0.2.ebuild, git-1.6.0.3.ebuild,
+ git-1.6.0.4.ebuild, git-1.6.0.4-r1.ebuild:
+ Bug #238129, the default behavior of built_with_use changed at some point.
+ We do not want to die, but just to print a warning.
+
+*git-1.6.0.4-r1 (24 Nov 2008)
+
+ 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> +files/50git-gentoo.el,
+ +files/20081123-git-1.6.0.4-noperl-cvsserver.patch,
+ files/git-daemon.confd, files/git-daemon.initd, +git-1.6.0.4-r1.ebuild:
+ Fix bug #235393 for Emacs users. Fix bug #238351 for running the
+ standalone init.d more safely as non-root and include the pidfile. Bug
+ #247487, cvsserver now needs the Perl stuff. Bug #248446, fix htmldir
+ support.
+
+*git-1.6.0.4 (18 Nov 2008)
+
+ 18 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.4.ebuild:
+ Bug #246244, version bump.
+
+*git-1.6.0.3 (29 Oct 2008)
+
+ 29 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.3.ebuild:
+ Version bump.
+
+*git-1.6.0.2 (21 Sep 2008)
+
+ 21 Sep 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.2.ebuild:
+ Version bump.
+
+ 16 Sep 2008; Jeroen Roovers <jer@gentoo.org> git-1.5.6.4.ebuild:
+ Stable for HPPA (bug #234075).
+
+ 16 Sep 2008; Robin H. Johnson <robbat2@gentoo.org> files/git-daemon.initd,
+ files/git-daemon.xinetd:
+ Git 1.6 requires that daemon been an argument not part of the name.
+
+*git-1.6.0.1 (30 Aug 2008)
+
+ 30 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.1.ebuild:
+ Version bump, only bugfixes.
+
+ 25 Aug 2008; Ulrich Mueller <ulm@gentoo.org> -files/71git-gentoo.el,
+ files/72git-gentoo.el:
+ Add comment in Emacs site-init file wrt bug 235393. Remove unused file.
+
+ 27 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.6.4.ebuild,
+ git-1.5.6.5.ebuild, git-1.6.0.ebuild:
+ Remove references to dev-util/tla is latest stable and ~arch versions, per
+ bug #235681
+
+*git-1.6.0 (24 Aug 2008)
+
+ 24 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.ebuild:
+ Major version bump. Fixes bugs 219839, 225601 for userpriv during testing,
+ working subversion-1.5 support per bug 224185 and skips installing git-svn
+ when USE=-subversion per bug 233550.
+
+*git-1.5.6.5 (16 Aug 2008)
+
+ 16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.6.5.ebuild:
+ Version bump.
+
+ 16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+ Make repoman happy.
+
+ 08 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org> git-1.5.6.4.ebuild:
+ ppc stable, bug #234075
+
+ 08 Aug 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.6.4.ebuild:
+ alpha/ia64 stable wrt #234075
+
+ 07 Aug 2008; Markus Meier <maekke@gentoo.org> git-1.5.6.4.ebuild:
+ x86 stable, bug #234075
+
+ 07 Aug 2008; Markus Rothe <corsair@gentoo.org> git-1.5.6.4.ebuild:
+ Stable on ppc64; bug #234075
+
+ 07 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org> git-1.5.6.4.ebuild:
+ stable amd64, bug #234075
+
+ 06 Aug 2008; Ferris McCormick <fmccor@gentoo.org> git-1.5.6.4.ebuild:
+ Sparc stable, security bug #234075 (good for about a week anyway).
+
+*git-1.5.6.4 (28 Jul 2008)
+
+ 28 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.6.4.ebuild:
+ Version bump.
+
+*git-1.5.6.3 (17 Jul 2008)
+
+ 17 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.6.3.ebuild:
+ Bug #232068, version bump.
+
+*git-1.5.6.2 (10 Jul 2008)
+
+ 10 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.6.2.ebuild:
+ Version bump per bug #231380.
+
+*git-1.5.6.1 (26 Jun 2008)
+
+ 26 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
+ +files/20080626-git-1.5.6.1-noperl.patch, +git-1.5.6.1.ebuild:
+ Version bump.
+
+ 24 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.5.4.ebuild:
+ Fix bug thanks to compnerd.
+
+ 11 Jun 2008; nixnut <nixnut@gentoo.org> git-1.5.4.5.ebuild:
+ Stable on ppc wrt bug 225231
+
+ 11 Jun 2008; Kenneth Prugh <ken69267@gentoo.org> git-1.5.4.5.ebuild:
+ amd64 stable, bug #225231
+
+*git-1.5.5.4 (11 Jun 2008)
+
+ 11 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.5.4.ebuild:
+ Version bump.
+
+ 10 Jun 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.4.5.ebuild:
+ alpha/ia64/sparc/x86 stable wrt #225231
+
+ 09 Jun 2008; Brent Baude <ranger@gentoo.org> git-1.5.4.5.ebuild:
+ stable ppc64, bug 225231
+
+*git-1.5.5.3-r1 (07 Jun 2008)
+
+ 07 Jun 2008; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.2.5.ebuild,
+ -git-1.5.4.ebuild, -git-1.5.4.2.ebuild, -git-1.5.4.3.ebuild,
+ -git-1.5.4.4.ebuild, -git-1.5.4.4-r1.ebuild, -git-1.5.5.1.ebuild,
+ -git-1.5.5.1-r1.ebuild, +git-1.5.5.3-r1.ebuild:
+ Remove unneeded patches to Makefile. Stop die'ing upon a bad USE
+ configuration by taking a sane decision. Remove unused versions.
+
+ 28 May 2008; Robin H. Johnson <robbat2@gentoo.org>
+ files/20080528-git-1.5.5.3-noperl.patch:
+ Forgot to add doc at the top of the new patch.
+
+*git-1.5.5.3 (28 May 2008)
+
+ 28 May 2008; Robin H. Johnson <robbat2@gentoo.org>
+ +files/20080528-git-1.5.5.3-noperl.patch,
+ +files/vim-ftdetect-gitcommit.vim, +git-1.5.5.3.ebuild:
+ Version bump, 1.5.5 series is pretty ready for primetime.
+
+*git-1.5.5.1-r1 (29 Apr 2008)
+
+ 29 Apr 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.5.1-r1.ebuild:
+ The gitweb.cgi did not contain the build-time replacements. Ensure that it
+ does, and also make it executable by default so that portage does not
+ strip the executability on upgrade.
+
+ 24 Apr 2008; Robin H. Johnson <robbat2@gentoo.org>
+ +files/20080322-git-1.5.4.4-noperl.patch,
+ -files/20080322-git-1.5.5.4-noperl.patch, git-1.5.4.4-r1.ebuild,
+ git-1.5.4.5.ebuild:
+ Fix bad numbering of file.
+
+ 24 Apr 2008; Robin H. Johnson <robbat2@gentoo.org>
+ files/20080423-git-1.5.5.1-noperl.patch:
+ No absolute paths in patches! Bug #219099.
+
+*git-1.5.5.1 (24 Apr 2008)
+
+ 24 Apr 2008; Robin H. Johnson <robbat2@gentoo.org>
+ +files/20080423-git-1.5.5.1-noperl.patch, +git-1.5.5.1.ebuild:
+ Bump to 1.5.5.1 per bug 217593, noperl patch ported by dberkholz.
+
+*git-1.5.4.5 (29 Mar 2008)
+
+ 29 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4.5.ebuild:
+ Version bump.
+
+ 24 Mar 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.4.4-r1.ebuild:
+ Re-add ~ia64 wrt #214464
+
+*git-1.5.4.4-r1 (24 Mar 2008)
+
+ 24 Mar 2008; Robin H. Johnson <robbat2@gentoo.org>
+ +files/20080322-git-1.5.5.4-noperl.patch, +git-1.5.4.4-r1.ebuild:
+ Per bug 214168, some users are really picky about wanting a Perl-free Git.
+ This new revision makes that a possibility, and now also introduces most
+ of the dependancies that were only previously stated in the pkg_postinst
+ phase. The following arch keywords have been dropped per bug 214464 until
+ the arches can keyword the dependancies: arm, ia64, s390, sh.
+
+ 20 Mar 2008; Mike Frysinger <vapier@gentoo.org> git-1.5.4.4.ebuild:
+ Add support for USE=xinetd #213014.
+
+ 20 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.4.ebuild:
+ The base Git.pm module now requires dev-perl/Error, so it is no longer
+ optional under USE=perl. dev-perl/Net-SMTP-SSL remains optional as it is
+ only used for git-send-email.
+
+ 17 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.4.ebuild:
+ dev-perl/Authen-SASL is an indirect dependancy of Net-SMTP-SSL already w/
+ USE=sasl, so we can skip it here.
+
+*git-1.5.4.4 (17 Mar 2008)
+
+ 17 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4.4.ebuild:
+ Version bump, fixing bugs #213549, #213543, #212131.
+
+*git-1.5.4.3 (27 Feb 2008)
+
+ 27 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4.3.ebuild:
+ Version bump.
+
+*git-1.5.4.2 (17 Feb 2008)
+
+ 17 Feb 2008; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.4.2.ebuild:
+ New upstream version
+
+ 11 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> git-1.5.4.ebuild:
+ Fix sed for LDFLAGS, and make CFLAGS sed as robust as that.
+
+ 03 Feb 2008; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.4.ebuild:
+ Add USE=threads as per bug #208422
+
+*git-1.5.4 (03 Feb 2008)
+
+ 03 Feb 2008; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.4_rc2.ebuild,
+ -git-1.5.4_rc3.ebuild, -git-1.5.4_rc4.ebuild, +git-1.5.4.ebuild:
+ New upstream version. Remove RCs for 1.5.4
+
+ 01 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.2.5.ebuild,
+ git-1.5.3.7-r1.ebuild, git-1.5.3.8.ebuild, git-1.5.4_rc2.ebuild,
+ git-1.5.4_rc3.ebuild, git-1.5.4_rc4.ebuild:
+ Clarify the extra deps for git-svnimport.
+
+*git-1.5.4_rc4 (01 Feb 2008)
+
+ 01 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc4.ebuild:
+ Version bump.
+
+ 14 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+ git-1.5.3.7-r1.ebuild:
+ ppc. stable
+
+*git-1.5.4_rc3 (14 Jan 2008)
+
+ 14 Jan 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc3.ebuild:
+ Bump the release candidate for more testing.
+
+ 13 Jan 2008; Fernando J. Pereda <ferdy@gentoo.org>
+ +files/git-1.5.3.8-t9101.patch, git-1.5.3.8.ebuild:
+ Add a fix for some test cases under subversion 1.4.6
+
+*git-1.5.3.8 (10 Jan 2008)
+
+ 10 Jan 2008; Fernando J. Pereda <ferdy@gentoo.org>
+ +files/git-1.5.3.8-t9106.patch, -git-1.5.3.2.ebuild, -git-1.5.3.3.ebuild,
+ -git-1.5.3.4.ebuild, -git-1.5.3.4-r1.ebuild, -git-1.5.3.5.ebuild,
+ -git-1.5.3.6.ebuild, -git-1.5.3.6-r1.ebuild, -git-1.5.3.7.ebuild,
+ +git-1.5.3.8.ebuild, -git-1.5.4_rc0.ebuild, -git-1.5.4_rc1.ebuild,
+ git-1.5.4_rc2.ebuild:
+ Version bump. Fix some bugs and style nits. Remove unneeded verbosity.
+ Remove unused versions.
+
+*git-1.5.4_rc2 (01 Jan 2008)
+
+ 01 Jan 2008; Markus Ullmann <jokey@gentoo.org> +git-1.5.4_rc2.ebuild:
+ Version bump, granted by robbat2 as test-suite passes
+
+ 29 Dec 2007; <welp@gentoo.org> git-1.5.4_rc1.ebuild:
+ Keyworded ~sparc-fbsd; bug 203655
+
+ 27 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild:
+ Stable on amd64. Tested by myself and gentoofan23.
+
+ 25 Dec 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.3.7-r1.ebuild:
+ alpha/ia64/sparc/x86 stable wrt #202383
+
+ 25 Dec 2007; Brent Baude <ranger@gentoo.org> git-1.5.3.7-r1.ebuild:
+ Marking git-1.5.3.7-r1 ppc64 for bug 203283
+
+ 25 Dec 2007; nixnut <nixnut@gentoo.org> ChangeLog:
+ Stable on ppc wrt bug 203283
+
+ 25 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild,
+ git-1.5.4_rc0.ebuild, git-1.5.4_rc1.ebuild:
+ Bug 201544: Use the proper build mechanism to disable the Tk-using sections
+ of git.
+
+*git-1.5.4_rc1 (25 Dec 2007)
+
+ 25 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc1.ebuild:
+ Add latest rc from upstream.
+
+ 25 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild,
+ git-1.5.4_rc0.ebuild:
+ Install the git-p4 tool and the import-tars tool.
+
+ 17 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.1.6.ebuild,
+ git-1.5.2.5.ebuild, git-1.5.3.2.ebuild, git-1.5.3.3.ebuild,
+ git-1.5.3.4.ebuild, git-1.5.3.4-r1.ebuild, git-1.5.3.5.ebuild,
+ git-1.5.3.6.ebuild, git-1.5.3.6-r1.ebuild, git-1.5.3.7.ebuild,
+ git-1.5.3.7-r1.ebuild, git-1.5.4_rc0.ebuild:
+ Clean up all minorsyn problems with ebuilds.
+
+*git-1.5.4_rc0 (17 Dec 2007)
+
+ 17 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc0.ebuild:
+ Version bump. rc0 is for testing only, not production uage. Masked via
+ package.mask.
+
+ 06 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild:
+ Fix typo.
+
+*git-1.5.3.7-r1 (06 Dec 2007)
+
+ 06 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.3.7-r1.ebuild:
+ Install the gitweb stuff, as it's used by instaweb, and is also
+ independantly useful, but does not lend itself to webapp-config very well.
+
+*git-1.5.3.7 (05 Dec 2007)
+
+ 05 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.3.7.ebuild:
+ Version bump. Please note that the CVS testcases are disabled unless you
+ have FEATURES=userpriv, as CVS rejects commits as root.
+
+*git-1.5.3.6-r1 (22 Nov 2007)
+
+ 22 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.3.6-r1.ebuild:
+ Add missing cpio dependancy, redo the documentation install so that the text
+ versions and (optionally) HTML versions are installed including the release
+ notes. Also install some new bits from contrib: blameview,
+ continuous-integration, remotes2config.
+
+*git-1.5.3.6 (20 Nov 2007)
+
+ 20 Nov 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.6.ebuild:
+ New upstream version
+
+*git-1.5.3.5 (14 Nov 2007)
+
+ 14 Nov 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.5.ebuild:
+ Version bump (bug #198903)
+
+ 19 Oct 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.3.4-r1.ebuild:
+ vim-plugin.eclass pulls in vim, that is not desired. Revert that change for now
+
+*git-1.5.3.4-r1 (19 Oct 2007)
+
+ 19 Oct 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.4-r1.ebuild:
+ Install vim and some stuff from contrib (related: bug #194940)
+
+ 05 Oct 2007; Mike Frysinger <vapier@gentoo.org> git-1.5.3.4.ebuild:
+ Fix incorrect binding of iconv<->uclibc.
+
+*git-1.5.3.4 (04 Oct 2007)
+
+ 04 Oct 2007; Fernando J. Pereda <ferdy@gentoo.org> +files/72git-gentoo.el,
+ +git-1.5.3.4.ebuild:
+ New upstream version. Include fixes from bug #194690 thanks to Christian
+ Faulhammer <opfer@gentoo.org>
+
+*git-1.5.3.3 (30 Sep 2007)
+
+ 30 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.3.ebuild:
+ New upstream version
+
+ 28 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.3.ebuild:
+ Remove 1.5.3
+
+ 28 Sep 2007; Joshua Kinard <kumba@gentoo.org> git-1.5.2.5.ebuild:
+ Stable on mips, per #193113.
+
+ 20 Sep 2007; Christoph Mende <angelos@gentoo.org> git-1.5.2.5.ebuild:
+ Stable on amd64 wrt bug #193113
+
+ 20 Sep 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.2.5.ebuild:
+ alpha/ia64 stable wrt #193113
+
+ 20 Sep 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.2.5.ebuild:
+ Stable for SPARC (bug #193113).
+
+ 20 Sep 2007; Brent Baude <ranger@gentoo.org> git-1.5.2.5.ebuild:
+ Marking git-1.5.2.5 ppc64 for bug 193113
+
+ 19 Sep 2007; Lars Weiler <pylon@gentoo.org> git-1.5.2.5.ebuild:
+ Stable on ppc; bug #193113.
+
+ 19 Sep 2007; Markus Meier <maekke@gentoo.org> git-1.5.2.5.ebuild:
+ x86 stable, bug #193113
+
+*git-1.5.3.2 (19 Sep 2007)
+
+ 19 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.2.ebuild:
+ New upstream version
+
+*git-1.5.3 (02 Sep 2007)
+
+ 02 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.3_rc7.ebuild,
+ +git-1.5.3.ebuild:
+ New upstream version. Remove rc7
+
+*git-1.5.3_rc7 (29 Aug 2007)
+
+ 29 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org>
+ -files/git-1.5.3_rc5-read-tree.patch, -git-1.5.3_rc5-r1.ebuild,
+ +git-1.5.3_rc7.ebuild:
+ New upstream version. Remove rc5
+
+ 24 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.2.4.ebuild,
+ -git-1.5.3_rc4.ebuild:
+ Remove unused obsoleted versions
+
+*git-1.5.2.5 (15 Aug 2007)
+
+ 15 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.2.5.ebuild:
+ New maintenance version for 1.5.2 series
+
+*git-1.5.3_rc5-r1 (15 Aug 2007)
+
+ 15 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org>
+ +files/git-1.5.3_rc5-read-tree.patch, -git-1.5.3_rc5.ebuild,
+ +git-1.5.3_rc5-r1.ebuild:
+ Add a patch to fix a segfault in rc5. Remove the buggy version. rc4 is safe.
+
+*git-1.5.3_rc5 (15 Aug 2007)
+
+ 15 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3_rc5.ebuild:
+ New upstream version.
+
+ 13 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org>
+ -files/git-1.5.2-tempfile.patch, -git-1.5.0.7.ebuild, -git-1.5.2.ebuild,
+ -git-1.5.2.1.ebuild, -git-1.5.2.2.ebuild:
+ Remove old and unused stuff
+
+*git-1.5.3_rc4 (08 Aug 2007)
+
+ 08 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org>
+ +files/git-1.5.3-symlinks.patch, +git-1.5.3_rc4.ebuild:
+ Version bump
+
+ 29 Jul 2007; Christian Heim <phreak@gentoo.org> git-1.5.0.7.ebuild,
+ git-1.5.1.6.ebuild, git-1.5.2.ebuild, git-1.5.2.1.ebuild,
+ git-1.5.2.2.ebuild, git-1.5.2.4.ebuild:
+ Fixing the DEPEND/RDEPEND for the move of net-www/apache to
+ www-servers/apache (#78622).
+
+*git-1.5.2.4 (27 Jul 2007)
+
+ 27 Jul 2007; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
+ git-1.5.0.7.ebuild, git-1.5.1.6.ebuild, git-1.5.2.ebuild,
+ git-1.5.2.1.ebuild, git-1.5.2.2.ebuild, +git-1.5.2.4.ebuild:
+ Add new upstream version, and also improve the DESCRIPTION per bug #185057,
+ and the longdescription in metadata at the same time.
+
+ 25 Jun 2007; Joshua Kinard <kumba@gentoo.org> git-1.5.1.6.ebuild:
+ Stable on mips, per #179245.
+
+ 23 Jun 2007; Matti Bickel <mabi@gentoo.org> git-1.5.1.6.ebuild:
+ ppc stable (bug #179245)
+
+*git-1.5.2.2 (16 Jun 2007)
+
+ 16 Jun 2007; Fernando J. Pereda <ferdy@gentoo.org> +files/71git-gentoo.el,
+ +git-1.5.2.2.ebuild:
+ New upstream version. Fix for bug #181718
+
+ 14 Jun 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.1.6.ebuild:
+ Stable for HPPA (bug #179245).
+
+*git-1.5.2.1 (04 Jun 2007)
+
+ 04 Jun 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.2.1.ebuild:
+ New upstream version
+
+ 31 May 2007; Daniel Gryniewicz <dang@gentoo.org> git-1.5.1.6.ebuild:
+ Marked stable on amd64 for bug #179245
+
+ 28 May 2007; Brent Baude <ranger@gentoo.org> git-1.5.1.6.ebuild:
+ Marking git-1.5.1.6 ppc64 stable for bug 179245
+
+ 24 May 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.1.6.ebuild:
+ ia64 + x86 stable wrt #179245
+
+ 23 May 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.2.ebuild:
+ Add dev-perl/TermReadKey for git-svn. Fixes bug #179560
+
+ 23 May 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.1.6.ebuild:
+ Stable on alpha as per bug #179245
+
+ 23 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> git-1.5.1.6.ebuild:
+ Stable on sparc wrt #179245
+
+ 21 May 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.1.6.ebuild:
+ Reverting to ~hppa.
+
+ 21 May 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.1.6.ebuild:
+ Stable for HPPA (bug #179245).
+
+*git-1.5.2 (20 May 2007)
+*git-1.5.1.6 (20 May 2007)
+
+ 20 May 2007; Fernando J. Pereda <ferdy@gentoo.org>
+ +files/git-1.5.2-tempfile.patch, -git-1.5.1.2.ebuild, -git-1.5.1.3.ebuild,
+ -git-1.5.1.4.ebuild, -git-1.5.1.5.ebuild, +git-1.5.1.6.ebuild,
+ +git-1.5.2.ebuild:
+ New upstream versions. Remove old ones.
+
+*git-1.5.1.5 (19 May 2007)
+
+ 19 May 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.1.5.ebuild:
+ New upstream version. Fixes bug #177280.
+
+*git-1.5.1.4 (09 May 2007)
+
+ 09 May 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.1.4.ebuild:
+ Version bump.
+
+*git-1.5.1.3 (01 May 2007)
+
+ 01 May 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.1.3.ebuild:
+ Version bump.
+
+ 24 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.1.1.ebuild,
+ -git-1.4.4.4.ebuild, -git-1.5.1.1.ebuild:
+ Remove unused stuff
+
+ 23 Apr 2007; Bryan Østergaard <kloeri@gentoo.org> git-1.5.0.7.ebuild:
+ Stable on Mips, bug 173327.
+
+*git-1.5.1.2 (23 Apr 2007)
+
+ 23 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.1.2.ebuild:
+ New upstream version.
+
+*git-1.5.1.1 (12 Apr 2007)
+
+ 12 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.1.ebuild,
+ +git-1.5.1.1.ebuild:
+ New upstream version, superceeds 1.5.1
+
+ 11 Apr 2007; Christian Faulhammer <opfer@gentoo.org> git-1.5.0.7.ebuild:
+ stable amd64, bug 173327
+
+ 08 Apr 2007; Markus Rothe <corsair@gentoo.org> git-1.5.0.7.ebuild:
+ Stable on ppc64; bug #173327
+
+ 06 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> git-1.5.0.7.ebuild:
+ ppc stable
+
+ 04 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.0.7.ebuild:
+ Stable on alpha wrt bug #173327
+
+ 04 Apr 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.0.7.ebuild:
+ Stable for HPPA (bug #173327).
+
+ 04 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> git-1.5.0.7.ebuild:
+ Stable on sparc wrt #173327
+
+ 04 Apr 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.0.7.ebuild:
+ ia64 + x86 stable wrt bug 173327
+
+ 04 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.2.4.ebuild,
+ -git-1.4.4.3.ebuild:
+ Remove unused versions.
+
+*git-1.5.1 (04 Apr 2007)
+*git-1.5.0.7 (04 Apr 2007)
+
+ 04 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.6.ebuild,
+ +git-1.5.0.7.ebuild, +git-1.5.1.ebuild:
+ Revision and version bump. Remove 1.5.0.6
+
+*git-1.5.0.6 (29 Mar 2007)
+
+ 29 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.5.ebuild,
+ +git-1.5.0.6.ebuild:
+ New upstream version. Remove 1.5.0.5
+
+*git-1.5.0.5 (19 Mar 2007)
+
+ 19 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.4.ebuild,
+ +git-1.5.0.5.ebuild:
+ New upstream version. Remove old one.
+
+*git-1.5.0.4 (16 Mar 2007)
+
+ 16 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.3.ebuild,
+ -git-1.5.0.3-r1.ebuild, +git-1.5.0.4.ebuild:
+ New upstream version. Remove old ones.
+
+*git-1.5.0.3-r1 (11 Mar 2007)
+
+ 11 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org>
+ +files/git-1.5.0-symlinks.patch, +git-1.5.0.3-r1.ebuild:
+ Create relative symlinks instead of absolute ones.
+
+*git-1.5.0.3 (09 Mar 2007)
+
+ 09 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.2.ebuild,
+ +git-1.5.0.3.ebuild:
+ New upstream version. Fix for bug #170066. Remove old version.
+
+*git-1.5.0.2 (27 Feb 2007)
+
+ 27 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.1.ebuild,
+ +git-1.5.0.2.ebuild:
+ New upstream version. Remove .1 since it is buggy
+
+ 20 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.ebuild:
+ Remove unused version, superceed by 1.5.0.1
+
+*git-1.5.0.1 (19 Feb 2007)
+
+ 19 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.0.1.ebuild:
+ New upstream version.
+
+ 15 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.0.ebuild:
+ Add a showpkgdeps message for git send-email. Fixes bug #167058. Reported by
+ Christian Schlotter <again@gmx.de>
+
+*git-1.5.0 (14 Feb 2007)
+
+ 14 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.0.ebuild:
+ New upstream version.
+
+ 15 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> git-1.4.4.4.ebuild:
+ Stable on sparc wrt #159822
+
+ 15 Jan 2007; Jeroen Roovers <jer@gentoo.org> git-1.4.4.4.ebuild:
+ Stable for HPPA (bug #159822).
+
+ 15 Jan 2007; Steve Dibb <beandog@gentoo.org> git-1.4.4.4.ebuild:
+ amd64 stable, bug 159822
+
+ 14 Jan 2007; Markus Rothe <corsair@gentoo.org> git-1.4.4.4.ebuild:
+ Stable on ppc64; bug #159822
+
+ 13 Jan 2007; Andrej Kacian <ticho@gentoo.org> git-1.4.4.4.ebuild:
+ Stable on x86, bug #159822.
+
+ 13 Jan 2007; nixnut <nixnut@gentoo.org> git-1.4.4.4.ebuild:
+ Stable on ppc wrt bug 159822
+
+*git-1.4.4.4 (12 Jan 2007)
+
+ 12 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.4.ebuild:
+ Version bump + stable on Alpha. See bug #159822
+
+ 09 Jan 2007; Markus Rothe <corsair@gentoo.org> git-1.4.4.3.ebuild:
+ Stable on ppc64; bug #159822
+
+ 07 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org> git-1.4.4.3.ebuild:
+ ppc stable, bug #159822
+
+ 06 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.5.ebuild,
+ -git-1.4.4.2.ebuild:
+ QA: Clean unused versions.
+
+ 06 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.1.1.ebuild,
+ git-1.4.2.4.ebuild, git-1.4.3.5.ebuild, git-1.4.4.2.ebuild,
+ git-1.4.4.3.ebuild:
+ einfo -> elog
+
+ 04 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> git-1.4.4.3.ebuild:
+ Stable on IA64.
+
+ 04 Jan 2007; Torsten Veller <tove@gentoo.org> git-1.4.4.3.ebuild:
+ Stable on x86 (#159822)
+
+ 04 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.4.3.ebuild:
+ Stable on alpha as per bug #159822
+
+ 04 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> git-1.4.4.3.ebuild:
+ Stable on sparc wrt #159822
+
+ 03 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.4.3.ebuild:
+ git-instaweb has some additional dependencies, fixes bug #159698
+
+ 31 Dec 2006; Robin H. Johnson <robbat2@gentoo.org> git-1.4.3.5.ebuild,
+ git-1.4.4.2.ebuild, git-1.4.4.3.ebuild:
+ Fix type in einfo.
+
+*git-1.4.4.3 (20 Dec 2006)
+
+ 20 Dec 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.3.ebuild:
+ New upstream version.
+
+*git-1.4.4.2 (07 Dec 2006)
+
+ 07 Dec 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.4.ebuild,
+ -git-1.4.4.1.ebuild, +git-1.4.4.2.ebuild:
+ New upstream version. Clean old ebuilds for the 1.4.4 branch.
+
+*git-1.4.4.1 (26 Nov 2006)
+
+ 26 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.1.ebuild:
+ New upstream version.
+
+ 16 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.4.ebuild:
+ Remove tar-tree tests if we don't have unzip installed.
+
+*git-1.4.4 (15 Nov 2006)
+
+ 15 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.ebuild:
+ New upstream version.
+
+*git-1.4.3.5 (12 Nov 2006)
+
+ 12 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.4.ebuild,
+ +git-1.4.3.5.ebuild:
+ New upstream version, superceeds 1.4.3.4
+
+ 09 Nov 2006; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
+ git-1.4.3.4.ebuild:
+ Add ~mips to keywords
+
+ 08 Nov 2006; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
+ git-1.4.1.1.ebuild:
+ Stable on mips
+
+*git-1.4.3.4 (05 Nov 2006)
+
+ 05 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.3.ebuild,
+ +git-1.4.3.4.ebuild:
+ New upstream version.
+
+*git-1.4.3.3 (30 Oct 2006)
+
+ 30 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.2.ebuild,
+ +git-1.4.3.3.ebuild:
+ New upstream version, remove old one.
+
+ 28 Oct 2006; Christian Faulhammer <opfer@gentoo.org> git-1.4.2.4.ebuild:
+ x86 stable wrt bug #151669
+
+*git-1.4.3.2 (24 Oct 2006)
+
+ 24 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.1.ebuild,
+ +git-1.4.3.2.ebuild:
+ New upstream version, remove buggy one. Also add a pkg_postinst message as
+ per bug #152320.
+
+*git-1.4.3.1 (21 Oct 2006)
+
+ 21 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.ebuild,
+ +git-1.4.3.1.ebuild:
+ New upstream version, remove a buggy one.
+
+ 21 Oct 2006; <nixnut@gentoo.org> git-1.4.2.4.ebuild:
+ Stable on ppc wrt bug 151669
+
+ 20 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.3.ebuild:
+ Add a needed fixlocalpod call to src_install spotted by Jakub Moc
+ <jakub@gentoo.org>
+
+*git-1.4.3 (19 Oct 2006)
+
+ 19 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.1.6.ebuild,
+ +git-1.4.3.ebuild:
+ New upstream version. Remove ancient one (1.1.6) since It is no longer useful
+
+ 18 Oct 2006; Patrick McLean <chutzpah@gentoo.org> git-1.4.2.4.ebuild:
+ Stable on amd64 (bug #151669).
+
+ 17 Oct 2006; Jeroen Roovers <jer@gentoo.org> git-1.4.2.4.ebuild:
+ Stable for HPPA (bug #151669).
+
+ 17 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.4.2.4.ebuild:
+ Stable on sparc wrt #151669
+
+ 17 Oct 2006; Markus Rothe <corsair@gentoo.org> git-1.4.2.4.ebuild:
+ Stable on ppc64; bug #151669
+
+ 17 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.4.ebuild:
+ Stable on alpha as per bug #151669
+
+*git-1.4.2.4 (17 Oct 2006)
+
+ 17 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.0-r1.ebuild,
+ -git-1.4.2.3.ebuild, +git-1.4.2.4.ebuild:
+ New upstream version. Remove old (1.4.0-r1) and buggy (1.4.2.3) ones.
+
+ 04 Oct 2006; Fabian Groffen <grobian@gentoo.org> git-1.4.0-r1.ebuild,
+ git-1.4.1.1.ebuild, git-1.4.2.3.ebuild:
+ Dropped ~ppc-macos, see you in prefix.
+
+*git-1.4.2.3 (02 Oct 2006)
+
+ 02 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.2.1.ebuild,
+ -git-1.4.2.2.ebuild, +git-1.4.2.3.ebuild:
+ New upstream version. Remove buggy ones.
+
+*git-1.4.2.2 (30 Sep 2006)
+
+ 30 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.2.2.ebuild:
+ New upstream version.
+
+ 27 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.2.ebuild:
+ Remove git-1.4.2 since it has a buggy builtin-mv command.
+
+ 22 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.1.ebuild:
+ Typo fixed. Bug #148413 thanks to Jimmy.Jazz@gmx.net
+
+ 13 Sep 2006; Aron Griffis <agriffis@gentoo.org> git-1.4.1.1.ebuild:
+ Mark 1.4.1.1 stable on ia64
+
+*git-1.4.2.1 (13 Sep 2006)
+
+ 13 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.2.1.ebuild:
+ New upstream version.
+
+ 11 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org>
+ +files/git-daemon.xinetd, git-1.4.2.ebuild:
+ Add a xinetd configuration file.As per bug #145177. Thanks to Patrick
+ Guimond <patg@patg.homeunix.org>
+
+ 07 Sep 2006; Christel Dahlskjaer <christel@gentoo.org> git-1.4.1.1.ebuild:
+ Added ~mips, as per bug #126850
+
+ 15 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.ebuild:
+ Typo fixed: donsider -> consider
+
+ 14 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.ebuild:
+ Only run git-svn tests if we have dev-util/subversion
+
+ 14 Aug 2006; <dougg@gentoo.org> git-1.1.6.ebuild, git-1.4.0-r1.ebuild,
+ git-1.4.1.1.ebuild, git-1.4.2.ebuild:
+ fixing tcltk USE flag as per bug #17808
+
+ 13 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.ebuild:
+ app-editors/emacs -> virtual/emacs
+
+*git-1.4.2 (13 Aug 2006)
+
+ 13 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.2.ebuild:
+ New upstream version.
+
+ 12 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.4.ebuild,
+ -git-1.3.3.ebuild, -git-1.4.0.ebuild, -git-1.4.1.ebuild:
+ Clean old versions.
+
+ 12 Aug 2006; Krzysiek Pawlik <nelchael@gentoo.org> git-1.4.1.1.ebuild:
+ Stable on x86, see bug #143586.
+
+ 12 Aug 2006; Markus Rothe <corsair@gentoo.org> git-1.4.1.1.ebuild:
+ Stable on ppc64; bug #143586
+
+ 12 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.1.1.ebuild:
+ Add ( emacs? app-editors/emacs ) dependency since elisp-common.eclass
+ doesn't provide it. Thanks to nixnut@gentoo.org for noticing.
+
+ 12 Aug 2006; Luca Barbato <lu_zero@gentoo.org> git-1.4.1.1.ebuild:
+ Marked ppc
+
+ 11 Aug 2006; Jeroen Roovers <jer@gentoo.org> git-1.4.1.1.ebuild:
+ Stable for HPPA (bug #143586).
+
+ 11 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.4.1.1.ebuild:
+ Stable on sparc wrt #143586
+
+ 11 Aug 2006; Daniel Gryniewicz <dang@gentoo.org> git-1.4.1.1.ebuild:
+ Marked stable on amd64 for
+
+ 11 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.1.1.ebuild:
+ Stable on alpha wrt bug #143586
+
+ 08 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.1.1.ebuild:
+ Recommend dev-perl/libwww-perl to use git-svn. Fixes bug #142116.
+
+*git-1.4.1.1 (25 Jul 2006)
+
+ 25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> +git-1.4.1.1.ebuild:
+ Version bump.
+
+ 11 Jul 2006; Aron Griffis <agriffis@gentoo.org> git-1.4.0-r1.ebuild,
+ git-1.4.1.ebuild:
+ Mark 1.4.0-r1 stable on ia64, mark 1.4.1 ~ia64
+
+*git-1.4.1 (02 Jul 2006)
+
+ 02 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> +git-1.4.1.ebuild:
+ Version bump to version 1.4.1. No gitweb installed as of yet.
+
+ 28 Jun 2006; Fabian Groffen <grobian@gentoo.org> git-1.4.0-r1.ebuild:
+ Marked ~ppc-macos
+
+*git-1.4.0-r1 (27 Jun 2006)
+
+ 27 Jun 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.0-r1.ebuild:
+ Install gitview and git-svn. Fixes bug #137942, thanks to Nguyen Thai Ngoc
+ Duy <pclouds@gentoo.org>.
+
+*git-1.4.0 (10 Jun 2006)
+
+ 10 Jun 2006; Fernando J. Pereda <ferdy@gentoo.org> metadata.xml,
+ -git-1.2.6.ebuild, -git-1.3.1.ebuild, -git-1.3.2.ebuild,
+ +git-1.4.0.ebuild:
+ New upstream version. Removed Carlos from metadata.xml as he requested.
+ Removed some old versions, too.
+
+ 21 May 2006; Fernando J. Pereda <ferdy@gentoo.org> +files/70git-gentoo.el,
+ git-1.3.3.ebuild:
+ Add USE=emacs support. Patch by Christian Schlotter <again@gmx.de> in bug
+ #133883.
+
+*git-1.3.3 (17 May 2006)
+
+ 17 May 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.3.3.ebuild:
+ New upstream version.
+
+ 14 May 2006; Diego Pettenò <flameeyes@gentoo.org> git-1.3.2.ebuild:
+ Add ~x86-fbsd keyword.
+
+*git-1.3.2 (04 May 2006)
+
+ 04 May 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.3.2.ebuild:
+ New upstream version.
+
+*git-1.3.1 (25 Apr 2006)
+
+ 25 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.3.0-r1.ebuild,
+ +git-1.3.1.ebuild:
+ Version bump. Remove 1.3.0-r1.
+
+ 21 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.2.4.ebuild:
+ Stable on hppa
+
+*git-1.3.0-r1 (19 Apr 2006)
+
+ 19 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.3.0.ebuild,
+ +git-1.3.0-r1.ebuild:
+ Remove unneeded dependencies and add a new tarball with some late
+ documentation changes. Install git-send-email unconditionally since now it
+ doesn't require extra deps (the related USE-flag goes away). Inform about
+ git-cvsserver. Remove the buggy old one.
+
+*git-1.3.0 (18 Apr 2006)
+
+ 18 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.3.0.ebuild:
+ New upstream version.
+
+*git-1.2.6 (08 Apr 2006)
+
+ 08 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.5.ebuild,
+ +git-1.2.6.ebuild:
+ New upstream version. Removed 1.2.5
+
+*git-1.2.5 (05 Apr 2006)
+
+ 05 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.3.ebuild,
+ +git-1.2.5.ebuild:
+ New upstream version. Use the X use flag instead of tcltk. Remove 1.2.3.
+
+ 22 Mar 2006; Luis Medinas <metalgod@gentoo.org> git-1.2.4.ebuild:
+ Stable on amd64. Bug #126850.
+
+ 22 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.2.4.ebuild:
+ ~hppa blessing
+
+ 20 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.2.4.ebuild:
+ Stable on sparc wrt #126850
+
+ 20 Mar 2006; Luca Barbato <lu_zero@gentoo.org> git-1.2.4.ebuild:
+ Marked ppc
+
+ 19 Mar 2006; Krzysiek Pawlik <nelchael@gentoo.org> git-1.2.4.ebuild:
+ Stable on x86, see bug #126850.
+
+ 19 Mar 2006; Markus Rothe <corsair@gentoo.org> git-1.2.4.ebuild:
+ Stable on ppc64; bug #126850
+
+ 19 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.2.4.ebuild:
+ Stable on alpha wrt bug #126850
+
+*git-1.2.4 (02 Mar 2006)
+
+ 02 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.1.ebuild,
+ -git-1.2.2.ebuild, +git-1.2.4.ebuild:
+ New upstream version. Trim old ones
+
+*git-1.2.3 (23 Feb 2006)
+
+ 23 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.2.3.ebuild:
+ New upstream version
+
+*git-1.2.2 (19 Feb 2006)
+
+ 19 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.0.ebuild,
+ +git-1.2.2.ebuild:
+ New upstream version. Remove old one.
+
+ 18 Feb 2006; Simon Stelling <blubb@gentoo.org> git-1.1.6.ebuild:
+ stable on amd64
+
+ 17 Feb 2006; Joseph Jezak <josejx@gentoo.org> git-1.1.6.ebuild:
+ Marked ppc stable for bug #122887.
+
+*git-1.2.1 (16 Feb 2006)
+
+ 16 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-0.7.ebuild,
+ +git-1.2.1.ebuild:
+ New upstream version, remove ancient one
+
+ 15 Feb 2006; Markus Rothe <corsair@gentoo.org> git-1.1.6.ebuild:
+ Stable on ppc64; bug #122887
+
+ 15 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.1.6.ebuild:
+ Stable on sparc wrt #122887
+
+ 15 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> git-1.1.6.ebuild:
+ Stable on x86, bug #122887.
+
+ 15 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8a.ebuild,
+ -git-0.99.9n.ebuild, -git-1.0.6.ebuild, git-1.1.6.ebuild:
+ git-1.1.6 stable on alpha. Remove ancienct ~arch versions
+
+ 13 Feb 2006; Stuart Longland <redhatter@gentoo.org> git-1.1.6.ebuild:
+ Added ~mips to git-1.1.6 as per bug #108215.
+
+*git-1.2.0 (13 Feb 2006)
+
+ 13 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.1.5.ebuild,
+ +git-1.2.0.ebuild:
+ Version bump, remove 1.1.5
+
+*git-1.1.6 (30 Jan 2006)
+
+ 30 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.1.3.ebuild,
+ -git-1.1.4.ebuild, +git-1.1.6.ebuild:
+ New upstream version, remove old ones
+
+*git-1.1.5 (28 Jan 2006)
+
+ 28 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.1.5.ebuild:
+ new upstream version
+
+*git-1.1.4 (20 Jan 2006)
+
+ 20 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.1.2.ebuild,
+ +git-1.1.4.ebuild:
+ New upstream version.
+
+*git-1.1.3 (17 Jan 2006)
+
+ 17 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org>
+ -files/git-1.1.1-glossary-from-1.1.0.diff, -git-1.1.1.ebuild,
+ +git-1.1.3.ebuild:
+ new upstream version, remove 1.1.1
+
+*git-1.1.2 (14 Jan 2006)
+
+ 14 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.1.2.ebuild:
+ new upstream version
+
+ 12 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.1.1.ebuild:
+ We should only try to apply git-1.1.1-glossary-from-1.1.0.diff if USE=doc.
+ Fixes bug #118755, thanks to Christian Heim <phreak@gentoo.org>
+
+*git-1.1.1 (11 Jan 2006)
+
+ 11 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org>
+ +files/git-1.1.1-glossary-from-1.1.0.diff, -git-1.1.0.ebuild,
+ +git-1.1.1.ebuild:
+ Version bump. Remove 1.1.0 as it reported a wrong version and might make
+ confuse bugreports.
+
+ 09 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.1.0.ebuild:
+ http://kernel.org/pub -> mirror://kernel/ in SRC_URI
+
+*git-1.1.0 (09 Jan 2006)
+
+ 09 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.1.0.ebuild:
+ New upstream version
+
+*git-1.0.6 (28 Dec 2005)
+
+ 28 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-1.0.5.ebuild,
+ +git-1.0.6.ebuild:
+ A new day, means a new upstream version
+
+*git-1.0.5 (27 Dec 2005)
+
+ 27 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-1.0.4.ebuild,
+ +git-1.0.5.ebuild:
+ New upstream version.
+
+*git-1.0.4 (24 Dec 2005)
+
+ 24 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-1.0.3.ebuild,
+ +git-1.0.4.ebuild:
+ New upstream version. Remove 1.0.3
+
+*git-1.0.3 (23 Dec 2005)
+
+ 23 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org>
+ -files/git-1.0.0-http-fix.patch, -git-1.0.0-r1.ebuild, +git-1.0.3.ebuild:
+ Version bump, remove old version
+
+*git-1.0.0-r1 (21 Dec 2005)
+
+ 21 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org>
+ +files/git-1.0.0-http-fix.patch, -git-1.0.0.ebuild, +git-1.0.0-r1.ebuild:
+ This is what upstream calls 1.0.0a. Remove 1.0.0 since it is a bit broken
+
+*git-1.0.0 (21 Dec 2005)
+
+ 21 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> +git-1.0.0.ebuild:
+ New upstream version
+
+*git-0.99.9n (15 Dec 2005)
+
+ 15 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9m.ebuild,
+ +git-0.99.9n.ebuild:
+ New upstream version, remove old one
+
+*git-0.99.9m (12 Dec 2005)
+
+ 12 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9l.ebuild,
+ +git-0.99.9m.ebuild:
+ version bump, remove old version
+
+*git-0.99.9l (04 Dec 2005)
+
+ 04 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9k.ebuild,
+ +git-0.99.9l.ebuild:
+ version bump. remove old version
+
+ 02 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org>
+ -files/git-0.99.9j-binary-diff-fix.patch:
+ remove unneeded patch
+
+*git-0.99.9k (01 Dec 2005)
+
+ 01 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9j.ebuild,
+ +git-0.99.9k.ebuild:
+ version bump, remove old version
+
+ 30 Nov 2005; Tom Gall <tgall@gentoo.org> git-0.99.9j.ebuild:
+ stable on ppc64 (and works well!)
+
+ 19 Nov 2005; Carlos Silva <r3pek@gentoo.org>
+ +files/git-0.99.9j-binary-diff-fix.patch, -files/git-0.99.9j-diff.patch,
+ git-0.99.9j.ebuild:
+ Rename the patch to a more understandable name
+
+*git-0.99.9j (19 Nov 2005)
+
+ 19 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org>
+ +files/git-0.99.9j-diff.patch, -git-0.99.9i.ebuild, +git-0.99.9j.ebuild:
+ version bump; this is 1.0rc2. Remove old version (aka 1.0rc1)
+
+*git-0.99.9i (15 Nov 2005)
+
+ 15 Nov 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.9h.ebuild,
+ +git-0.99.9i.ebuild:
+ Version bump
+
+*git-0.99.9h (14 Nov 2005)
+
+ 14 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9g.ebuild,
+ +git-0.99.9h.ebuild:
+ version bump, remove old version
+
+*git-0.99.9g (10 Nov 2005)
+
+ 10 Nov 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.9f.ebuild,
+ +git-0.99.9g.ebuild:
+ Version bump
+
+*git-0.99.9f (08 Nov 2005)
+
+ 08 Nov 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.9e.ebuild,
+ +git-0.99.9f.ebuild:
+ Version bump
+
+*git-0.99.9e (07 Nov 2005)
+
+ 07 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9d.ebuild,
+ +git-0.99.9e.ebuild:
+ version bump, remove old one
+
+*git-0.99.9d (06 Nov 2005)
+
+ 06 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9c.ebuild,
+ +git-0.99.9d.ebuild:
+ version bump, remove old version
+
+*git-0.99.9c (04 Nov 2005)
+
+ 04 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9b.ebuild,
+ +git-0.99.9c.ebuild:
+ version bump, remove old version
+
+*git-0.99.9b (02 Nov 2005)
+
+ 02 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9.ebuild,
+ +git-0.99.9b.ebuild:
+ version bump, removed old version
+
+*git-0.99.9 (30 Oct 2005)
+
+ 30 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8f.ebuild,
+ +git-0.99.9.ebuild:
+ version bump. remove old version
+
+*git-0.99.8f (19 Oct 2005)
+
+ 19 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8d.ebuild,
+ -git-0.99.8e.ebuild, +git-0.99.8f.ebuild:
+ version bump, remove old versions
+
+*git-0.99.8e (18 Oct 2005)
+
+ 18 Oct 2005; Carlos Silva <r3pek@gentoo.org> +git-0.99.8e.ebuild:
+ Version bump
+
+*git-0.99.8d (16 Oct 2005)
+
+ 16 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8c-r1.ebuild,
+ +git-0.99.8d.ebuild:
+ version bump, remove old version
+
+*git-0.99.8c-r1 (14 Oct 2005)
+
+ 14 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8b.ebuild,
+ -git-0.99.8c.ebuild, +git-0.99.8c-r1.ebuild:
+ provide a custom src_test since the default one fails. fix one pkg_postinst
+ einfo. remove 0.99.8{b,c}
+
+*git-0.99.8c (11 Oct 2005)
+
+ 11 Oct 2005; Carlos Silva <r3pek@gentoo.org> +git-0.99.8c.ebuild:
+ New version from upstream. This version have an important fix to
+ git-ls-tree. When two identical blobs or trees were contained in a tree, the
+ earlier code mislabeled them in the output.
+
+*git-0.99.8b (06 Oct 2005)
+
+ 06 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> +git-0.99.8b.ebuild:
+ version bump. Fix git-send-email installation. Added missing dependency on
+ dev-perl/Email-Valid. Dropped ~mips keyword, see bug #108215 for more
+ information.
+
+*git-0.99.8a (05 Oct 2005)
+
+ 05 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+ +files/git-daemon.confd, +files/git-daemon.initd, metadata.xml,
+ -git-0.99.8.ebuild, +git-0.99.8a.ebuild:
+ Added myself to metadata. Version bump, added init script and its conf.d
+ file. Fixed USE=doc. Removed not needed deps and rephrased pkg_postinst.
+ Removed old version
+
+*git-0.99.8 (03 Oct 2005)
+
+ 03 Oct 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.6.ebuild,
+ -git-0.99.7d.ebuild, +git-0.99.8.ebuild:
+ Version bump
+
+ 28 Sep 2005; Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com>
+ git-0.99.7d.ebuild:
+ mark ~mips
+
+*git-0.99.7d (25 Sep 2005)
+
+ 25 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.7a-r1.ebuild,
+ +git-0.99.7d.ebuild:
+ Version bump. Applied the patches found in bug #106998
+
+*git-0.99.7a-r1 (22 Sep 2005)
+
+ 22 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.7a.ebuild,
+ +git-0.99.7a-r1.ebuild:
+ Rev bump to fix some dependencies and added the tcltk use flag
+
+*git-0.99.7a (21 Sep 2005)
+
+ 21 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.7.ebuild,
+ +git-0.99.7a.ebuild:
+ Version bump. Also did some cleanup on the DEPEND/RDEPEND var's and added
+ the gitsendemail use flag. Fixes bug #106791, thx to Max Loparyev.
+
+*git-0.99.7 (19 Sep 2005)
+
+ 19 Sep 2005; Carlos Silva <r3pek@gentoo.org> +git-0.99.7.ebuild:
+ Version bump
+
+ 18 Sep 2005; Markus Rothe <corsair@gentoo.org> git-0.99.6.ebuild:
+ Added ~ppc64 (bug #106318)
+
+ 12 Sep 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild,
+ git-0.99.6.ebuild:
+ Fixed homepage. Closes bug #105648
+
+*git-0.99.6 (08 Sep 2005)
+
+ 08 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.5-r2.ebuild,
+ +git-0.99.6.ebuild:
+ Version bump. Removed version 0.99.5
+
+*git-0.99.5-r2 (04 Sep 2005)
+
+ 04 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.5-r1.ebuild,
+ +git-0.99.5-r2.ebuild:
+ Forgot to revbump
+
+ 04 Sep 2005; Carlos Silva <r3pek@gentoo.org> git-0.99.5-r1.ebuild:
+ Added app-text/rcs as dep. Closes bug #104536
+
+*git-0.99.5-r1 (27 Aug 2005)
+
+ 27 Aug 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.4.ebuild,
+ -git-0.99.5.ebuild, +git-0.99.5-r1.ebuild:
+ Removed version 0.99.4. Revbumped version 0.99.5 to add a missing dep
+ (dev-util/cvsps). Closes bug #103962
+
+ 26 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> git-0.99.5.ebuild:
+ marked ~alpha wrt bug #101907
+
+*git-0.99.5 (25 Aug 2005)
+
+ 25 Aug 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.3.ebuild,
+ git-0.99.4.ebuild, +git-0.99.5.ebuild:
+ Version bump
+
+ 24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> git-0.7.ebuild:
+ Stable on sparc
+
+*git-0.99.4 (13 Aug 2005)
+
+ 13 Aug 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild,
+ +git-0.99.4.ebuild:
+ Marked version 0.7 stable on x86 and added version 0.99.4
+
+*git-0.99.3 (09 Aug 2005)
+
+ 09 Aug 2005; Michał Januszewski <spock@gentoo.org> +git-0.99.3.ebuild:
+ Version bump.
+
+ 15 Jul 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild:
+ Closing bug #98032. thx Carsten Lohrke
+
+ 24 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> git-0.7.ebuild:
+ To ~sparc
+
+ 19 May 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild:
+ Adding net-misc/curl as a dep. Thanks to Priit Laes in bug #93247
+
+ 17 May 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild:
+ Removing git-pasky references
+
+ 07 May 2005; David Holm <dholm@gentoo.org> git-0.7.ebuild:
+ Added to ~ppc.
+
+*git-0.7 (05 May 2005)
+
+ 05 May 2005; Carlos Silva <r3pek@gentoo.org> -git-0.6.ebuild,
+ +git-0.7.ebuild:
+ Removing old git version (0.6) and adding the new one (0.7)
+
+*git-0.6 (26 Apr 2005)
+
+ 26 Apr 2005; Carlos Silva <r3pek@gentoo.org> -git-0.04.ebuild,
+ +git-0.6.ebuild:
+ Bumping to 0.6
+
+*git-0.5 (21 Apr 2005)
+
+ 21 Apr 2005; Carlos Silva <r3pek@gentoo.org> +git-0.5.ebuild:
+ Version bump
+
+ 15 Apr 2005; Carlos Silva <r3pek@gentoo.org> :
+ Cleaning up the ebuild
+
+*git-0.04 (15 Apr 2005)
+
+ 15 Apr 2005; Carlos Silva <r3pek@gentoo.org> +metadata.xml:
+ Initial import
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
new file mode 100644
index 0000000..4ec4b29
--- /dev/null
+++ b/dev-vcs/git/Manifest
@@ -0,0 +1,61 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 50git-gentoo.el 472 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3 WHIRLPOOL 887682f79182f6728af3c0fd2ee0e81319d49761a987559684be5e4acae4af579a5b8d1197ddba31452cec179de3c8f5784cc85ad61f78b400e42c204c93f642
+AUX git-1.7.12-git-svn-backport.patch 37717 SHA256 5379c97de060617ca6cef65bcc4f78a986943bdc587517af27c8ae80bb7bfafd SHA512 ad716ed9c449961d7b0bfe29f3450e0a4d4fe2c7c8069916bb0a69a6ee47bab5f7c4b68496b31cd67e6472aa05723ef8f32d8d7f56cdd2f4a40190058e324a8b WHIRLPOOL 30ecbf8cd97903d7a9b5b710f53b3ef6ea3092c224ebc82682a1840d93a28e6680c318d0e69af252b4901255f8f12a992b8a18eb46a9a015fc383a7c70312e89
+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
+AUX git-1.8.2-texinfo.patch 515 SHA256 86d60eeae9a21fa64047401b80a5e082b0f306a68efab139979bc979fb31830f SHA512 9a9920f6b2d170f3ca71ae4c35cb001252e5f43e087f5b49f9aa617606fb3b7173aea5ef91c5d195b36bf1a1964e936d777797e03642a0da55a596e68c13a29c WHIRLPOOL 9e66c94c5eac4fe22f7cdd400c68893368a21550a5aadd467c53591e62bcf146d6a08db1e7a3cb8b32a45d5568c0b7a7462a0c6f8709ea35a284845a2c5e5820
+AUX git-1.8.4-optional-cvs.patch 11737 SHA256 7f8f1bd8f2953044433d90edea2bae7334e0d14ee7dc5e6e327e4caec8b0100b SHA512 2966582ccd5640c34aba156a955b458176ec2d450471279ec77200cbd1fb19f84dabc2a913fea17ae7503609074f8c80c05bb93f7244acfe296c078cf4a030ac WHIRLPOOL 07d5ab8ab60f6338ff1c9c7b8817938917ec12a5c360e595d7a40ffbbff18b439fea576c70dd4ddc7547edab23f4e86110f201c88be68e5a874d295f6051e592
+AUX git-1.8.5-optional-cvs.patch 10088 SHA256 a35732c6d3bfbe62b298a730652a85f7deac6bdd59bd842b4dddedaa6ad0f1fb SHA512 f78f82af4e51002553157e61a16fb9855743acaa9cd9b9914e047eb3ff7f7fc4aa2d89e9c7f86fb6bf9d3f5854e44519c72669c6436132c728b28a4599d184f1 WHIRLPOOL f8080b56bff0c1add20d9c3c3e2b842e351029cae02e147307260a6504de4300d01262176c03203259037e6f98ffb043e1e1b4a914b1110d666b30383ead2e24
+AUX git-daemon.confd 712 SHA256 9bf02170dcf73e930a992adf44326ed7c27159d41a503ca4d9371861ee5030c9 SHA512 bf715ce0d3cd6a5be405d7739bc06252b95f93f9874716dadf666d33063be6ab3e37ae1ee253ed291bfb4f66df268b44d9653672851e1bb40112c0aae08fc4ea WHIRLPOOL 13643f53cd2f9675867ff194d680cd8ffe91bccbd0b15ae41b45471ec7310c09af8335619ff2a1562a835d8449eb44f9a9e9453c3ba15005763497c668d59181
+AUX git-daemon.initd 738 SHA256 48e7e1228c9811079dce8fecc560000cf645de5b4bb697f8f8ad3f906906330b SHA512 2b1cff1e1bf85db1674bd130639a7557fd4bb1ee2e9b2e7d1e2dc28274b6fa6c6c150acf37d0e652173980c640cb0f7ac36332012182955ecc4d21c6258bfd4d WHIRLPOOL c47dd7d0f3b183e14f3ca4e499b1ceef0b88f11675c7f6dee225516f062f556bfd41aa7f87d6cdf490411101ae541ab5fe173069dbfab6b1473a2b3d951ce901
+AUX git-daemon.socket 116 SHA256 66a064b67e441306bf765d3d3115ac55bafa2098400af134f852d4aecf8608d7 SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701 WHIRLPOOL 1098e46b6d2be3c8d758a087408aed91e0c01625542dfc90fbff80ed8b40d2a54ea4ab45b4d003ef0b0b8ed1411e1146a58076b68096389412a61fe2d09214dd
+AUX git-daemon.xinetd 260 SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c WHIRLPOOL 155bfca2c071d5368de09412d1d937cefd3b5cd28a991b99845551738440b92791c33a67ef41be711dbf06fc4faf4a299cbaf1f410b119fe5deb5a4cd741803d
+AUX git-daemon_at.service 395 SHA256 c427e37d3e859c13f9441b20c7cb6aba7bca048cb70809ee1253726e733fac7d SHA512 4931954564ae7d2e21e49c8f251bae7c6be8a420f75e68e23214c85993dceb81b719e5fee11366b82b28ef5fa27a9ae2b2faa5c79c16d367c6d50fb03bbd0cff WHIRLPOOL a18f8fe6755c85e8d332d989637105d7842e8fc107a263dd0252e34e30dca21aaff593041bca3f0a728b995f19310d3cab8c43e2a7524ee9e612cca03c7ffccf
+DIST git-1.8.1.5.tar.gz 4306780 SHA256 f8b0be6e53e866f83cde64fa947011ebac56077bd1273c2e894038878986b955 SHA512 19ee4c76c66595f24d5093648202840f39356c111124017beeb32a4d79e8ce362d901ff4a09ad67c1392c5d1e48068a3a4634ad2865d8231e70b197a1cf0fdd3 WHIRLPOOL 559a89140b95bc413b6be5f4d09abc75a038d50381ae0fa61a5fa1c190edf92a5cf9ec2a938ba5d1ccd5563bb19883254773599749bb12488761c125b510b5e2
+DIST git-1.8.2.1.tar.gz 4400440 SHA256 ed6dbf91b56c1540627563b5e8683fe726dac881ae028f3f17650b88fcb641d7 SHA512 d75a36a91b0522ca3a5c792473e16fc98dd9de082b4c0e9a75ebc525fa334edfdcb6dbf138e1bdede711f2158f24e8a8ba8499b89f9a82be1b5e60eb4ba5d33e WHIRLPOOL 587afbadca06674b751385b6f5fcda3d74db159a03bdbb1d477d4d9d4eb792d020a6f97906d2bf7d69f2f14432aaf6634d4274aa14e377ca6c865676853fd060
+DIST git-1.8.3.2.tar.gz 4474347 SHA256 2f798db86859c85608fe4120f52a1b1cb13ca9c4daa4f59eb1dc090280f46473 SHA512 6e19948821dfbf78c5b9ea95614d3c10f4625583e3c17b6c55110b74f28679e525c449179cf49c2587a86c3b7fd7b6a27589824fcea0ec6fb69ca752a6942931 WHIRLPOOL 26892e039b67b35ae9df0a124d0812b36a22f481f146561b733a758b89a00770c05902c2820f2a783bc0fac07ecb335accbc939d21481da821177e0548d6a077
+DIST git-1.8.4.5.tar.gz 4677738 SHA256 37772b18b8184bb3b746963b8e1047a1205447df68c2b25698351434f8092d90 SHA512 56060aebf013becf884e27bf2a71a140c17055e0214a6a461ad3476d1d7017f63f3e2231047040adc5c42c2a08b0e75c9ae12b50c913c6689494337f3f7ad8e2 WHIRLPOOL 4dc0e1fbb8bf1d02706ec3943f506cf4f28a5f9146797dc35ac5401db752810220e1da109e3ce0750a8b2e2d7b7340ce223fe55c0279a1fdf60c457117da64c9
+DIST git-1.8.5.1.tar.gz 4755003 SHA256 521589b48f6defa63a99241121968646ef9a7ab5919b88e08fdbaadfe071561b SHA512 5ad5630771ca66e51b384f6651e77e18c6e3c8d349ceeeabd51d6d0ea23e5d0481d8dc9dc33e2e403fe2abf777906b65566858c42fa98241919ad4f07c6b3e37 WHIRLPOOL 125264ffda81e4a6fc5d6100ad06be0ae9bab2212214b413ca8dbbb84b958a00d234d819e874a09c954cc1dbe3befc751dc51873cb6abff5f6ec72b85a491c26
+DIST git-1.8.5.2.tar.gz 4755707 SHA256 e986da24893197e33d835150c456708441e4a116a726ce9312a27f6de804f7b2 SHA512 73e408dd787b73a0f3935e37540d5da32a2f8d6d84af60d3ec7e224c3a953cc62eea749c7a689f8cca3b54e633f2520ed23d910ca5932021523e1fb750bf2c0a WHIRLPOOL d6623742cce0bdcb6b5334d363b44edeb6413e45fa42cb2bce013e07796dc98bd865b0d2c2578f2bd526140dceea25b19acbe212dc6afec7903c5dd6ea794d7f
+DIST git-htmldocs-1.8.1.5.tar.gz 2060977 SHA256 108e34217b2668945ca78b36b08ceeb9fe283617fe68b8f181219076bb225de0 SHA512 0b46a95a47df4326633d10295eeb09d41cee78d9c30775f7784690715e3b5d607ff26027f4cd6036f31dfc458ba2757ceb5ed6ea675a863a5dc69d8e5a7b34f5 WHIRLPOOL d273fbee9fb0a68ef3f0d19ba2249481bd15ff69b289e046e975fccda7639102519aa79bff94f6317e6b73cc414128b8b8619fcda1a910b74770b0aba1694d26
+DIST git-htmldocs-1.8.2.1.tar.gz 2093688 SHA256 3f2482089eb345ec7d2ad61ad731c17ea87733b763585b580cf99b17194e0286 SHA512 8e7f25a0b230473f9e9290f61e9ea80a675459eea163ef76e281aa95747f5bc4df2ddb7f9bba9c2b0fb75819cd206f2415ba665bc986a628a07e8da4e5aa6efc WHIRLPOOL 574a01d1e403b25444ac88f66a939fcad1c96025a62f91550f328d400246955e61255dd403f3cf8302b961032f536e394b77228a8434c7b2065b564163f49114
+DIST git-htmldocs-1.8.3.2.tar.gz 2115320 SHA256 805b7fc4399daf9258e8cc28ecc3dd043fdd7f339447f4d84674826916109246 SHA512 0890b60bfa110ca7eaf7aaddbf0aca9574f608addc384cece3c91c8c04ef6397064a0669f3d61d0a65eb120b626ccd85df26f04438ca301f349136cd55e5080a WHIRLPOOL 377c39ac7988a3c1bb6e80333c43878d38fe5eecbb75dcbcbef3c2186842fcc170a552d72be891f1479c336fdd6c5ac1ce1ca2c0adf9a8238bd057f093c3f912
+DIST git-htmldocs-1.8.4.5.tar.gz 2207155 SHA256 ecaaef864b1794301af4af17a4d378966ac1dbeee9a82f524d1ebc0b6d6da299 SHA512 1bb5d8fd2884f0bd39ff0924579a4bd16d225da10ae78cb3c535133d187b9306dce55d14a2df7fa0a40c6fa1df523eec2e118e2f5268dd624bbdb6c65fd32363 WHIRLPOOL ca5ce52d02eac3f079ab89eb5e41640c9dee724c8a3356b362eae0ba120cb9640c5f6a4576ae98fd42002f84ad066ed3e6254fdc77b95731ac1b17549b5911e5
+DIST git-htmldocs-1.8.5.1.tar.gz 2236187 SHA256 46a1eb32d110bc4a708cf7058852875e30277305ff2719ec672f7cdcd7a87075 SHA512 8d58463b5496278abed57b8e0b99d2be6e0a2ecff2ebda964f4f6e8336ebbe32e13ec0a87ec323247f90ada2383b2ced02f8204b416dc892348101662bdb9ecd WHIRLPOOL 65e38d20e8c1d6439e8126f5413334e06b25763aa36b09686ac220f043b1b6df6c8dc22c7f597d5393455ec083a578b572a7fb1627220ba678960ab10aaa848a
+DIST git-htmldocs-1.8.5.2.tar.gz 2237867 SHA256 ba708ab1b5916960f61c22cf60eb6689ac62d1b6dbb6a460d98502815cdbff41 SHA512 824ab4cf879c0b3c1215f29f5dc3d18ae9bf15aad9deb7d81e81f8a57d500d304738c7e580f0fb5e3df2b6609d957b964938250a48145a3559b93ef1419eba2b WHIRLPOOL 962a2da1174ab401bdbafdca8cc9debd0fe927838b44bc8bbd0258a1da62cc32c10a6aa5a8a2bbf404fc257d0f4df981969ec3c2b9e898bcf3dc417d2f6517c6
+DIST git-manpages-1.8.1.5.tar.gz 528540 SHA256 b171761f13deb738a2464c9d3967c12539067a34d6f2bfa5739a1006786fd24a SHA512 c0106da12ae3beeba3c23e68b37113082d829fe80160c53df51aac207557a2045c662b4d01b5a1cb211e75f9f7629290b7ecf3907b3bdc828820382793414e8e WHIRLPOOL 3da3b254707c06cb069fa462561634a4f5869fadab6ab8a07301eeb0b2244f159415d409d71c5ebceb4a74ef51f645f2f4c9ca19080a84ee370b5787740d08c2
+DIST git-manpages-1.8.2.1.tar.gz 536718 SHA256 1d3bc31d10564d29d0c3a45f98f98a7d936dfcdb1692528bf2fdb2140fe89824 SHA512 a6463c8bc8a23301d89e985b88fa0073c154e126c51a1f7699cd09e79723ed463f46a9cf5dd63f9e2e46ee4111e6154ae86553bd446f5cf76db9fd4e3bff5a1f WHIRLPOOL 8aa3c57475d8cfd7c47019c4eb05c091c76fb0ec5d213942b5a16ee9f6c540111aecb6b754eb98578e9e129d4e8ba941a3bee326a2845b2a098cc30e1109d35d
+DIST git-manpages-1.8.3.2.tar.gz 542769 SHA256 599bc8f6c56986a994a237cfebb53b4fab9051576775e32d0353e0455ab84115 SHA512 42fd781b924355c969ce381aae828f877059472741d7b53b0d1aad53f04c8a27b6b161b5dfc353098370ead73ccb9cdc86ac5374cf02829134f8c4d70bcbb7cf WHIRLPOOL 90226006a35b7b6e644f887981f2725238ff428f572425942701614e14fab5c8c5c602746de93a113d83d9b9c76ea1805a9c7cfa353305b0f817c33976048d77
+DIST git-manpages-1.8.4.5.tar.gz 565177 SHA256 8cf38e3a48425fe74c4a71286633ea895bd03d32481ea5112e9682a6adb3b4bf SHA512 6f9d56da7493ae50275f259ca65649a4dbada3a3d0e32e0a418ed73c2e2661c90f23cfe9a62800cbceec1db86a2bb7b93eccaaf28c282cb5046c2aea3f928774 WHIRLPOOL 1f92c6437214f9d8d998a916cf34399be4f49a5c2dd5fe930850ae3b7ef10da66594c8d4544fa313b485bdcfd9259322c5ba0b83f9403263c80d12b19ca8c5f0
+DIST git-manpages-1.8.5.1.tar.gz 569069 SHA256 1131fa830065c0224df601a055f6d9726d0f19fa87962d9db254a2d6e83d32ef SHA512 91446b550ae7971884943583c3562762bb3e338b9e65e94f0891af10488814dcf6756122d79db951a1e347acb311cd3dcf71e509c5c25927148da9a75e29a86e WHIRLPOOL 972cb803bbf6fcac3a068bd47b3dbc8a6eb26fccc18542111b6c74361fff83ecc9fcd45ab4024657cc6ebc5880b23a61d5a149d5e6d75dde0be3ed55d899bf28
+DIST git-manpages-1.8.5.2.tar.gz 569581 SHA256 2aef8c084ee795e544b6fb8715cccc1109efca1ca4b8db1588a2a5186ddb10c6 SHA512 1ca37aff4d5ca6d4daa6e8f2b3114a63ebdb0bd42382e1ed1ff9d01117da2fd8bd3a662b9beab318fdffd682039589c9b5f50ced67122e96b0a0ffd213a4112a WHIRLPOOL 257bd0549fb63e5ef31f3575731a5c90eead5da556480d929877704086dc03dadd924713480d9c3f8b5890912d54dd8be48d970abb9f7e86c55d8655642fbfb5
+EBUILD git-1.8.1.5-r1.ebuild 17380 SHA256 c8f80e262d18edf7241739d726a1b8b10b1fa4fee83abc3b823492664457dec8 SHA512 29edcafcce548fb84bbc9748bfa765b9c663876536a78d320c48fe08ac26e60031a06b4b4bbee5a9c5a6d8d0754b92a8be6f21baef36bf5043d828d75fe2a7c5 WHIRLPOOL 62348b391c309f7263cd01db841e17034a0e35ed3560b9c52de70c5fbd512437ae7c2dc9a9db2ff86a86b77ebe872e7987f36cb1afaec9d4da32a9994ae31d72
+EBUILD git-1.8.1.5.ebuild 17238 SHA256 22108f9865e69ffe1e4dcd011ef5e44c19a7ab8d54f4d262da650145b1ac390d SHA512 48c693623447d8d1054a6187e5094d6d026a9dc0d7f6daeefdc1bf306a9a5b890a67ee0e92c332eaf02227aac2a72d6956962323010059dd3c314e2358aaac4b WHIRLPOOL a297ebf62c63d7d2da3d97306c2b13cd85ab4c9684b9b4e01fd28b5186ba225998bc6bcfe1123a2263801f4542c25d5d0a819a8746f846cae25c4d0582fef7dd
+EBUILD git-1.8.2.1.ebuild 17694 SHA256 e8e04cf2b65d526ae906b47f58e40960484cfc34089e8559bbdf87793a3c9451 SHA512 9b86c0fc803fc0ff4ac1f705cdc53d8ae15fe9f2ce840b3b0ef152e0175cb13e04cffaf8f6b914ca1171082f9570e074b82e6d5a8449f7b6d6e7cbf3d0922c41 WHIRLPOOL a9ab0427eeaf50f4e57c94625182daa76b61bb33550a6a32d8fb27c854d8395b3fdae9451927493a4e68ac0904857fd6492f604bae98e8ed26081b310988dbaf
+EBUILD git-1.8.3.2-r1.ebuild 17614 SHA256 0fd06a9ea0c955ab1725f2482971fed6a474c195d642e87c73a49a2f75f8f536 SHA512 84607b181d6dbafe087c380b309f80425de3905d3a34a97d5605b1bed1c59b50ffd27e0aad79410aeca66a342ed784724aa65bea91b11d169f64b098d2cf0f5a WHIRLPOOL 4d769be71a9cc83d592a6fc947a15f99018363028e50ccede7f653e54b8403b5365e32cafcd40ab0f57e21cf6dc1d58f9b5f7394113067612bb7efd3540b2512
+EBUILD git-1.8.4.5.ebuild 17847 SHA256 3b68c33ddab44a4dfe05e21607b172e1da00f9f67c5d6264725720752ba9dffa SHA512 0446ba1e7177d4daecc745d035241a5251f9229c232ff20e03d68304f8a8f5aa60e405786f4350d731a499bc8222a76017626c76eb4cee207f7a06370cba7a6c WHIRLPOOL 070e2b58bff6845e047d3ec2325fc2aa384837da2d1fffd970796fa7aa14a2884bd09901ad4cdfc0caafead3c4fc7e85d28a1f9432bcccdd339974650a79b48b
+EBUILD git-1.8.5.1.ebuild 17840 SHA256 5d6826836fd8efbf665fb1aff413a79a42004aa13a39e7869387012d945dcb07 SHA512 8594acea9e9e68fc519fb36f48747169a9b956fc95f0dcf382e4edc49f7745dcb731d9ab425b0fca56a8523f7b3d0f5bee87251bb0615318026a2056c61fe813 WHIRLPOOL 949dcf5016e6955997c6c02326c67f92120d38de7fb22359bacd04e330fdcd43737ecda5bd4605edf235c046525742ceefd4b21790615f7b0d4e72c6441d8db9
+EBUILD git-1.8.5.2.ebuild 17840 SHA256 3f823bc81f12c15312ecc249a3b45a0860fa90d780b4f2e6e8bae3c4db9cdc2e SHA512 789fcbcd05a5dee35fedabb79b1e7e316f20f45b86db201b5322641b08d98913ff507f43ddaf6d184774e4afe9e7e0086f0eace216de4ac2c13edcd47b171d01 WHIRLPOOL b42b88a9cc444215b4b316268341082e510b16cdd66068d0aaf55491f416e6fb074eb118216799fdd6669846792aac002ed5c5bebab886d43170cfb83fc8158f
+EBUILD git-9999.ebuild 17803 SHA256 beae98898e2f9554f9f3f3be3a30130c9c9efcc7da5314b8e49aec16756f8463 SHA512 d34ce325189f1d597fac71f67a59e90fa6dc9721d86c567101b64448e3a21080ccff2f38f36956b03307af1418941103567a8398dfd4aa676813b4eb24c27674 WHIRLPOOL 8e0daa447d9d3c51727a0fd43db37285969b7beff0b4a6e77ecba652c4829391527a3b28753aaf92c29d146c87c7d15e91c112cde0de61ccfe2e583ffe8781e0
+MISC ChangeLog 10664 SHA256 e9358a3b1c6fa8cd9afae1aedd99dd4f5b07be5dc08fbd6553c5ccbe93bb79e6 SHA512 8e11e667bb147587827b35c4aeb0f8c15c15335d56f6dbeb9acebe38ad36ef8ad2a2adb6f1728a72a4c1da34e1272a96ff0f0c2f8ed3273adb8970f3f8f01c69 WHIRLPOOL b974e583fcca40f5b4e9bdac256794f7222573717b403fe5e9d56cdd0f5603f2e82807fd55cb8a63d2ea6226f016ea8256c5a6a714464eb0793f16d70b7c1c94
+MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
+MISC metadata.xml 1876 SHA256 6b8a45678bfb4c0c7db85f5d6e94c4fc68ee2d8ed5ef6c83855ff3d6998b0773 SHA512 084b1be894ce30dd443cda711d120d6a436fafe59e4cd04a5879dbe88f17b9a7d5061377ed4cbd2c3cbd2f0d43ac168994e83368b3890b2135f63fa4fb935efa WHIRLPOOL 4051958b34b2c1aedc82e856de3554483eaa88ab4f5b43a9c1394aaa2bc925ca02edc13ca38c8379b947154249d4279fa227706b09776ee79a7b054f8e722d19
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSsZLFAAoJEPiazRVxLXTFMHQP/RaiJ9FbpF51tg2XwTtH6wkP
+PJJOueMKQs6A1X0RWa21GPzWFBPR0WUFFb3N84aC5RmXufbBaq6xxe1zggwScjI3
+8CPriALPBuH+K9GbOsz83Acx00Ah/ZrYLyuHC84wlPx6jjaWtYIT4PNCp+qJCCGJ
+JNFzWFeuvC6vMW6/cDZMCTp8xmL2jtr42YTDsHIqQUYLiNKkBSzWPVt93ZgVQhuU
+hvGTOWHOlIimZaloGmw6uZNQmyEDTsbH31lRWjJ24xIPL0zyHq0C12pF+s0YRR6Y
+UYqiEL8uvC1JesMSdVbgZsjRVNR1gCbEei9hDK0MsnUGDC/A8M6IYWE2eGn0RKBb
+lrzKP7znPyQQ4o0+fEAXSMh6r6xAL1JTsshflZRHa4TaoJ05/Rn2y3ja9DvoLWBf
+Yl5xAZSxBCOWf1r5dTTNhg3kZzERAUalCRF2lfkUFGw309BBe1Hxm3mvjK3zIN5D
+0dKi9kLXRjCFzuqxiPrxvXaogqf6Hu1ViiLGpbeg3GmCTU/qDob32YGjxBveCMBG
+O4qh5E88h85bhV1CFQqm0xCqhjQHZIcO2rtg1p0vQlsBO0oP5zqK+7aNc5KZLpKC
+CzoGGE0F7mi39rE3B0jvadKiwkXp7fZU+CWqFJTq33U5+N/qMTbbyRU6wNo8kNi/
+XUmmCCYFFnz6Y2KoVCZd
+=Syiu
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/files/50git-gentoo.el b/dev-vcs/git/files/50git-gentoo.el
new file mode 100644
index 0000000..1646a39
--- /dev/null
+++ b/dev-vcs/git/files/50git-gentoo.el
@@ -0,0 +1,13 @@
+
+;;; dev-vcs/git site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'git-status "git" "Entry point into git-status mode." t)
+;;(autoload 'git-blame-mode "git-blame"
+;; "Minor mode for incremental blame for Git." t)
+
+;; GNU Emacs >=22.2 already includes vc-git.el.
+;; Enable the following only if Emacs has no GIT support.
+(unless (fboundp 'vc-git-registered)
+ (add-to-list 'load-path "@SITELISP@/compat")
+ (add-to-list 'vc-handled-backends 'GIT))
diff --git a/dev-vcs/git/files/git-1.7.12-git-svn-backport.patch b/dev-vcs/git/files/git-1.7.12-git-svn-backport.patch
new file mode 100644
index 0000000..0a254ec
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.12-git-svn-backport.patch
@@ -0,0 +1,1288 @@
+commit 0dfcf2dacd4be3f0c647a987b78def5136429165
+Merge: 889d358 5eaa1fd
+Author: Junio C Hamano <gitster@pobox.com>
+Date: Tue Aug 21 15:27:57 2012 -0700
+
+ Merge branch 'ms/git-svn-1.7' into jch
+
+ A series by Michael Schwern via Eric to update git-svn to revamp the
+ way URLs are internally passed around, to make it work with SVN 1.7.
+
+ Will merge to 'next' after pinging Eric to double check and then to 'master'.
+
+ * ms/git-svn-1.7:
+ git-svn: remove ad-hoc canonicalizations
+ git-svn: canonicalize newly-minted URLs
+ git-svn: introduce add_path_to_url function
+ git-svn: canonicalize earlier
+ git-svn: replace URL escapes with canonicalization
+ git-svn: attempt to mimic SVN 1.7 URL canonicalization
+ t9107: fix typo
+ t9118: workaround inconsistency between SVN versions
+ Git::SVN{,::Ra}: canonicalize earlier
+ git-svn: path canonicalization uses SVN API
+ Git::SVN::Utils: remove irrelevant comment
+ git-svn: add join_paths() to safely concatenate paths
+ git-svn: factor out _collapse_dotdot function
+ git-svn: use SVN 1.7 to canonicalize when possible
+ git-svn: move canonicalization to Git::SVN::Utils
+ use Git::SVN{,::RA}->url accessor globally
+ use Git::SVN->path accessor globally
+ Git::SVN::Ra: use accessor for URLs
+ Git::SVN: use accessor for URLs internally
+ Git::SVN: use accessors internally for path
+
+diff --git a/git-svn.perl b/git-svn.perl
+index 828b8f0..0d77ffb 100755
+--- a/git-svn.perl
++++ b/git-svn.perl
+@@ -29,7 +29,16 @@ use Git::SVN::Prompt;
+ use Git::SVN::Log;
+ use Git::SVN::Migration;
+
+-use Git::SVN::Utils qw(fatal can_compress);
++use Git::SVN::Utils qw(
++ fatal
++ can_compress
++ canonicalize_path
++ canonicalize_url
++ join_paths
++ add_path_to_url
++ join_paths
++);
++
+ use Git qw(
+ git_cmd_try
+ command
+@@ -1231,7 +1240,7 @@ sub cmd_show_ignore {
+ my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
+ $gs ||= Git::SVN->new;
+ my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
+- $gs->prop_walk($gs->{path}, $r, sub {
++ $gs->prop_walk($gs->path, $r, sub {
+ my ($gs, $path, $props) = @_;
+ print STDOUT "\n# $path\n";
+ my $s = $props->{'svn:ignore'} or return;
+@@ -1247,7 +1256,7 @@ sub cmd_show_externals {
+ my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
+ $gs ||= Git::SVN->new;
+ my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
+- $gs->prop_walk($gs->{path}, $r, sub {
++ $gs->prop_walk($gs->path, $r, sub {
+ my ($gs, $path, $props) = @_;
+ print STDOUT "\n# $path\n";
+ my $s = $props->{'svn:externals'} or return;
+@@ -1262,7 +1271,7 @@ sub cmd_create_ignore {
+ my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
+ $gs ||= Git::SVN->new;
+ my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
+- $gs->prop_walk($gs->{path}, $r, sub {
++ $gs->prop_walk($gs->path, $r, sub {
+ my ($gs, $path, $props) = @_;
+ # $path is of the form /path/to/dir/
+ $path = '.' . $path;
+@@ -1292,31 +1301,6 @@ sub cmd_mkdirs {
+ $gs->mkemptydirs($_revision);
+ }
+
+-sub canonicalize_path {
+- my ($path) = @_;
+- my $dot_slash_added = 0;
+- if (substr($path, 0, 1) ne "/") {
+- $path = "./" . $path;
+- $dot_slash_added = 1;
+- }
+- # File::Spec->canonpath doesn't collapse x/../y into y (for a
+- # good reason), so let's do this manually.
+- $path =~ s#/+#/#g;
+- $path =~ s#/\.(?:/|$)#/#g;
+- $path =~ s#/[^/]+/\.\.##g;
+- $path =~ s#/$##g;
+- $path =~ s#^\./## if $dot_slash_added;
+- $path =~ s#^/##;
+- $path =~ s#^\.$##;
+- return $path;
+-}
+-
+-sub canonicalize_url {
+- my ($url) = @_;
+- $url =~ s#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
+- return $url;
+-}
+-
+ # get_svnprops(PATH)
+ # ------------------
+ # Helper for cmd_propget and cmd_proplist below.
+@@ -1330,7 +1314,7 @@ sub get_svnprops {
+ $path = $cmd_dir_prefix . $path;
+ fatal("No such file or directory: $path") unless -e $path;
+ my $is_dir = -d $path ? 1 : 0;
+- $path = $gs->{path} . '/' . $path;
++ $path = join_paths($gs->{path}, $path);
+
+ # canonicalize the path (otherwise libsvn will abort or fail to
+ # find the file)
+@@ -1431,8 +1415,8 @@ sub cmd_commit_diff {
+ fatal("Needed URL or usable git-svn --id in ",
+ "the command-line\n", $usage);
+ }
+- $url = $gs->{url};
+- $svn_path = $gs->{path};
++ $url = $gs->url;
++ $svn_path = $gs->path;
+ }
+ unless (defined $_revision) {
+ fatal("-r|--revision is a required argument\n", $usage);
+@@ -1466,24 +1450,6 @@ sub cmd_commit_diff {
+ }
+ }
+
+-sub escape_uri_only {
+- my ($uri) = @_;
+- my @tmp;
+- foreach (split m{/}, $uri) {
+- s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
+- push @tmp, $_;
+- }
+- join('/', @tmp);
+-}
+-
+-sub escape_url {
+- my ($url) = @_;
+- if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
+- my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
+- $url = "$scheme://$domain$uri";
+- }
+- $url;
+-}
+
+ sub cmd_info {
+ my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
+@@ -1508,21 +1474,21 @@ sub cmd_info {
+ # canonicalize_path() will return "" to make libsvn 1.5.x happy,
+ $path = "." if $path eq "";
+
+- my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
++ my $full_url = canonicalize_url( add_path_to_url( $url, $fullpath ) );
+
+ if ($_url) {
+- print escape_url($full_url), "\n";
++ print "$full_url\n";
+ return;
+ }
+
+ my $result = "Path: $path\n";
+ $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
+- $result .= "URL: " . escape_url($full_url) . "\n";
++ $result .= "URL: $full_url\n";
+
+ eval {
+ my $repos_root = $gs->repos_root;
+ Git::SVN::remove_username($repos_root);
+- $result .= "Repository Root: " . escape_url($repos_root) . "\n";
++ $result .= "Repository Root: " . canonicalize_url($repos_root) . "\n";
+ };
+ if ($@) {
+ $result .= "Repository Root: (offline)\n";
+@@ -1669,7 +1635,9 @@ sub post_fetch_checkout {
+
+ sub complete_svn_url {
+ my ($url, $path) = @_;
+- $path =~ s#/+$##;
++ $path = canonicalize_path($path);
++
++ # If the path is not a URL...
+ if ($path !~ m#^[a-z\+]+://#) {
+ if (!defined $url || $url !~ m#^[a-z\+]+://#) {
+ fatal("E: '$path' is not a complete URL ",
+@@ -1686,7 +1654,7 @@ sub complete_url_ls_init {
+ print STDERR "W: $switch not specified\n";
+ return;
+ }
+- $repo_path =~ s#/+$##;
++ $repo_path = canonicalize_path($repo_path);
+ if ($repo_path =~ m#^[a-z\+]+://#) {
+ $ra = Git::SVN::Ra->new($repo_path);
+ $repo_path = '';
+@@ -1697,18 +1665,18 @@ sub complete_url_ls_init {
+ "and a separate URL is not specified");
+ }
+ }
+- my $url = $ra->{url};
++ my $url = $ra->url;
+ my $gs = Git::SVN->init($url, undef, undef, undef, 1);
+ my $k = "svn-remote.$gs->{repo_id}.url";
+ my $orig_url = eval { command_oneline(qw/config --get/, $k) };
+- if ($orig_url && ($orig_url ne $gs->{url})) {
++ if ($orig_url && ($orig_url ne $gs->url)) {
+ die "$k already set: $orig_url\n",
+- "wanted to set to: $gs->{url}\n";
++ "wanted to set to: $gs->url\n";
+ }
+- command_oneline('config', $k, $gs->{url}) unless $orig_url;
+- my $remote_path = "$gs->{path}/$repo_path";
++ command_oneline('config', $k, $gs->url) unless $orig_url;
++
++ my $remote_path = join_paths( $gs->path, $repo_path );
+ $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
+- $remote_path =~ s#/+#/#g;
+ $remote_path =~ s#^/##g;
+ $remote_path .= "/*" if $remote_path !~ /\*/;
+ my ($n) = ($switch =~ /^--(\w+)/);
+diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
+index 8478d0c..acb2539 100644
+--- a/perl/Git/SVN.pm
++++ b/perl/Git/SVN.pm
+@@ -23,7 +23,14 @@ use Git qw(
+ command_output_pipe
+ command_close_pipe
+ );
+-use Git::SVN::Utils qw(fatal can_compress);
++use Git::SVN::Utils qw(
++ fatal
++ can_compress
++ join_paths
++ canonicalize_path
++ canonicalize_url
++ add_path_to_url
++);
+
+ my $can_use_yaml;
+ BEGIN {
+@@ -195,9 +202,9 @@ sub read_all_remotes {
+ } elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) {
+ $r->{$1}->{svm} = {};
+ } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
+- $r->{$1}->{url} = $2;
++ $r->{$1}->{url} = canonicalize_url($2);
+ } elsif (m!^(.+)\.pushurl=\s*(.*)\s*$!) {
+- $r->{$1}->{pushurl} = $2;
++ $r->{$1}->{pushurl} = canonicalize_url($2);
+ } elsif (m!^(.+)\.ignore-refs=\s*(.*)\s*$!) {
+ $r->{$1}->{ignore_refs_regex} = $2;
+ } elsif (m!^(.+)\.(branches|tags)=$svn_refspec$!) {
+@@ -290,7 +297,7 @@ sub find_existing_remote {
+
+ sub init_remote_config {
+ my ($self, $url, $no_write) = @_;
+- $url =~ s!/+$!!; # strip trailing slash
++ $url = canonicalize_url($url);
+ my $r = read_all_remotes();
+ my $existing = find_existing_remote($url, $r);
+ if ($existing) {
+@@ -314,12 +321,10 @@ sub init_remote_config {
+ print STDERR "Using higher level of URL: ",
+ "$url => $min_url\n";
+ }
+- my $old_path = $self->{path};
+- $self->{path} = $url;
+- $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
+- if (length $old_path) {
+- $self->{path} .= "/$old_path";
+- }
++ my $old_path = $self->path;
++ $url =~ s!^\Q$min_url\E(/|$)!!;
++ $url = join_paths($url, $old_path);
++ $self->path($url);
+ $url = $min_url;
+ }
+ }
+@@ -343,18 +348,22 @@ sub init_remote_config {
+ unless ($no_write) {
+ command_noisy('config',
+ "svn-remote.$self->{repo_id}.url", $url);
+- $self->{path} =~ s{^/}{};
+- $self->{path} =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
++ my $path = $self->path;
++ $path =~ s{^/}{};
++ $path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
++ $self->path($path);
+ command_noisy('config', '--add',
+ "svn-remote.$self->{repo_id}.fetch",
+- "$self->{path}:".$self->refname);
++ $self->path.":".$self->refname);
+ }
+- $self->{url} = $url;
++ $self->url($url);
+ }
+
+ sub find_by_url { # repos_root and, path are optional
+ my ($class, $full_url, $repos_root, $path) = @_;
+
++ $full_url = canonicalize_url($full_url);
++
+ return undef unless defined $full_url;
+ remove_username($full_url);
+ remove_username($repos_root) if defined $repos_root;
+@@ -393,6 +402,11 @@ sub find_by_url { # repos_root and, path are optional
+ }
+ $p =~ s#^\Q$z\E(?:/|$)#$prefix# or next;
+ }
++
++ # remote fetch paths are not URI escaped. Decode ours
++ # so they match
++ $p = uri_decode($p);
++
+ foreach my $f (keys %$fetch) {
+ next if $f ne $p;
+ return Git::SVN->new($fetch->{$f}, $repo_id, $f);
+@@ -435,20 +449,25 @@ sub new {
+ }
+ }
+ my $self = _new($class, $repo_id, $ref_id, $path);
+- if (!defined $self->{path} || !length $self->{path}) {
++ if (!defined $self->path || !length $self->path) {
+ my $fetch = command_oneline('config', '--get',
+ "svn-remote.$repo_id.fetch",
+ ":$ref_id\$") or
+ die "Failed to read \"svn-remote.$repo_id.fetch\" ",
+ "\":$ref_id\$\" in config\n";
+- ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
++ my($path) = split(/\s*:\s*/, $fetch);
++ $self->path($path);
+ }
+- $self->{path} =~ s{/+}{/}g;
+- $self->{path} =~ s{\A/}{};
+- $self->{path} =~ s{/\z}{};
+- $self->{url} = command_oneline('config', '--get',
+- "svn-remote.$repo_id.url") or
++ {
++ my $path = $self->path;
++ $path =~ s{\A/}{};
++ $path =~ s{/\z}{};
++ $self->path($path);
++ }
++ my $url = command_oneline('config', '--get',
++ "svn-remote.$repo_id.url") or
+ die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
++ $self->url($url);
+ $self->{pushurl} = eval { command_oneline('config', '--get',
+ "svn-remote.$repo_id.pushurl") };
+ $self->rebuild;
+@@ -552,8 +571,7 @@ sub _set_svm_vars {
+ # username is of no interest
+ $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
+
+- my $replace = $ra->{url};
+- $replace .= "/$path" if length $path;
++ my $replace = add_path_to_url($ra->url, $path);
+
+ my $section = "svn-remote.$self->{repo_id}";
+ tmp_config("$section.svm-source", $src);
+@@ -567,20 +585,21 @@ sub _set_svm_vars {
+ }
+
+ my $r = $ra->get_latest_revnum;
+- my $path = $self->{path};
++ my $path = $self->path;
+ my %tried;
+ while (length $path) {
+- unless ($tried{"$self->{url}/$path"}) {
++ my $try = add_path_to_url($self->url, $path);
++ unless ($tried{$try}) {
+ return $ra if $self->read_svm_props($ra, $path, $r);
+- $tried{"$self->{url}/$path"} = 1;
++ $tried{$try} = 1;
+ }
+ $path =~ s#/?[^/]+$##;
+ }
+ die "Path: '$path' should be ''\n" if $path ne '';
+ return $ra if $self->read_svm_props($ra, $path, $r);
+- $tried{"$self->{url}/$path"} = 1;
++ $tried{ add_path_to_url($self->url, $path) } = 1;
+
+- if ($ra->{repos_root} eq $self->{url}) {
++ if ($ra->{repos_root} eq $self->url) {
+ die @err, (map { " $_\n" } keys %tried), "\n";
+ }
+
+@@ -590,20 +609,21 @@ sub _set_svm_vars {
+ $path = $ra->{svn_path};
+ $ra = Git::SVN::Ra->new($ra->{repos_root});
+ while (length $path) {
+- unless ($tried{"$ra->{url}/$path"}) {
++ my $try = add_path_to_url($ra->url, $path);
++ unless ($tried{$try}) {
+ $ok = $self->read_svm_props($ra, $path, $r);
+ last if $ok;
+- $tried{"$ra->{url}/$path"} = 1;
++ $tried{$try} = 1;
+ }
+ $path =~ s#/?[^/]+$##;
+ }
+ die "Path: '$path' should be ''\n" if $path ne '';
+ $ok ||= $self->read_svm_props($ra, $path, $r);
+- $tried{"$ra->{url}/$path"} = 1;
++ $tried{ add_path_to_url($ra->url, $path) } = 1;
+ if (!$ok) {
+ die @err, (map { " $_\n" } keys %tried), "\n";
+ }
+- Git::SVN::Ra->new($self->{url});
++ Git::SVN::Ra->new($self->url);
+ }
+
+ sub svnsync {
+@@ -670,7 +690,7 @@ sub ra_uuid {
+ if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/i) {
+ $self->{ra_uuid} = $uuid;
+ } else {
+- die "ra_uuid called without URL\n" unless $self->{url};
++ die "ra_uuid called without URL\n" unless $self->url;
+ $self->{ra_uuid} = $self->ra->get_uuid;
+ tmp_config('--add', $key, $self->{ra_uuid});
+ }
+@@ -694,7 +714,7 @@ sub repos_root {
+
+ sub ra {
+ my ($self) = shift;
+- my $ra = Git::SVN::Ra->new($self->{url});
++ my $ra = Git::SVN::Ra->new($self->url);
+ $self->_set_repos_root($ra->{repos_root});
+ if ($self->use_svm_props && !$self->{svm}) {
+ if ($self->no_metadata) {
+@@ -728,7 +748,7 @@ sub prop_walk {
+ $path =~ s#^/*#/#g;
+ my $p = $path;
+ # Strip the irrelevant part of the path.
+- $p =~ s#^/+\Q$self->{path}\E(/|$)#/#;
++ $p =~ s#^/+\Q@{[$self->path]}\E(/|$)#/#;
+ # Ensure the path is terminated by a `/'.
+ $p =~ s#/*$#/#;
+
+@@ -749,7 +769,7 @@ sub prop_walk {
+
+ foreach (sort keys %$dirent) {
+ next if $dirent->{$_}->{kind} != $SVN::Node::dir;
+- $self->prop_walk($self->{path} . $p . $_, $rev, $sub);
++ $self->prop_walk($self->path . $p . $_, $rev, $sub);
+ }
+ }
+
+@@ -919,20 +939,19 @@ sub rewrite_uuid {
+
+ sub metadata_url {
+ my ($self) = @_;
+- ($self->rewrite_root || $self->{url}) .
+- (length $self->{path} ? '/' . $self->{path} : '');
++ my $url = $self->rewrite_root || $self->url;
++ return canonicalize_url( add_path_to_url( $url, $self->path ) );
+ }
+
+ sub full_url {
+ my ($self) = @_;
+- $self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
++ return canonicalize_url( add_path_to_url( $self->url, $self->path ) );
+ }
+
+ sub full_pushurl {
+ my ($self) = @_;
+ if ($self->{pushurl}) {
+- return $self->{pushurl} . (length $self->{path} ? '/' .
+- $self->{path} : '');
++ return canonicalize_url( add_path_to_url( $self->{pushurl}, $self->path ) );
+ } else {
+ return $self->full_url;
+ }
+@@ -1048,20 +1067,20 @@ sub do_git_commit {
+
+ sub match_paths {
+ my ($self, $paths, $r) = @_;
+- return 1 if $self->{path} eq '';
+- if (my $path = $paths->{"/$self->{path}"}) {
++ return 1 if $self->path eq '';
++ if (my $path = $paths->{"/".$self->path}) {
+ return ($path->{action} eq 'D') ? 0 : 1;
+ }
+- $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//;
++ $self->{path_regex} ||= qr{^/\Q@{[$self->path]}\E/};
+ if (grep /$self->{path_regex}/, keys %$paths) {
+ return 1;
+ }
+ my $c = '';
+- foreach (split m#/#, $self->{path}) {
++ foreach (split m#/#, $self->path) {
+ $c .= "/$_";
+ next unless ($paths->{$c} &&
+ ($paths->{$c}->{action} =~ /^[AR]$/));
+- if ($self->ra->check_path($self->{path}, $r) ==
++ if ($self->ra->check_path($self->path, $r) ==
+ $SVN::Node::dir) {
+ return 1;
+ }
+@@ -1075,14 +1094,14 @@ sub find_parent_branch {
+ unless (defined $paths) {
+ my $err_handler = $SVN::Error::handler;
+ $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;
+- $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1,
++ $self->ra->get_log([$self->path], $rev, $rev, 0, 1, 1,
+ sub { $paths = $_[0] });
+ $SVN::Error::handler = $err_handler;
+ }
+ return undef unless defined $paths;
+
+ # look for a parent from another branch:
+- my @b_path_components = split m#/#, $self->{path};
++ my @b_path_components = split m#/#, $self->path;
+ my @a_path_components;
+ my $i;
+ while (@b_path_components) {
+@@ -1099,8 +1118,8 @@ sub find_parent_branch {
+ }
+ my $r = $i->{copyfrom_rev};
+ my $repos_root = $self->ra->{repos_root};
+- my $url = $self->ra->{url};
+- my $new_url = $url . $branch_from;
++ my $url = $self->ra->url;
++ my $new_url = canonicalize_url( add_path_to_url( $url, $branch_from ) );
+ print STDERR "Found possible branch point: ",
+ "$new_url => ", $self->full_url, ", $r\n"
+ unless $::_q > 1;
+@@ -1114,7 +1133,7 @@ sub find_parent_branch {
+ ($base, $head) = parse_revision_argument(0, $r);
+ } else {
+ if ($r0 < $r) {
+- $gs->ra->get_log([$gs->{path}], $r0 + 1, $r, 1,
++ $gs->ra->get_log([$gs->path], $r0 + 1, $r, 1,
+ 0, 1, sub { $base = $_[1] - 1 });
+ }
+ }
+@@ -1136,7 +1155,7 @@ sub find_parent_branch {
+ # at the moment), so we can't rely on it
+ $self->{last_rev} = $r0;
+ $self->{last_commit} = $parent;
+- $ed = Git::SVN::Fetcher->new($self, $gs->{path});
++ $ed = Git::SVN::Fetcher->new($self, $gs->path);
+ $gs->ra->gs_do_switch($r0, $rev, $gs,
+ $self->full_url, $ed)
+ or die "SVN connection failed somewhere...\n";
+@@ -1235,7 +1254,7 @@ sub mkemptydirs {
+ close $fh;
+ }
+
+- my $strip = qr/\A\Q$self->{path}\E(?:\/|$)/;
++ my $strip = qr/\A\Q@{[$self->path]}\E(?:\/|$)/;
+ foreach my $d (sort keys %empty_dirs) {
+ $d = uri_decode($d);
+ $d =~ s/$strip//;
+@@ -1429,12 +1448,11 @@ sub find_extra_svk_parents {
+ for my $ticket ( @tickets ) {
+ my ($uuid, $path, $rev) = split /:/, $ticket;
+ if ( $uuid eq $self->ra_uuid ) {
+- my $url = $self->{url};
+- my $repos_root = $url;
++ my $repos_root = $self->url;
+ my $branch_from = $path;
+ $branch_from =~ s{^/}{};
+- my $gs = $self->other_gs($repos_root."/".$branch_from,
+- $url,
++ my $gs = $self->other_gs(add_path_to_url( $repos_root, $branch_from ),
++ $repos_root,
+ $branch_from,
+ $rev,
+ $self->{ref_id});
+@@ -1693,7 +1711,7 @@ sub find_extra_svn_parents {
+ # are now marked as merge, we can add the tip as a parent.
+ my @merges = split "\n", $mergeinfo;
+ my @merge_tips;
+- my $url = $self->{url};
++ my $url = $self->url;
+ my $uuid = $self->ra_uuid;
+ my %ranges;
+ for my $merge ( @merges ) {
+@@ -1875,8 +1893,9 @@ sub make_log_entry {
+ $email ||= "$author\@$uuid";
+ $commit_email ||= "$author\@$uuid";
+ } elsif ($self->use_svnsync_props) {
+- my $full_url = $self->svnsync->{url};
+- $full_url .= "/$self->{path}" if length $self->{path};
++ my $full_url = canonicalize_url(
++ add_path_to_url( $self->svnsync->{url}, $self->path )
++ );
+ remove_username($full_url);
+ my $uuid = $self->svnsync->{uuid};
+ $log_entry{metadata} = "$full_url\@$rev $uuid";
+@@ -1923,7 +1942,7 @@ sub set_tree {
+ tree_b => $tree,
+ editor_cb => sub {
+ $self->set_tree_cb($log_entry, $tree, @_) },
+- svn_path => $self->{path} );
++ svn_path => $self->path );
+ if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) {
+ print "No changes\nr$self->{last_rev} = $tree\n";
+ }
+@@ -2299,10 +2318,39 @@ sub _new {
+
+ $_[3] = $path = '' unless (defined $path);
+ mkpath([$dir]);
+- bless {
++ my $obj = bless {
+ ref_id => $ref_id, dir => $dir, index => "$dir/index",
+- path => $path, config => "$ENV{GIT_DIR}/svn/config",
++ config => "$ENV{GIT_DIR}/svn/config",
+ map_root => "$dir/.rev_map", repo_id => $repo_id }, $class;
++
++ # Ensure it gets canonicalized
++ $obj->path($path);
++
++ return $obj;
++}
++
++sub path {
++ my $self = shift;
++
++ if (@_) {
++ my $path = shift;
++ $self->{path} = canonicalize_path($path);
++ return;
++ }
++
++ return $self->{path};
++}
++
++sub url {
++ my $self = shift;
++
++ if (@_) {
++ my $url = shift;
++ $self->{url} = canonicalize_url($url);
++ return;
++ }
++
++ return $self->{url};
+ }
+
+ # for read-only access of old .rev_db formats
+diff --git a/perl/Git/SVN/Fetcher.pm b/perl/Git/SVN/Fetcher.pm
+index 76fae9b..046a7a2 100644
+--- a/perl/Git/SVN/Fetcher.pm
++++ b/perl/Git/SVN/Fetcher.pm
+@@ -83,7 +83,7 @@ sub _mark_empty_symlinks {
+ chomp(my $empty_blob = `git hash-object -t blob --stdin < /dev/null`);
+ my ($ls, $ctx) = command_output_pipe(qw/ls-tree -r -z/, $cmt);
+ local $/ = "\0";
+- my $pfx = defined($switch_path) ? $switch_path : $git_svn->{path};
++ my $pfx = defined($switch_path) ? $switch_path : $git_svn->path;
+ $pfx .= '/' if length($pfx);
+ while (<$ls>) {
+ chomp;
+diff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm
+index 75d7429..30daf35 100644
+--- a/perl/Git/SVN/Migration.pm
++++ b/perl/Git/SVN/Migration.pm
+@@ -177,14 +177,14 @@ sub minimize_connections {
+ my $ra = Git::SVN::Ra->new($url);
+
+ # skip existing cases where we already connect to the root
+- if (($ra->{url} eq $ra->{repos_root}) ||
++ if (($ra->url eq $ra->{repos_root}) ||
+ ($ra->{repos_root} eq $repo_id)) {
+- $root_repos->{$ra->{url}} = $repo_id;
++ $root_repos->{$ra->url} = $repo_id;
+ next;
+ }
+
+ my $root_ra = Git::SVN::Ra->new($ra->{repos_root});
+- my $root_path = $ra->{url};
++ my $root_path = $ra->url;
+ $root_path =~ s#^\Q$ra->{repos_root}\E(/|$)##;
+ foreach my $path (keys %$fetch) {
+ my $ref_id = $fetch->{$path};
+diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
+index 23ff43e..90ec30b 100644
+--- a/perl/Git/SVN/Ra.pm
++++ b/perl/Git/SVN/Ra.pm
+@@ -3,6 +3,12 @@ use vars qw/@ISA $config_dir $_ignore_refs_regex $_log_window_size/;
+ use strict;
+ use warnings;
+ use SVN::Client;
++use Git::SVN::Utils qw(
++ canonicalize_url
++ canonicalize_path
++ add_path_to_url
++);
++
+ use SVN::Ra;
+ BEGIN {
+ @ISA = qw(SVN::Ra);
+@@ -62,29 +68,11 @@ sub _auth_providers () {
+ \@rv;
+ }
+
+-sub escape_uri_only {
+- my ($uri) = @_;
+- my @tmp;
+- foreach (split m{/}, $uri) {
+- s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
+- push @tmp, $_;
+- }
+- join('/', @tmp);
+-}
+-
+-sub escape_url {
+- my ($url) = @_;
+- if ($url =~ m#^(https?)://([^/]+)(.*)$#) {
+- my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
+- $url = "$scheme://$domain$uri";
+- }
+- $url;
+-}
+
+ sub new {
+ my ($class, $url) = @_;
+- $url =~ s!/+$!!;
+- return $RA if ($RA && $RA->{url} eq $url);
++ $url = canonicalize_url($url);
++ return $RA if ($RA && $RA->url eq $url);
+
+ ::_req_svn();
+
+@@ -115,17 +103,34 @@ sub new {
+ $Git::SVN::Prompt::_no_auth_cache = 1;
+ }
+ } # no warnings 'once'
+- my $self = SVN::Ra->new(url => escape_url($url), auth => $baton,
++
++ my $self = SVN::Ra->new(url => $url, auth => $baton,
+ config => $config,
+ pool => SVN::Pool->new,
+ auth_provider_callbacks => $callbacks);
+- $self->{url} = $url;
++ $RA = bless $self, $class;
++
++ # Make sure its canonicalized
++ $self->url($url);
+ $self->{svn_path} = $url;
+ $self->{repos_root} = $self->get_repos_root;
+ $self->{svn_path} =~ s#^\Q$self->{repos_root}\E(/|$)##;
+ $self->{cache} = { check_path => { r => 0, data => {} },
+ get_dir => { r => 0, data => {} } };
+- $RA = bless $self, $class;
++
++ return $RA;
++}
++
++sub url {
++ my $self = shift;
++
++ if (@_) {
++ my $url = shift;
++ $self->{url} = canonicalize_url($url);
++ return;
++ }
++
++ return $self->{url};
+ }
+
+ sub check_path {
+@@ -195,6 +200,7 @@ sub get_log {
+ qw/copyfrom_path copyfrom_rev action/;
+ if ($s{'copyfrom_path'}) {
+ $s{'copyfrom_path'} =~ s/$prefix_regex//;
++ $s{'copyfrom_path'} = canonicalize_path($s{'copyfrom_path'});
+ }
+ $_[0]{$p} = \%s;
+ }
+@@ -246,7 +252,7 @@ sub get_commit_editor {
+ sub gs_do_update {
+ my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
+ my $new = ($rev_a == $rev_b);
+- my $path = $gs->{path};
++ my $path = $gs->path;
+
+ if ($new && -e $gs->{index}) {
+ unlink $gs->{index} or die
+@@ -282,30 +288,33 @@ sub gs_do_update {
+ # svn_ra_reparent didn't work before 1.4)
+ sub gs_do_switch {
+ my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
+- my $path = $gs->{path};
++ my $path = $gs->path;
+ my $pool = SVN::Pool->new;
+
+- my $full_url = $self->{url};
+- my $old_url = $full_url;
+- $full_url .= '/' . $path if length $path;
++ my $old_url = $self->url;
++ my $full_url = add_path_to_url( $self->url, $path );
+ my ($ra, $reparented);
+
+ if ($old_url =~ m#^svn(\+ssh)?://# ||
+ ($full_url =~ m#^https?://# &&
+- escape_url($full_url) ne $full_url)) {
++ canonicalize_url($full_url) ne $full_url)) {
+ $_[0] = undef;
+ $self = undef;
+ $RA = undef;
+ $ra = Git::SVN::Ra->new($full_url);
+ $ra_invalid = 1;
+ } elsif ($old_url ne $full_url) {
+- SVN::_Ra::svn_ra_reparent($self->{session}, $full_url, $pool);
+- $self->{url} = $full_url;
++ SVN::_Ra::svn_ra_reparent(
++ $self->{session},
++ canonicalize_url($full_url),
++ $pool
++ );
++ $self->url($full_url);
+ $reparented = 1;
+ }
+
+ $ra ||= $self;
+- $url_b = escape_url($url_b);
++ $url_b = canonicalize_url($url_b);
+ my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
+ my @lock = (::compare_svn_version('1.2.0') >= 0) ? (undef) : ();
+ $reporter->set_path('', $rev_a, 0, @lock, $pool);
+@@ -313,7 +322,7 @@ sub gs_do_switch {
+
+ if ($reparented) {
+ SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool);
+- $self->{url} = $old_url;
++ $self->url($old_url);
+ }
+
+ $pool->clear;
+@@ -326,7 +335,7 @@ sub longest_common_path {
+ my $common_max = scalar @$gsv;
+
+ foreach my $gs (@$gsv) {
+- my @tmp = split m#/#, $gs->{path};
++ my @tmp = split m#/#, $gs->path;
+ my $p = '';
+ foreach (@tmp) {
+ $p .= length($p) ? "/$_" : $_;
+@@ -362,7 +371,7 @@ sub gs_fetch_loop_common {
+ my $inc = $_log_window_size;
+ my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
+ my $longest_path = longest_common_path($gsv, $globs);
+- my $ra_url = $self->{url};
++ my $ra_url = $self->url;
+ my $find_trailing_edge;
+ while (1) {
+ my %revs;
+@@ -508,7 +517,7 @@ sub match_globs {
+ ($self->check_path($p, $r) !=
+ $SVN::Node::dir));
+ next unless $p =~ /$g->{path}->{regex}/;
+- $exists->{$p} = Git::SVN->init($self->{url}, $p, undef,
++ $exists->{$p} = Git::SVN->init($self->url, $p, undef,
+ $g->{ref}->full_path($de), 1);
+ }
+ }
+@@ -532,7 +541,7 @@ sub match_globs {
+ next if ($self->check_path($pathname, $r) !=
+ $SVN::Node::dir);
+ $exists->{$pathname} = Git::SVN->init(
+- $self->{url}, $pathname, undef,
++ $self->url, $pathname, undef,
+ $g->{ref}->full_path($p), 1);
+ }
+ my $c = '';
+@@ -548,19 +557,20 @@ sub match_globs {
+
+ sub minimize_url {
+ my ($self) = @_;
+- return $self->{url} if ($self->{url} eq $self->{repos_root});
++ return $self->url if ($self->url eq $self->{repos_root});
+ my $url = $self->{repos_root};
+ my @components = split(m!/!, $self->{svn_path});
+ my $c = '';
+ do {
+- $url .= "/$c" if length $c;
++ $url = add_path_to_url($url, $c);
+ eval {
+ my $ra = (ref $self)->new($url);
+ my $latest = $ra->get_latest_revnum;
+ $ra->get_log("", $latest, 0, 1, 0, 1, sub {});
+ };
+ } while ($@ && ($c = shift @components));
+- $url;
++
++ return canonicalize_url($url);
+ }
+
+ sub can_do_switch {
+@@ -568,7 +578,7 @@ sub can_do_switch {
+ unless (defined $can_do_switch) {
+ my $pool = SVN::Pool->new;
+ my $rep = eval {
+- $self->do_switch(1, '', 0, $self->{url},
++ $self->do_switch(1, '', 0, $self->url,
+ SVN::Delta::Editor->new, $pool);
+ };
+ if ($@) {
+diff --git a/perl/Git/SVN/Utils.pm b/perl/Git/SVN/Utils.pm
+index 496006b..4bb4dde 100644
+--- a/perl/Git/SVN/Utils.pm
++++ b/perl/Git/SVN/Utils.pm
+@@ -3,9 +3,18 @@ package Git::SVN::Utils;
+ use strict;
+ use warnings;
+
++use SVN::Core;
++
+ use base qw(Exporter);
+
+-our @EXPORT_OK = qw(fatal can_compress);
++our @EXPORT_OK = qw(
++ fatal
++ can_compress
++ canonicalize_path
++ canonicalize_url
++ join_paths
++ add_path_to_url
++);
+
+
+ =head1 NAME
+@@ -56,4 +65,169 @@ sub can_compress {
+ }
+
+
++=head3 canonicalize_path
++
++ my $canoncalized_path = canonicalize_path($path);
++
++Converts $path into a canonical form which is safe to pass to the SVN
++API as a file path.
++
++=cut
++
++# Turn foo/../bar into bar
++sub _collapse_dotdot {
++ my $path = shift;
++
++ 1 while $path =~ s{/[^/]+/+\.\.}{};
++ 1 while $path =~ s{[^/]+/+\.\./}{};
++ 1 while $path =~ s{[^/]+/+\.\.}{};
++
++ return $path;
++}
++
++
++sub canonicalize_path {
++ my $path = shift;
++ my $rv;
++
++ # The 1.7 way to do it
++ if ( defined &SVN::_Core::svn_dirent_canonicalize ) {
++ $path = _collapse_dotdot($path);
++ $rv = SVN::_Core::svn_dirent_canonicalize($path);
++ }
++ # The 1.6 way to do it
++ # This can return undef on subversion-perl-1.4.2-2.el5 (CentOS 5.2)
++ elsif ( defined &SVN::_Core::svn_path_canonicalize ) {
++ $path = _collapse_dotdot($path);
++ $rv = SVN::_Core::svn_path_canonicalize($path);
++ }
++
++ return $rv if defined $rv;
++
++ # No SVN API canonicalization is available, or the SVN API
++ # didn't return a successful result, do it ourselves
++ return _canonicalize_path_ourselves($path);
++}
++
++
++sub _canonicalize_path_ourselves {
++ my ($path) = @_;
++ my $dot_slash_added = 0;
++ if (substr($path, 0, 1) ne "/") {
++ $path = "./" . $path;
++ $dot_slash_added = 1;
++ }
++ $path =~ s#/+#/#g;
++ $path =~ s#/\.(?:/|$)#/#g;
++ $path = _collapse_dotdot($path);
++ $path =~ s#/$##g;
++ $path =~ s#^\./## if $dot_slash_added;
++ $path =~ s#^/##;
++ $path =~ s#^\.$##;
++ return $path;
++}
++
++
++=head3 canonicalize_url
++
++ my $canonicalized_url = canonicalize_url($url);
++
++Converts $url into a canonical form which is safe to pass to the SVN
++API as a URL.
++
++=cut
++
++sub canonicalize_url {
++ my $url = shift;
++
++ # The 1.7 way to do it
++ if ( defined &SVN::_Core::svn_uri_canonicalize ) {
++ return SVN::_Core::svn_uri_canonicalize($url);
++ }
++ # There wasn't a 1.6 way to do it, so we do it ourself.
++ else {
++ return _canonicalize_url_ourselves($url);
++ }
++}
++
++
++sub _canonicalize_url_path {
++ my ($uri_path) = @_;
++
++ my @parts;
++ foreach my $part (split m{/+}, $uri_path) {
++ $part =~ s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
++ push @parts, $part;
++ }
++
++ return join('/', @parts);
++}
++
++sub _canonicalize_url_ourselves {
++ my ($url) = @_;
++ if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
++ my ($scheme, $domain, $uri) = ($1, $2, _canonicalize_url_path(canonicalize_path($3)));
++ $url = "$scheme://$domain$uri";
++ }
++ $url;
++}
++
++
++=head3 join_paths
++
++ my $new_path = join_paths(@paths);
++
++Appends @paths together into a single path. Any empty paths are ignored.
++
++=cut
++
++sub join_paths {
++ my @paths = @_;
++
++ @paths = grep { defined $_ && length $_ } @paths;
++
++ return '' unless @paths;
++ return $paths[0] if @paths == 1;
++
++ my $new_path = shift @paths;
++ $new_path =~ s{/+$}{};
++
++ my $last_path = pop @paths;
++ $last_path =~ s{^/+}{};
++
++ for my $path (@paths) {
++ $path =~ s{^/+}{};
++ $path =~ s{/+$}{};
++ $new_path .= "/$path";
++ }
++
++ return $new_path .= "/$last_path";
++}
++
++
++=head3 add_path_to_url
++
++ my $new_url = add_path_to_url($url, $path);
++
++Appends $path onto the $url. If $path is empty, $url is returned unchanged.
++
++=cut
++
++sub add_path_to_url {
++ my($url, $path) = @_;
++
++ return $url if !defined $path or !length $path;
++
++ # Strip trailing and leading slashes so we don't
++ # wind up with http://x.com///path
++ $url =~ s{/+$}{};
++ $path =~ s{^/+}{};
++
++ # If a path has a % in it, URI escape it so it's not
++ # mistaken for a URI escape later.
++ $path =~ s{%}{%25}g;
++
++ return join '/', $url, $path;
++}
++
+ 1;
+diff --git a/t/Git-SVN/Utils/add_path_to_url.t b/t/Git-SVN/Utils/add_path_to_url.t
+new file mode 100644
+index 0000000..bfbd878
+--- /dev/null
++++ b/t/Git-SVN/Utils/add_path_to_url.t
+@@ -0,0 +1,27 @@
++#!/usr/bin/env perl
++
++use strict;
++use warnings;
++
++use Test::More 'no_plan';
++
++use Git::SVN::Utils qw(
++ add_path_to_url
++);
++
++# A reference cannot be a hash key, so we use an array.
++my @tests = (
++ ["http://x.com", "bar"] => 'http://x.com/bar',
++ ["http://x.com", ""] => 'http://x.com',
++ ["http://x.com/foo/", undef] => 'http://x.com/foo/',
++ ["http://x.com/foo/", "/bar/baz/"] => 'http://x.com/foo/bar/baz/',
++ ["http://x.com", 'per%cent'] => 'http://x.com/per%25cent',
++);
++
++while(@tests) {
++ my($have, $want) = splice @tests, 0, 2;
++
++ my $args = join ", ", map { qq['$_'] } map { defined($_) ? $_ : 'undef' } @$have;
++ my $name = "add_path_to_url($args) eq $want";
++ is add_path_to_url(@$have), $want, $name;
++}
+diff --git a/t/Git-SVN/Utils/canonicalize_url.t b/t/Git-SVN/Utils/canonicalize_url.t
+new file mode 100644
+index 0000000..05795ab
+--- /dev/null
++++ b/t/Git-SVN/Utils/canonicalize_url.t
+@@ -0,0 +1,26 @@
++#!/usr/bin/env perl
++
++# Test our own home rolled URL canonicalizer. Test the private one
++# directly because we can't predict what the SVN API is doing to do.
++
++use strict;
++use warnings;
++
++use Test::More 'no_plan';
++
++use Git::SVN::Utils;
++my $canonicalize_url = \&Git::SVN::Utils::_canonicalize_url_ourselves;
++
++my %tests = (
++ "http://x.com" => "http://x.com",
++ "http://x.com/" => "http://x.com",
++ "http://x.com/foo/bar" => "http://x.com/foo/bar",
++ "http://x.com//foo//bar//" => "http://x.com/foo/bar",
++ "http://x.com/ /%/" => "http://x.com/%20%20/%25",
++);
++
++for my $arg (keys %tests) {
++ my $want = $tests{$arg};
++
++ is $canonicalize_url->($arg), $want, "canonicalize_url('$arg') => $want";
++}
+diff --git a/t/Git-SVN/Utils/collapse_dotdot.t b/t/Git-SVN/Utils/collapse_dotdot.t
+new file mode 100644
+index 0000000..1da1cce
+--- /dev/null
++++ b/t/Git-SVN/Utils/collapse_dotdot.t
+@@ -0,0 +1,23 @@
++#!/usr/bin/env perl
++
++use strict;
++use warnings;
++
++use Test::More 'no_plan';
++
++use Git::SVN::Utils;
++my $collapse_dotdot = \&Git::SVN::Utils::_collapse_dotdot;
++
++my %tests = (
++ "foo/bar/baz" => "foo/bar/baz",
++ ".." => "..",
++ "foo/.." => "",
++ "/foo/bar/../../baz" => "/baz",
++ "deeply/.././deeply/nested" => "./deeply/nested",
++);
++
++for my $arg (keys %tests) {
++ my $want = $tests{$arg};
++
++ is $collapse_dotdot->($arg), $want, "_collapse_dotdot('$arg') => $want";
++}
+diff --git a/t/Git-SVN/Utils/join_paths.t b/t/Git-SVN/Utils/join_paths.t
+new file mode 100644
+index 0000000..d4488e7
+--- /dev/null
++++ b/t/Git-SVN/Utils/join_paths.t
+@@ -0,0 +1,32 @@
++#!/usr/bin/env perl
++
++use strict;
++use warnings;
++
++use Test::More 'no_plan';
++
++use Git::SVN::Utils qw(
++ join_paths
++);
++
++# A reference cannot be a hash key, so we use an array.
++my @tests = (
++ [] => '',
++ ["/x.com", "bar"] => '/x.com/bar',
++ ["x.com", ""] => 'x.com',
++ ["/x.com/foo/", undef, "bar"] => '/x.com/foo/bar',
++ ["x.com/foo/", "/bar/baz/"] => 'x.com/foo/bar/baz/',
++ ["foo", "bar"] => 'foo/bar',
++ ["/foo/bar", "baz", "/biff"] => '/foo/bar/baz/biff',
++ ["", undef, "."] => '.',
++ [] => '',
++
++);
++
++while(@tests) {
++ my($have, $want) = splice @tests, 0, 2;
++
++ my $args = join ", ", map { qq['$_'] } map { defined($_) ? $_ : 'undef' } @$have;
++ my $name = "join_paths($args) eq '$want'";
++ is join_paths(@$have), $want, $name;
++}
+diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
+index 289fc31..ee73013 100755
+--- a/t/t9107-git-svn-migrate.sh
++++ b/t/t9107-git-svn-migrate.sh
+@@ -27,15 +27,17 @@ test_expect_success 'setup old-looking metadata' '
+ head=`git rev-parse --verify refs/heads/git-svn-HEAD^0`
+ test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'"
+
++svnrepo_escaped=`echo $svnrepo | sed 's/ /%20/'`
++
+ test_expect_success 'initialize old-style (v0) git svn layout' '
+ mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
+ echo "$svnrepo" > "$GIT_DIR"/git-svn/info/url &&
+ echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
+ git svn migrate &&
+- ! test -d "$GIT_DIR"/git svn &&
++ ! test -d "$GIT_DIR"/git-svn &&
+ git rev-parse --verify refs/${remotes_git_svn}^0 &&
+ git rev-parse --verify refs/remotes/svn^0 &&
+- test "$(git config --get svn-remote.svn.url)" = "$svnrepo" &&
++ test "$(git config --get svn-remote.svn.url)" = "$svnrepo_escaped" &&
+ test `git config --get svn-remote.svn.fetch` = \
+ ":refs/${remotes_git_svn}"
+ '
+diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh
+index 63fc982..193d3ca 100755
+--- a/t/t9118-git-svn-funky-branch-names.sh
++++ b/t/t9118-git-svn-funky-branch-names.sh
+@@ -32,6 +32,11 @@ test_expect_success 'setup svnrepo' '
+ start_httpd
+ '
+
++# SVN 1.7 will truncate "not-a%40{0]" to just "not-a".
++# Look at what SVN wound up naming the branch and use that.
++# Be sure to escape the @ if it shows up.
++non_reflog=`svn_cmd ls "$svnrepo/pr ject/branches" | grep not-a | sed 's/\///' | sed 's/@/%40/'`
++
+ test_expect_success 'test clone with funky branch names' '
+ git svn clone -s "$svnrepo/pr ject" project &&
+ (
+@@ -42,7 +47,7 @@ test_expect_success 'test clone with funky branch names' '
+ git rev-parse "refs/remotes/%2Eleading_dot" &&
+ git rev-parse "refs/remotes/trailing_dot%2E" &&
+ git rev-parse "refs/remotes/trailing_dotlock%2Elock" &&
+- git rev-parse "refs/remotes/not-a%40{0}reflog"
++ git rev-parse "refs/remotes/$non_reflog"
+ )
+ '
+
diff --git a/dev-vcs/git/files/git-1.7.12-optional-cvs.patch b/dev-vcs/git/files/git-1.7.12-optional-cvs.patch
new file mode 100644
index 0000000..bd8413d
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.12-optional-cvs.patch
@@ -0,0 +1,368 @@
+From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
+From: Robin Johnson <robbat2@gentoo.org>
+Date: Wed, 22 Aug 2012 04:25:06 +0000
+Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
+ utilities
+
+Forward-ported from 1.7.10.2 to current git.git v1.7.12 tag PLUS fix-svn branch.
+
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/Makefile git-1.7.12/Makefile
+--- git-1.7.12.orig/Makefile 2012-08-20 01:22:48.000000000 +0000
++++ git-1.7.12/Makefile 2012-08-22 04:23:48.335032122 +0000
+@@ -224,6 +224,8 @@
+ #
+ # 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'.
+@@ -405,6 +407,7 @@
+ PROGRAM_OBJS =
+ PROGRAMS =
+ SCRIPT_PERL =
++SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -445,18 +448,19 @@
+ 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-remote-testgit.py
+ SCRIPT_PYTHON += git-p4.py
+
+ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
+- $(patsubst %.perl,%,$(SCRIPT_PERL)) \
++ $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
+ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
+ git-instaweb
+
+@@ -2088,8 +2092,18 @@
+ $(QUIET_GEN)$(cmd_munge_script) && \
+ mv $@+ $@
+
++_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
+
+@@ -2101,7 +2115,7 @@
+ perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
+ $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
+
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE
+ $(QUIET_GEN)$(RM) $@ $@+ && \
+ INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
+ sed -e '1{' \
+@@ -2126,14 +2140,17 @@
+ 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|#!$(SHELL_PATH_SQ)|' \
+ -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
+ unimplemented.sh >$@+ && \
+ chmod +x $@+ && \
+ mv $@+ $@
+-endif # NO_PERL
+
+ ifndef NO_PYTHON
+ $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS GIT-PREFIX
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9200-git-cvsexportcommit.sh git-1.7.12/t/t9200-git-cvsexportcommit.sh
+--- git-1.7.12.orig/t/t9200-git-cvsexportcommit.sh 2012-08-20 01:22:48.000000000 +0000
++++ git-1.7.12/t/t9200-git-cvsexportcommit.sh 2012-08-22 04:19:23.650741974 +0000
+@@ -12,6 +12,11 @@
+ 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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9400-git-cvsserver-server.sh git-1.7.12/t/t9400-git-cvsserver-server.sh
+--- git-1.7.12.orig/t/t9400-git-cvsserver-server.sh 2012-08-20 01:22:48.000000000 +0000
++++ git-1.7.12/t/t9400-git-cvsserver-server.sh 2012-08-22 04:19:23.650741974 +0000
+@@ -11,9 +11,15 @@
+ . ./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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9401-git-cvsserver-crlf.sh git-1.7.12/t/t9401-git-cvsserver-crlf.sh
+--- git-1.7.12.orig/t/t9401-git-cvsserver-crlf.sh 2012-08-20 01:22:48.000000000 +0000
++++ git-1.7.12/t/t9401-git-cvsserver-crlf.sh 2012-08-22 04:19:23.650741974 +0000
+@@ -38,15 +38,20 @@
+ fi
+ }
+
+-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_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9600-cvsimport.sh git-1.7.12/t/t9600-cvsimport.sh
+--- git-1.7.12.orig/t/t9600-cvsimport.sh 2012-08-20 01:22:48.000000000 +0000
++++ git-1.7.12/t/t9600-cvsimport.sh 2012-08-22 04:19:23.650741974 +0000
+@@ -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 @@
+ )
+ '
+
+-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 @@
+ )
+ '
+
+-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 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_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 '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 '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_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 '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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9601-cvsimport-vendor-branch.sh git-1.7.12/t/t9601-cvsimport-vendor-branch.sh
+--- git-1.7.12.orig/t/t9601-cvsimport-vendor-branch.sh 2012-08-20 01:22:48.000000000 +0000
++++ git-1.7.12/t/t9601-cvsimport-vendor-branch.sh 2012-08-22 04:19:23.650741974 +0000
+@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9602-cvsimport-branches-tags.sh git-1.7.12/t/t9602-cvsimport-branches-tags.sh
+--- git-1.7.12.orig/t/t9602-cvsimport-branches-tags.sh 2012-08-20 01:22:48.000000000 +0000
++++ git-1.7.12/t/t9602-cvsimport-branches-tags.sh 2012-08-22 04:19:23.650741974 +0000
+@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9603-cvsimport-patchsets.sh git-1.7.12/t/t9603-cvsimport-patchsets.sh
+--- git-1.7.12.orig/t/t9603-cvsimport-patchsets.sh 2012-08-20 01:22:48.000000000 +0000
++++ git-1.7.12/t/t9603-cvsimport-patchsets.sh 2012-08-22 04:19:23.650741974 +0000
+@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/test-lib.sh git-1.7.12/t/test-lib.sh
+--- git-1.7.12.orig/t/test-lib.sh 2012-08-20 01:22:48.000000000 +0000
++++ git-1.7.12/t/test-lib.sh 2012-08-22 04:19:23.650741974 +0000
+@@ -618,6 +618,7 @@
+ 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
diff --git a/dev-vcs/git/files/git-1.8.2-optional-cvs.patch b/dev-vcs/git/files/git-1.8.2-optional-cvs.patch
new file mode 100644
index 0000000..4fa0b3e
--- /dev/null
+++ b/dev-vcs/git/files/git-1.8.2-optional-cvs.patch
@@ -0,0 +1,369 @@
+From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
+From: Robin Johnson <robbat2@gentoo.org>
+Date: Wed, 22 Aug 2012 04:25:06 +0000
+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.2
+
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/Makefile git-1.8.2/Makefile
+--- git-1.8.2.orig/Makefile 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.2/Makefile 2013-03-19 16:58:52.922806111 -0700
+@@ -259,6 +259,8 @@
+ #
+ # 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'.
+@@ -431,6 +433,7 @@
+ PROGRAM_OBJS =
+ PROGRAMS =
+ SCRIPT_PERL =
++SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -471,19 +474,20 @@
+ 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-remote-testpy.py
+ SCRIPT_PYTHON += git-p4.py
+
+ # 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))
+
+ # Individual rules to allow e.g.
+@@ -1745,8 +1749,18 @@
+ $(QUIET_GEN)$(cmd_munge_script) && \
+ mv $@+ $@
+
++_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
+
+@@ -1758,7 +1772,7 @@
+ perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
+ $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
+
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE
+ $(QUIET_GEN)$(RM) $@ $@+ && \
+ INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
+ sed -e '1{' \
+@@ -1783,14 +1797,17 @@
+ 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|#!$(SHELL_PATH_SQ)|' \
+ -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
+ unimplemented.sh >$@+ && \
+ chmod +x $@+ && \
+ mv $@+ $@
+-endif # NO_PERL
+
+ ifndef NO_PYTHON
+ $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9200-git-cvsexportcommit.sh git-1.8.2/t/t9200-git-cvsexportcommit.sh
+--- git-1.8.2.orig/t/t9200-git-cvsexportcommit.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.2/t/t9200-git-cvsexportcommit.sh 2013-03-19 16:56:29.124993905 -0700
+@@ -12,6 +12,11 @@
+ 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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9400-git-cvsserver-server.sh git-1.8.2/t/t9400-git-cvsserver-server.sh
+--- git-1.8.2.orig/t/t9400-git-cvsserver-server.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.2/t/t9400-git-cvsserver-server.sh 2013-03-19 16:56:29.124993905 -0700
+@@ -11,9 +11,15 @@
+ . ./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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9401-git-cvsserver-crlf.sh git-1.8.2/t/t9401-git-cvsserver-crlf.sh
+--- git-1.8.2.orig/t/t9401-git-cvsserver-crlf.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.2/t/t9401-git-cvsserver-crlf.sh 2013-03-19 16:56:29.125993925 -0700
+@@ -57,15 +57,20 @@
+ 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_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9600-cvsimport.sh git-1.8.2/t/t9600-cvsimport.sh
+--- git-1.8.2.orig/t/t9600-cvsimport.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.2/t/t9600-cvsimport.sh 2013-03-19 16:56:29.125993925 -0700
+@@ -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 @@
+ )
+ '
+
+-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 @@
+ )
+ '
+
+-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 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_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 '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 '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_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 '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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9601-cvsimport-vendor-branch.sh git-1.8.2/t/t9601-cvsimport-vendor-branch.sh
+--- git-1.8.2.orig/t/t9601-cvsimport-vendor-branch.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.2/t/t9601-cvsimport-vendor-branch.sh 2013-03-19 16:56:29.125993925 -0700
+@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9602-cvsimport-branches-tags.sh git-1.8.2/t/t9602-cvsimport-branches-tags.sh
+--- git-1.8.2.orig/t/t9602-cvsimport-branches-tags.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.2/t/t9602-cvsimport-branches-tags.sh 2013-03-19 16:56:29.126993944 -0700
+@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9603-cvsimport-patchsets.sh git-1.8.2/t/t9603-cvsimport-patchsets.sh
+--- git-1.8.2.orig/t/t9603-cvsimport-patchsets.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.2/t/t9603-cvsimport-patchsets.sh 2013-03-19 16:56:29.126993944 -0700
+@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/test-lib.sh git-1.8.2/t/test-lib.sh
+--- git-1.8.2.orig/t/test-lib.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.2/t/test-lib.sh 2013-03-19 16:56:29.126993944 -0700
+@@ -686,6 +686,7 @@
+ 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
diff --git a/dev-vcs/git/files/git-1.8.2-texinfo.patch b/dev-vcs/git/files/git-1.8.2-texinfo.patch
new file mode 100644
index 0000000..b8881d4
--- /dev/null
+++ b/dev-vcs/git/files/git-1.8.2-texinfo.patch
@@ -0,0 +1,19 @@
+Strip anchors to avoid duplicate anchor names. This keeps texinfo 5-x happy.
+
+2013-04-02 Martin von Gagern
+
+References:
+* https://bugs.gentoo.org/464210
+
+Index: git-1.8.1.5/Documentation/cat-texi.perl
+===================================================================
+--- git-1.8.1.5.orig/Documentation/cat-texi.perl
++++ git-1.8.1.5/Documentation/cat-texi.perl
+@@ -12,6 +12,7 @@ while (<STDIN>) {
+ push @menu, $1;
+ }
+ s/\(\@pxref{\[(URLS|REMOTES)\]}\)//;
++ s/\@anchor\{[^{}]*\}//g;
+ print TMP;
+ }
+ close TMP;
diff --git a/dev-vcs/git/files/git-1.8.4-optional-cvs.patch b/dev-vcs/git/files/git-1.8.4-optional-cvs.patch
new file mode 100644
index 0000000..e9ea9d6
--- /dev/null
+++ b/dev-vcs/git/files/git-1.8.4-optional-cvs.patch
@@ -0,0 +1,370 @@
+From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
+From: Robin Johnson <robbat2@gentoo.org>
+Date: Wed, 22 Aug 2012 04:25:06 +0000
+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
+
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/Makefile git-1.8.4/Makefile
+--- git-1.8.4.orig/Makefile 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.4/Makefile 2013-03-19 16:58:52.922806111 -0700
+@@ -266,6 +266,8 @@
+ #
+ # 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'.
+@@ -440,6 +442,7 @@
+ PROGRAM_OBJS =
+ PROGRAMS =
+ SCRIPT_PERL =
++SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -481,13 +484,14 @@
+ 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-remote-testpy.py
+ SCRIPT_PYTHON += git-p4.py
+
+@@ -496,7 +500,7 @@
+
+ # 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))
+@@ -1786,8 +1790,18 @@
+ $(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(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
+
+@@ -1799,7 +1813,7 @@
+ perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
+ $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
+
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE
+ $(QUIET_GEN)$(RM) $@ $@+ && \
+ INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
+ sed -e '1{' \
+@@ -1824,14 +1838,17 @@
+ 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|#!$(SHELL_PATH_SQ)|' \
+ -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
+ unimplemented.sh >$@+ && \
+ chmod +x $@+ && \
+ mv $@+ $@
+-endif # NO_PERL
+
+ ifndef NO_PYTHON
+ $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
+--- git-1.8.4.orig/t/t9200-git-cvsexportcommit.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.4/t/t9200-git-cvsexportcommit.sh 2013-03-19 16:56:29.124993905 -0700
+@@ -12,6 +12,11 @@
+ 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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9400-git-cvsserver-server.sh git-1.8.4/t/t9400-git-cvsserver-server.sh
+--- git-1.8.4.orig/t/t9400-git-cvsserver-server.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.4/t/t9400-git-cvsserver-server.sh 2013-03-19 16:56:29.124993905 -0700
+@@ -11,9 +11,15 @@
+ . ./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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9401-git-cvsserver-crlf.sh git-1.8.4/t/t9401-git-cvsserver-crlf.sh
+--- git-1.8.4.orig/t/t9401-git-cvsserver-crlf.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.4/t/t9401-git-cvsserver-crlf.sh 2013-03-19 16:56:29.125993925 -0700
+@@ -57,15 +57,20 @@
+ 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_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9600-cvsimport.sh git-1.8.4/t/t9600-cvsimport.sh
+--- git-1.8.4.orig/t/t9600-cvsimport.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.4/t/t9600-cvsimport.sh 2013-03-19 16:56:29.125993925 -0700
+@@ -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 @@
+ )
+ '
+
+-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 @@
+ )
+ '
+
+-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 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_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 '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 '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_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 '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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9601-cvsimport-vendor-branch.sh git-1.8.4/t/t9601-cvsimport-vendor-branch.sh
+--- git-1.8.4.orig/t/t9601-cvsimport-vendor-branch.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.4/t/t9601-cvsimport-vendor-branch.sh 2013-03-19 16:56:29.125993925 -0700
+@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9602-cvsimport-branches-tags.sh git-1.8.4/t/t9602-cvsimport-branches-tags.sh
+--- git-1.8.4.orig/t/t9602-cvsimport-branches-tags.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.4/t/t9602-cvsimport-branches-tags.sh 2013-03-19 16:56:29.126993944 -0700
+@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9603-cvsimport-patchsets.sh git-1.8.4/t/t9603-cvsimport-patchsets.sh
+--- git-1.8.4.orig/t/t9603-cvsimport-patchsets.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.4/t/t9603-cvsimport-patchsets.sh 2013-03-19 16:56:29.126993944 -0700
+@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/test-lib.sh git-1.8.4/t/test-lib.sh
+--- git-1.8.4.orig/t/test-lib.sh 2013-03-13 12:15:22.000000000 -0700
++++ git-1.8.4/t/test-lib.sh 2013-03-19 16:56:29.126993944 -0700
+@@ -686,6 +686,7 @@
+ 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
diff --git a/dev-vcs/git/files/git-1.8.5-optional-cvs.patch b/dev-vcs/git/files/git-1.8.5-optional-cvs.patch
new file mode 100644
index 0000000..aef03d8
--- /dev/null
+++ b/dev-vcs/git/files/git-1.8.5-optional-cvs.patch
@@ -0,0 +1,362 @@
+From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
+From: Robin Johnson <robbat2@gentoo.org>
+Date: Wed, 22 Aug 2012 04:25:06 +0000
+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
+
+--- git-1.8.5.1/Makefile
++++ git-1.8.5.1/Makefile
+@@ -263,6 +263,8 @@
+ #
+ # 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'.
+@@ -437,6 +439,7 @@
+ PROGRAM_OBJS =
+ PROGRAMS =
+ SCRIPT_PERL =
++SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -477,20 +480,21 @@
+ 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
+
+ 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))
+@@ -1779,8 +1783,18 @@
+ $(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(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
+
+@@ -1792,7 +1806,7 @@
+ perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
+ $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
+
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE
+ $(QUIET_GEN)$(RM) $@ $@+ && \
+ INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
+ sed -e '1{' \
+@@ -1817,14 +1831,17 @@
+ 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|#!$(SHELL_PATH_SQ)|' \
+ -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
+ unimplemented.sh >$@+ && \
+ chmod +x $@+ && \
+ mv $@+ $@
+-endif # NO_PERL
+
+ ifndef NO_PYTHON
+ $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
+--- git-1.8.5.1/t/t9200-git-cvsexportcommit.sh
++++ git-1.8.5.1/t/t9200-git-cvsexportcommit.sh
+@@ -12,6 +12,11 @@
+ 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
+--- git-1.8.5.1/t/t9400-git-cvsserver-server.sh
++++ git-1.8.5.1/t/t9400-git-cvsserver-server.sh
+@@ -11,9 +11,15 @@
+ . ./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
+--- git-1.8.5.1/t/t9401-git-cvsserver-crlf.sh
++++ git-1.8.5.1/t/t9401-git-cvsserver-crlf.sh
+@@ -57,15 +57,20 @@
+ 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 || {
+--- git-1.8.5.1/t/t9600-cvsimport.sh
++++ git-1.8.5.1/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 @@
+ )
+ '
+
+-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 @@
+ )
+ '
+
+-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 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_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 '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 '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_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 '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
+--- git-1.8.5.1/t/t9601-cvsimport-vendor-branch.sh
++++ git-1.8.5.1/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' '
+--- git-1.8.5.1/t/t9602-cvsimport-branches-tags.sh
++++ git-1.8.5.1/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' '
+--- git-1.8.5.1/t/t9603-cvsimport-patchsets.sh
++++ git-1.8.5.1/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' '
+--- git-1.8.5.1/t/test-lib.sh
++++ git-1.8.5.1/t/test-lib.sh
+@@ -772,6 +772,7 @@
+ 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
diff --git a/dev-vcs/git/files/git-daemon.confd b/dev-vcs/git/files/git-daemon.confd
new file mode 100644
index 0000000..db77de5
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon.confd
@@ -0,0 +1,19 @@
+# conf.d file for git-daemon
+#
+# Please check man 1 git-daemon for more information about the options
+# git-daemon accepts. You MUST edit this to include your repositories you wish
+# to serve.
+#
+# Some of the meaningful options are:
+# --syslog --- Enables syslog logging
+# --verbose --- Enables verbose logging
+# --export-all --- Exports all repositories
+# --port=XXXX --- Starts in port XXXX instead of 9418
+#
+GITDAEMON_OPTS="--syslog --base-path=/var/git"
+
+# To run an anonymous git safely, the following user should be able to only
+# read your Git repositories. It should not able able to write to anywhere on
+# your system, esp. not the repositories.
+GIT_USER="nobody"
+GIT_GROUP="nobody"
diff --git a/dev-vcs/git/files/git-daemon.initd b/dev-vcs/git/files/git-daemon.initd
new file mode 100644
index 0000000..c6ee19f
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon.initd
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon.initd,v 1.1 2010/03/17 15:13:27 sping Exp $
+
+PIDFILE=/var/run/git-daemon.pid
+
+depend() {
+ need net
+ use logger
+}
+
+start() {
+ [ -e /lib/librc.so ] || BL1_COMPAT="--name git-daemon"
+ ebegin "Starting git-daemon"
+ start-stop-daemon --start --quiet --background \
+ --pidfile ${PIDFILE} ${BL1_COMPAT} \
+ --exec /usr/bin/git -- daemon \
+ --pid-file=${PIDFILE} \
+ --user=${GIT_USER} --group=${GIT_GROUP} \
+ ${GITDAEMON_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping git-daemon"
+ start-stop-daemon --stop --quiet \
+ --pidfile ${PIDFILE}
+ eend $?
+}
diff --git a/dev-vcs/git/files/git-daemon.socket b/dev-vcs/git/files/git-daemon.socket
new file mode 100644
index 0000000..3dec01d
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Git Activation Socket
+
+[Socket]
+ListenStream=9418
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/dev-vcs/git/files/git-daemon.xinetd b/dev-vcs/git/files/git-daemon.xinetd
new file mode 100644
index 0000000..02c938d
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon.xinetd
@@ -0,0 +1,13 @@
+service git-daemon
+{
+ disable = yes
+ socket_type = stream
+ wait = no
+ user = nobody
+ type = UNLISTED
+ protocol = tcp
+ log_on_failure += USERID
+ port = 9418
+ server = /usr/bin/git
+ server_args = daemon --inetd --syslog --export-all --base-path=/var/git
+}
diff --git a/dev-vcs/git/files/git-daemon_at.service b/dev-vcs/git/files/git-daemon_at.service
new file mode 100644
index 0000000..2a080d4
--- /dev/null
+++ b/dev-vcs/git/files/git-daemon_at.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Git Repositories Server Daemon
+Documentation=man:git-daemon(1)
+
+[Service]
+User=nobody
+Group=nobody
+EnvironmentFile=/etc/conf.d/git-daemon
+# Ignore non-zero exit status, access error makes git-daemon return them
+ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose $GITDAEMON_OPTS
+StandardInput=socket
+StandardOutput=inherit
+StandardError=journal
diff --git a/dev-vcs/git/git-1.8.1.5-r1.ebuild b/dev-vcs/git/git-1.8.1.5-r1.ebuild
new file mode 100644
index 0000000..bf82e95
--- /dev/null
+++ b/dev-vcs/git/git-1.8.1.5-r1.ebuild
@@ -0,0 +1,600 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5-r1.ebuild,v 1.7 2013/12/11 10:27:22 polynomial-c Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI_SUFFIX="gz"
+ SRC_URI_GOOG="http://git-core.googlecode.com/files"
+ SRC_URI_KORG="mirror://kernel/software/scm/git"
+ SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ doc? (
+ ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ )"
+ KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ SRC_URI=""
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+ dev-libs/openssl
+ sys-libs/zlib
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl[-build(-)] )
+ tk? ( dev-lang/tk )
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ emacs? ( virtual/emacs )
+ gnome-keyring? ( gnome-base/gnome-keyring )"
+
+RDEPEND="${CDEPEND}
+ gpg? ( app-crypt/gnupg )
+ perl? ( dev-perl/Error
+ dev-perl/Net-SMTP-SSL
+ dev-perl/Authen-SASL
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
+ cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+ subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+ )
+ python? ( gtk?
+ (
+ >=dev-python/pygtk-2.8
+ dev-python/pygtksourceview:2
+ ) )"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+ app-arch/cpio
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ sys-apps/texinfo
+ app-text/xmlto
+ )
+ test? (
+ app-crypt/gnupg
+ )"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ cgi? ( perl )
+ cvs? ( perl )
+ subversion? ( perl )
+ webdav? ( curl )
+"
+
+pkg_setup() {
+ if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+ ewarn "have been warned."
+ fi
+ if use python ; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+ local myopts
+
+ if use blksha1 ; then
+ myopts="${myopts} BLK_SHA1=YesPlease"
+ elif use ppcsha1 ; then
+ myopts="${myopts} PPC_SHA1=YesPlease"
+ fi
+
+ if use curl ; then
+ use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ else
+ myopts="${myopts} NO_CURL=YesPlease"
+ fi
+
+ # broken assumptions, because of broken build system ...
+ myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts="${myopts} INSTALL=install TAR=tar"
+ myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts="${myopts} SANE_TOOL_PATH="
+ myopts="${myopts} OLD_ICONV="
+ myopts="${myopts} NO_EXTERNAL_GREP="
+
+ # can't define this to null, since the entire makefile depends on it
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+ use iconv \
+ || myopts="${myopts} NO_ICONV=YesPlease"
+ use nls \
+ || myopts="${myopts} NO_GETTEXT=YesPlease"
+ use tk \
+ || myopts="${myopts} NO_TCLTK=YesPlease"
+ use pcre \
+ && myopts="${myopts} USE_LIBPCRE=yes"
+ use perl \
+ && myopts="${myopts} INSTALLDIRS=vendor" \
+ || myopts="${myopts} NO_PERL=YesPlease"
+ use python \
+ || myopts="${myopts} NO_PYTHON=YesPlease"
+ use subversion \
+ || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+ use threads \
+ && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+ use cvs \
+ || myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+# if [[ ${CHOST} == *-mint* ]] ; then
+# myopts="${myopts} NO_MMAP=YesPlease"
+# myopts="${myopts} NO_IPV6=YesPlease"
+# myopts="${myopts} NO_STRLCPY=YesPlease"
+# myopts="${myopts} NO_MEMMEM=YesPlease"
+# myopts="${myopts} NO_MKDTEMP=YesPlease"
+# myopts="${myopts} NO_MKSTEMPS=YesPlease"
+# fi
+ if [[ ${CHOST} == ia64-*-hpux* ]]; then
+ myopts="${myopts} NO_NSEC=YesPlease"
+ fi
+ if [[ ${CHOST} == *-*-aix* ]]; then
+ myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+ fi
+ if [[ ${CHOST} == *-solaris* ]]; then
+ myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+ fi
+
+ has_version '>=app-text/asciidoc-8.0' \
+ && myopts="${myopts} ASCIIDOC8=YesPlease"
+ myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+ # Bug 290465:
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+ [[ "${CHOST}" == *-uclibc* ]] && \
+ myopts="${myopts} NO_NSEC=YesPlease"
+
+ export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ use doc && \
+ cd "${S}"/Documentation && \
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ else
+ git-2_src_unpack
+ cd "${S}"
+ #cp "${FILESDIR}"/GIT-VERSION-GEN .
+ fi
+
+}
+
+src_prepare() {
+ # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern,
+ # funded as a bounty by the Gentoo Foundation. Merged upstream in 1.8.0.
+ #epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
+
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch
+
+ sed -i \
+ -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+ -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+ -e 's:^\(CC = \).*$:\1$(OPTCC):' \
+ -e 's:^\(AR = \).*$:\1$(OPTAR):' \
+ -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+ -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+ Makefile || die "sed failed"
+
+ # Never install the private copy of Error.pm (bug #296310)
+ sed -i \
+ -e '/private-Error.pm/s,^,#,' \
+ perl/Makefile.PL
+
+ # Fix docbook2texi command
+ sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+ Documentation/Makefile || die "sed failed"
+
+ # Fix git-subtree missing DESTDIR
+ sed -i \
+ -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+ -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
+ contrib/subtree/Makefile
+}
+
+git_emake() {
+ # bug #326625: PERL_PATH, PERL_MM_OPT
+ # bug #320647: PYTHON_PATH
+ PYTHON_PATH=""
+ use python && PYTHON_PATH="$(PYTHON -a)"
+ emake ${MY_MAKEOPTS} \
+ DESTDIR="${D}" \
+ OPTCFLAGS="${CFLAGS}" \
+ OPTLDFLAGS="${LDFLAGS}" \
+ OPTCC="$(tc-getCC)" \
+ OPTAR="$(tc-getAR)" \
+ prefix="${EPREFIX}"/usr \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ sysconfdir="${EPREFIX}"/etc \
+ PYTHON_PATH="${PYTHON_PATH}" \
+ PERL_MM_OPT="" \
+ GIT_TEST_OPTS="--no-color" \
+ "$@"
+ # This is the fix for bug #326625, but it also causes breakage, see bug
+ # #352693.
+ # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+ exportmakeopts
+}
+
+src_compile() {
+ if use perl ; then
+ git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+ git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+ fi
+ git_emake || die "emake failed"
+
+ if use emacs ; then
+ elisp-compile contrib/emacs/git{,-blame}.el \
+ || die "emacs modules failed"
+ fi
+
+ if use perl && use cgi ; then
+ git_emake \
+ gitweb/gitweb.cgi \
+ || die "emake gitweb/gitweb.cgi failed"
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+ git_emake || die "emake credential-osxkeychain"
+ fi
+
+ cd "${S}"/Documentation
+ if [[ ${PV} == *9999 ]] ; then
+ git_emake man \
+ || die "emake man failed"
+ if use doc ; then
+ git_emake info html \
+ || die "emake info html failed"
+ fi
+ else
+ if use doc ; then
+ git_emake info \
+ || die "emake info html failed"
+ fi
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ git_emake || die "emake svn-fe failed"
+ if use doc ; then
+ git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+ fi
+ cd "${S}"
+ fi
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ git_emake || die "emake git-credential-gnome-keyring failed"
+ fi
+
+ cd "${S}"/contrib/subtree
+ git_emake
+ use doc && git_emake doc
+}
+
+src_install() {
+ git_emake \
+ install || \
+ die "make install failed"
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+ fi
+
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+ dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ use doc && dodir /usr/share/doc/${PF}/html
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ use doc && dohtml -p ${d} Documentation${d}*.html
+ done
+ docinto /
+ # Upstream does not ship this pre-built :-(
+ use doc && doinfo Documentation/{git,gitman}.info
+
+ newbashcomp contrib/completion/git-completion.bash ${PN}
+ newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
+
+ if use emacs ; then
+ elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+ # don't add automatically to the load-path, so the sitefile
+ # can do a conditional loading
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+ fi
+
+ if use python && use gtk ; then
+ dobin "${S}"/contrib/gitview/gitview
+ python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
+ dodoc "${S}"/contrib/gitview/gitview.txt
+ fi
+
+ #dobin contrib/fast-import/git-p4 # Moved upstream
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream
+ newbin contrib/fast-import/import-tars.perl import-tars
+ newbin contrib/git-resurrect.sh git-resurrect
+
+ # git-subtree
+ cd "${S}"/contrib/subtree
+ git_emake install || die "Failed to emake install git-subtree"
+ if use doc ; then
+ git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+ fi
+ newdoc README README.git-subtree
+ dodoc git-subtree.txt
+ cd "${S}"
+
+ # git-diffall
+ dobin contrib/diffall/git-diffall
+ newdoc contrib/diffall/README git-diffall.txt
+
+ # diff-highlight
+ dobin contrib/diff-highlight/diff-highlight
+ newdoc contrib/diff-highlight/README README.diff-highlight
+
+ # git-jump
+ dobin contrib/git-jump/git-jump
+ newdoc contrib/git-jump/README git-jump.txt
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ dobin git-credential-gnome-keyring
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ dobin svn-fe
+ dodoc svn-fe.txt
+ use doc && doman svn-fe.1 && dohtml svn-fe.html
+ cd "${S}"
+ fi
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # completion - installed above
+ # credential/gnome-keyring TODO
+ # diff-highlight - done above
+ # diffall - done above
+ # emacs - installed above
+ # examples - these are stuff that is not used in Git anymore actually
+ # git-jump - done above
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
+ # patches - stuff the Git guys made to go upstream to other places
+ # persistent-https - TODO
+ # mw-to-git - TODO
+ # subtree - build seperately
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ for i in \
+ blameview buildsystems ciabot continuous convert-objects fast-import \
+ hg-to-git hooks remotes2config.sh rerere-train.sh \
+ stats vim workdir \
+ ; do
+ cp -rf \
+ "${S}"/contrib/${i} \
+ "${ED}"/usr/share/${PN}/contrib \
+ || die "Failed contrib ${i}"
+ done
+
+ if use perl && use cgi ; then
+ # We used to install in /usr/share/${PN}/gitweb
+ # but upstream installs in /usr/share/gitweb
+ # so we will install a symlink and use their location for compat with other
+ # distros
+ dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+ # INSTALL discusses configuration issues, not just installation
+ docinto /
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
+ newdoc "${S}"/gitweb/README README.gitweb
+
+ find "${ED}"/usr/lib64/perl5/ \
+ -name .packlist \
+ -exec rm \{\} \;
+ else
+ rm -rf "${ED}"/usr/share/gitweb
+ fi
+
+ if ! use subversion ; then
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ if use !prefix ; then
+ newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+ systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+ systemd_dounit "${FILESDIR}/git-daemon.socket"
+ fi
+
+ fixlocalpod
+}
+
+src_test() {
+ local disabled=""
+ local tests_cvs="t9200-git-cvsexportcommit.sh \
+ t9400-git-cvsserver-server.sh \
+ t9401-git-cvsserver-crlf.sh \
+ t9600-cvsimport.sh \
+ t9601-cvsimport-vendor-branch.sh \
+ t9602-cvsimport-branches-tags.sh \
+ t9603-cvsimport-patchsets.sh \
+ t9604-cvsimport-timestamps.sh"
+ local tests_perl="t5502-quickfetch.sh \
+ t5512-ls-remote.sh \
+ t5520-pull.sh"
+ # Bug #225601 - t0004 is not suitable for root perm
+ # Bug #219839 - t1004 is not suitable for root perm
+ # t0001-init.sh - check for init notices EPERM* fails
+ local tests_nonroot="t0001-init.sh \
+ t0004-unwritable.sh \
+ t0070-fundamental.sh \
+ t1004-read-tree-m-u-wf.sh \
+ t3700-add.sh \
+ t7300-clean.sh"
+ # t9100 still fails with symlinks in SVN 1.7
+ local test_svn="t9100-git-svn-basic.sh"
+
+ # Unzip is used only for the testcase code, not by any normal parts of Git.
+ if ! has_version app-arch/unzip ; then
+ einfo "Disabling tar-tree tests"
+ disabled="${disabled} t5000-tar-tree.sh"
+ fi
+
+ cvs=0
+ use cvs && let cvs=$cvs+1
+ if [[ ${EUID} -eq 0 ]]; then
+ if [[ $cvs -eq 1 ]]; then
+ ewarn "Skipping CVS tests because CVS does not work as root!"
+ ewarn "You should retest with FEATURES=userpriv!"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ einfo "Skipping other tests that require being non-root"
+ disabled="${disabled} ${tests_nonroot}"
+ else
+ [[ $cvs -gt 0 ]] && \
+ has_version dev-vcs/cvs && \
+ let cvs=$cvs+1
+ [[ $cvs -gt 1 ]] && \
+ built_with_use dev-vcs/cvs server && \
+ let cvs=$cvs+1
+ if [[ $cvs -lt 3 ]]; then
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ fi
+
+ if ! use perl ; then
+ einfo "Disabling tests that need Perl"
+ disabled="${disabled} ${tests_perl}"
+ fi
+
+ einfo "Disabling tests that fail with SVN 1.7"
+ disabled="${disabled} ${test_svn}"
+
+ # Reset all previously disabled tests
+ cd "${S}/t"
+ for i in *.sh.DISABLED ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+ done
+ einfo "Disabled tests:"
+ for i in ${disabled} ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+ done
+
+ # Avoid the test system removing the results because we want them ourselves
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+ -i "${S}"/t/Makefile
+
+ # Clean old results first, must always run
+ cd "${S}/t"
+ nonfatal git_emake clean
+
+ # Now run the tests, keep going if we hit an error, and don't terminate on
+ # failure
+ cd "${S}"
+ einfo "Start test run"
+ #MAKEOPTS=-j1
+ nonfatal git_emake --keep-going test
+ rc=$?
+
+ # Display nice results, now print the results
+ cd "${S}/t"
+ nonfatal git_emake aggregate-results
+
+ # And bail if there was a problem
+ [ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+ local pkg=$1
+ shift
+ elog " $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ use python && python_mod_optimize git_remote_helpers
+ einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+ einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
+ einfo "Note that the prompt bash code is now in the seperate script"
+ elog "These additional scripts need some dependencies:"
+ echo
+ showpkgdeps git-quiltimport "dev-util/quilt"
+ showpkgdeps git-instaweb \
+ "|| ( www-servers/lighttpd www-servers/apache )"
+ echo
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ use python && python_mod_cleanup git_remote_helpers
+}
diff --git a/dev-vcs/git/git-1.8.1.5.ebuild b/dev-vcs/git/git-1.8.1.5.ebuild
new file mode 100644
index 0000000..d2c9592
--- /dev/null
+++ b/dev-vcs/git/git-1.8.1.5.ebuild
@@ -0,0 +1,598 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5.ebuild,v 1.14 2013/12/11 10:27:22 polynomial-c Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI_SUFFIX="gz"
+ SRC_URI_GOOG="http://git-core.googlecode.com/files"
+ SRC_URI_KORG="mirror://kernel/software/scm/git"
+ SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ doc? (
+ ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ )"
+ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ SRC_URI=""
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+ dev-libs/openssl
+ sys-libs/zlib
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl[-build(-)] )
+ tk? ( dev-lang/tk )
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ emacs? ( virtual/emacs )
+ gnome-keyring? ( gnome-base/gnome-keyring )"
+
+RDEPEND="${CDEPEND}
+ gpg? ( app-crypt/gnupg )
+ perl? ( dev-perl/Error
+ dev-perl/Net-SMTP-SSL
+ dev-perl/Authen-SASL
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
+ cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+ subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+ )
+ python? ( gtk?
+ (
+ >=dev-python/pygtk-2.8
+ dev-python/pygtksourceview:2
+ ) )"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+ app-arch/cpio
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ sys-apps/texinfo
+ app-text/xmlto
+ )
+ test? (
+ app-crypt/gnupg
+ )"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ cgi? ( perl )
+ cvs? ( perl )
+ subversion? ( perl )
+ webdav? ( curl )
+"
+
+pkg_setup() {
+ if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+ ewarn "have been warned."
+ fi
+ if use python ; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+ local myopts
+
+ if use blksha1 ; then
+ myopts="${myopts} BLK_SHA1=YesPlease"
+ elif use ppcsha1 ; then
+ myopts="${myopts} PPC_SHA1=YesPlease"
+ fi
+
+ if use curl ; then
+ use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ else
+ myopts="${myopts} NO_CURL=YesPlease"
+ fi
+
+ # broken assumptions, because of broken build system ...
+ myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts="${myopts} INSTALL=install TAR=tar"
+ myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts="${myopts} SANE_TOOL_PATH="
+ myopts="${myopts} OLD_ICONV="
+ myopts="${myopts} NO_EXTERNAL_GREP="
+
+ # can't define this to null, since the entire makefile depends on it
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+ use iconv \
+ || myopts="${myopts} NO_ICONV=YesPlease"
+ use nls \
+ || myopts="${myopts} NO_GETTEXT=YesPlease"
+ use tk \
+ || myopts="${myopts} NO_TCLTK=YesPlease"
+ use pcre \
+ && myopts="${myopts} USE_LIBPCRE=yes"
+ use perl \
+ && myopts="${myopts} INSTALLDIRS=vendor" \
+ || myopts="${myopts} NO_PERL=YesPlease"
+ use python \
+ || myopts="${myopts} NO_PYTHON=YesPlease"
+ use subversion \
+ || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+ use threads \
+ && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+ use cvs \
+ || myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+# if [[ ${CHOST} == *-mint* ]] ; then
+# myopts="${myopts} NO_MMAP=YesPlease"
+# myopts="${myopts} NO_IPV6=YesPlease"
+# myopts="${myopts} NO_STRLCPY=YesPlease"
+# myopts="${myopts} NO_MEMMEM=YesPlease"
+# myopts="${myopts} NO_MKDTEMP=YesPlease"
+# myopts="${myopts} NO_MKSTEMPS=YesPlease"
+# fi
+ if [[ ${CHOST} == ia64-*-hpux* ]]; then
+ myopts="${myopts} NO_NSEC=YesPlease"
+ fi
+ if [[ ${CHOST} == *-*-aix* ]]; then
+ myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+ fi
+ if [[ ${CHOST} == *-solaris* ]]; then
+ myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+ fi
+
+ has_version '>=app-text/asciidoc-8.0' \
+ && myopts="${myopts} ASCIIDOC8=YesPlease"
+ myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+ # Bug 290465:
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+ [[ "${CHOST}" == *-uclibc* ]] && \
+ myopts="${myopts} NO_NSEC=YesPlease"
+
+ export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ use doc && \
+ cd "${S}"/Documentation && \
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ else
+ git-2_src_unpack
+ cd "${S}"
+ #cp "${FILESDIR}"/GIT-VERSION-GEN .
+ fi
+
+}
+
+src_prepare() {
+ # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern,
+ # funded as a bounty by the Gentoo Foundation. Merged upstream in 1.8.0.
+ #epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
+
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch
+
+ sed -i \
+ -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+ -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+ -e 's:^\(CC = \).*$:\1$(OPTCC):' \
+ -e 's:^\(AR = \).*$:\1$(OPTAR):' \
+ -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+ -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+ Makefile || die "sed failed"
+
+ # Never install the private copy of Error.pm (bug #296310)
+ sed -i \
+ -e '/private-Error.pm/s,^,#,' \
+ perl/Makefile.PL
+
+ # Fix docbook2texi command
+ sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+ Documentation/Makefile || die "sed failed"
+
+ # Fix git-subtree missing DESTDIR
+ sed -i \
+ -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+ -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
+ contrib/subtree/Makefile
+}
+
+git_emake() {
+ # bug #326625: PERL_PATH, PERL_MM_OPT
+ # bug #320647: PYTHON_PATH
+ PYTHON_PATH=""
+ use python && PYTHON_PATH="$(PYTHON -a)"
+ emake ${MY_MAKEOPTS} \
+ DESTDIR="${D}" \
+ OPTCFLAGS="${CFLAGS}" \
+ OPTLDFLAGS="${LDFLAGS}" \
+ OPTCC="$(tc-getCC)" \
+ OPTAR="$(tc-getAR)" \
+ prefix="${EPREFIX}"/usr \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ sysconfdir="${EPREFIX}"/etc \
+ PYTHON_PATH="${PYTHON_PATH}" \
+ PERL_MM_OPT="" \
+ GIT_TEST_OPTS="--no-color" \
+ "$@"
+ # This is the fix for bug #326625, but it also causes breakage, see bug
+ # #352693.
+ # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+ exportmakeopts
+}
+
+src_compile() {
+ if use perl ; then
+ git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+ git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+ fi
+ git_emake || die "emake failed"
+
+ if use emacs ; then
+ elisp-compile contrib/emacs/git{,-blame}.el \
+ || die "emacs modules failed"
+ fi
+
+ if use perl && use cgi ; then
+ git_emake \
+ gitweb/gitweb.cgi \
+ || die "emake gitweb/gitweb.cgi failed"
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+ git_emake || die "emake credential-osxkeychain"
+ fi
+
+ cd "${S}"/Documentation
+ if [[ ${PV} == *9999 ]] ; then
+ git_emake man \
+ || die "emake man failed"
+ if use doc ; then
+ git_emake info html \
+ || die "emake info html failed"
+ fi
+ else
+ if use doc ; then
+ git_emake info \
+ || die "emake info html failed"
+ fi
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ git_emake || die "emake svn-fe failed"
+ if use doc ; then
+ git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+ fi
+ cd "${S}"
+ fi
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ git_emake || die "emake git-credential-gnome-keyring failed"
+ fi
+
+ cd "${S}"/contrib/subtree
+ git_emake
+ use doc && git_emake doc
+}
+
+src_install() {
+ git_emake \
+ install || \
+ die "make install failed"
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+ fi
+
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+ dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ use doc && dodir /usr/share/doc/${PF}/html
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ use doc && dohtml -p ${d} Documentation${d}*.html
+ done
+ docinto /
+ # Upstream does not ship this pre-built :-(
+ use doc && doinfo Documentation/{git,gitman}.info
+
+ newbashcomp contrib/completion/git-completion.bash ${PN}
+ newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
+
+ if use emacs ; then
+ elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+ # don't add automatically to the load-path, so the sitefile
+ # can do a conditional loading
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+ fi
+
+ if use python && use gtk ; then
+ dobin "${S}"/contrib/gitview/gitview
+ python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
+ dodoc "${S}"/contrib/gitview/gitview.txt
+ fi
+
+ #dobin contrib/fast-import/git-p4 # Moved upstream
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream
+ newbin contrib/fast-import/import-tars.perl import-tars
+ newbin contrib/git-resurrect.sh git-resurrect
+
+ # git-subtree
+ cd "${S}"/contrib/subtree
+ git_emake install || die "Failed to emake install git-subtree"
+ if use doc ; then
+ git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+ fi
+ newdoc README README.git-subtree
+ dodoc git-subtree.txt
+ cd "${S}"
+
+ # git-diffall
+ dobin contrib/diffall/git-diffall
+ newdoc contrib/diffall/README git-diffall.txt
+
+ # diff-highlight
+ dobin contrib/diff-highlight/diff-highlight
+ newdoc contrib/diff-highlight/README README.diff-highlight
+
+ # git-jump
+ dobin contrib/git-jump/git-jump
+ newdoc contrib/git-jump/README git-jump.txt
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ dobin git-credential-gnome-keyring
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ dobin svn-fe
+ dodoc svn-fe.txt
+ use doc && doman svn-fe.1 && dohtml svn-fe.html
+ cd "${S}"
+ fi
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # completion - installed above
+ # credential/gnome-keyring TODO
+ # diff-highlight - done above
+ # diffall - done above
+ # emacs - installed above
+ # examples - these are stuff that is not used in Git anymore actually
+ # git-jump - done above
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
+ # patches - stuff the Git guys made to go upstream to other places
+ # persistent-https - TODO
+ # mw-to-git - TODO
+ # subtree - build seperately
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ for i in \
+ blameview buildsystems ciabot continuous convert-objects fast-import \
+ hg-to-git hooks remotes2config.sh rerere-train.sh \
+ stats vim workdir \
+ ; do
+ cp -rf \
+ "${S}"/contrib/${i} \
+ "${ED}"/usr/share/${PN}/contrib \
+ || die "Failed contrib ${i}"
+ done
+
+ if use perl && use cgi ; then
+ # We used to install in /usr/share/${PN}/gitweb
+ # but upstream installs in /usr/share/gitweb
+ # so we will install a symlink and use their location for compat with other
+ # distros
+ dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+ # INSTALL discusses configuration issues, not just installation
+ docinto /
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
+ newdoc "${S}"/gitweb/README README.gitweb
+
+ find "${ED}"/usr/lib64/perl5/ \
+ -name .packlist \
+ -exec rm \{\} \;
+ else
+ rm -rf "${ED}"/usr/share/gitweb
+ fi
+
+ if ! use subversion ; then
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ if use !prefix ; then
+ newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+ fi
+
+ fixlocalpod
+}
+
+src_test() {
+ local disabled=""
+ local tests_cvs="t9200-git-cvsexportcommit.sh \
+ t9400-git-cvsserver-server.sh \
+ t9401-git-cvsserver-crlf.sh \
+ t9600-cvsimport.sh \
+ t9601-cvsimport-vendor-branch.sh \
+ t9602-cvsimport-branches-tags.sh \
+ t9603-cvsimport-patchsets.sh \
+ t9604-cvsimport-timestamps.sh"
+ local tests_perl="t5502-quickfetch.sh \
+ t5512-ls-remote.sh \
+ t5520-pull.sh"
+ # Bug #225601 - t0004 is not suitable for root perm
+ # Bug #219839 - t1004 is not suitable for root perm
+ # t0001-init.sh - check for init notices EPERM* fails
+ local tests_nonroot="t0001-init.sh \
+ t0004-unwritable.sh \
+ t0070-fundamental.sh \
+ t1004-read-tree-m-u-wf.sh \
+ t3700-add.sh \
+ t7300-clean.sh"
+ # t9100 still fails with symlinks in SVN 1.7
+ local test_svn="t9100-git-svn-basic.sh"
+
+ # Unzip is used only for the testcase code, not by any normal parts of Git.
+ if ! has_version app-arch/unzip ; then
+ einfo "Disabling tar-tree tests"
+ disabled="${disabled} t5000-tar-tree.sh"
+ fi
+
+ cvs=0
+ use cvs && let cvs=$cvs+1
+ if [[ ${EUID} -eq 0 ]]; then
+ if [[ $cvs -eq 1 ]]; then
+ ewarn "Skipping CVS tests because CVS does not work as root!"
+ ewarn "You should retest with FEATURES=userpriv!"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ einfo "Skipping other tests that require being non-root"
+ disabled="${disabled} ${tests_nonroot}"
+ else
+ [[ $cvs -gt 0 ]] && \
+ has_version dev-vcs/cvs && \
+ let cvs=$cvs+1
+ [[ $cvs -gt 1 ]] && \
+ built_with_use dev-vcs/cvs server && \
+ let cvs=$cvs+1
+ if [[ $cvs -lt 3 ]]; then
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ fi
+
+ if ! use perl ; then
+ einfo "Disabling tests that need Perl"
+ disabled="${disabled} ${tests_perl}"
+ fi
+
+ einfo "Disabling tests that fail with SVN 1.7"
+ disabled="${disabled} ${test_svn}"
+
+ # Reset all previously disabled tests
+ cd "${S}/t"
+ for i in *.sh.DISABLED ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+ done
+ einfo "Disabled tests:"
+ for i in ${disabled} ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+ done
+
+ # Avoid the test system removing the results because we want them ourselves
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+ -i "${S}"/t/Makefile
+
+ # Clean old results first, must always run
+ cd "${S}/t"
+ nonfatal git_emake clean
+
+ # Now run the tests, keep going if we hit an error, and don't terminate on
+ # failure
+ cd "${S}"
+ einfo "Start test run"
+ #MAKEOPTS=-j1
+ nonfatal git_emake --keep-going test
+ rc=$?
+
+ # Display nice results, now print the results
+ cd "${S}/t"
+ nonfatal git_emake aggregate-results
+
+ # And bail if there was a problem
+ [ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+ local pkg=$1
+ shift
+ elog " $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ use python && python_mod_optimize git_remote_helpers
+ einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+ einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
+ einfo "Note that the prompt bash code is now in the seperate script"
+ elog "These additional scripts need some dependencies:"
+ echo
+ showpkgdeps git-quiltimport "dev-util/quilt"
+ showpkgdeps git-instaweb \
+ "|| ( www-servers/lighttpd www-servers/apache )"
+ echo
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ use python && python_mod_cleanup git_remote_helpers
+}
diff --git a/dev-vcs/git/git-1.8.2.1.ebuild b/dev-vcs/git/git-1.8.2.1.ebuild
new file mode 100644
index 0000000..532b1b9
--- /dev/null
+++ b/dev-vcs/git/git-1.8.2.1.ebuild
@@ -0,0 +1,610 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.2.1.ebuild,v 1.6 2013/12/11 10:27:22 polynomial-c Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI_SUFFIX="gz"
+ SRC_URI_GOOG="http://git-core.googlecode.com/files"
+ SRC_URI_KORG="mirror://kernel/software/scm/git"
+ SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ doc? (
+ ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ )"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ SRC_URI=""
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+ dev-libs/openssl
+ sys-libs/zlib
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl[-build(-)] )
+ tk? ( dev-lang/tk )
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ emacs? ( virtual/emacs )
+ gnome-keyring? ( gnome-base/gnome-keyring )"
+
+RDEPEND="${CDEPEND}
+ gpg? ( app-crypt/gnupg )
+ perl? ( dev-perl/Error
+ dev-perl/Net-SMTP-SSL
+ dev-perl/Authen-SASL
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
+ cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+ subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+ )
+ python? ( gtk?
+ (
+ >=dev-python/pygtk-2.8
+ dev-python/pygtksourceview:2
+ ) )"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+ app-arch/cpio
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ sys-apps/texinfo
+ app-text/xmlto
+ )
+ test? (
+ app-crypt/gnupg
+ )"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ cgi? ( perl )
+ cvs? ( perl )
+ subversion? ( perl )
+ webdav? ( curl )
+"
+
+pkg_setup() {
+ if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+ ewarn "have been warned."
+ fi
+ if use python ; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+ local myopts
+
+ if use blksha1 ; then
+ myopts="${myopts} BLK_SHA1=YesPlease"
+ elif use ppcsha1 ; then
+ myopts="${myopts} PPC_SHA1=YesPlease"
+ fi
+
+ if use curl ; then
+ use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ else
+ myopts="${myopts} NO_CURL=YesPlease"
+ fi
+
+ # broken assumptions, because of broken build system ...
+ myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts="${myopts} INSTALL=install TAR=tar"
+ myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts="${myopts} SANE_TOOL_PATH="
+ myopts="${myopts} OLD_ICONV="
+ myopts="${myopts} NO_EXTERNAL_GREP="
+
+ # For svn-fe
+ extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+ # can't define this to null, since the entire makefile depends on it
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+ use iconv \
+ || myopts="${myopts} NO_ICONV=YesPlease"
+ use nls \
+ || myopts="${myopts} NO_GETTEXT=YesPlease"
+ use tk \
+ || myopts="${myopts} NO_TCLTK=YesPlease"
+ use pcre \
+ && myopts="${myopts} USE_LIBPCRE=yes" \
+ && extlibs="${extlibs} -lpcre"
+ use perl \
+ && myopts="${myopts} INSTALLDIRS=vendor" \
+ || myopts="${myopts} NO_PERL=YesPlease"
+ use python \
+ || myopts="${myopts} NO_PYTHON=YesPlease"
+ use subversion \
+ || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+ use threads \
+ && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+ use cvs \
+ || myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+# if [[ ${CHOST} == *-mint* ]] ; then
+# myopts="${myopts} NO_MMAP=YesPlease"
+# myopts="${myopts} NO_IPV6=YesPlease"
+# myopts="${myopts} NO_STRLCPY=YesPlease"
+# myopts="${myopts} NO_MEMMEM=YesPlease"
+# myopts="${myopts} NO_MKDTEMP=YesPlease"
+# myopts="${myopts} NO_MKSTEMPS=YesPlease"
+# fi
+ if [[ ${CHOST} == ia64-*-hpux* ]]; then
+ myopts="${myopts} NO_NSEC=YesPlease"
+ fi
+ if [[ ${CHOST} == *-*-aix* ]]; then
+ myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+ fi
+ if [[ ${CHOST} == *-solaris* ]]; then
+ myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+ fi
+
+ has_version '>=app-text/asciidoc-8.0' \
+ && myopts="${myopts} ASCIIDOC8=YesPlease"
+ myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+ # Bug 290465:
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+ [[ "${CHOST}" == *-uclibc* ]] && \
+ myopts="${myopts} NO_NSEC=YesPlease"
+
+ export MY_MAKEOPTS="${myopts}"
+ export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ use doc && \
+ cd "${S}"/Documentation && \
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ else
+ git-2_src_unpack
+ cd "${S}"
+ #cp "${FILESDIR}"/GIT-VERSION-GEN .
+ fi
+
+}
+
+src_prepare() {
+ # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern,
+ # funded as a bounty by the Gentoo Foundation. Merged upstream in 1.8.0.
+ #epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
+
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ epatch "${FILESDIR}"/git-1.8.2-optional-cvs.patch
+
+ # bug #464210 - texinfo anchors
+ epatch "${FILESDIR}"/git-1.8.2-texinfo.patch
+
+ sed -i \
+ -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+ -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+ -e 's:^\(CC = \).*$:\1$(OPTCC):' \
+ -e 's:^\(AR = \).*$:\1$(OPTAR):' \
+ -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+ -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+ Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+ # Never install the private copy of Error.pm (bug #296310)
+ sed -i \
+ -e '/private-Error.pm/s,^,#,' \
+ perl/Makefile.PL
+
+ # Fix docbook2texi command
+ sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+ Documentation/Makefile || die "sed failed"
+
+ # Fix git-subtree missing DESTDIR
+ sed -i \
+ -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+ -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
+ contrib/subtree/Makefile
+}
+
+git_emake() {
+ # bug #326625: PERL_PATH, PERL_MM_OPT
+ # bug #320647: PYTHON_PATH
+ PYTHON_PATH=""
+ use python && PYTHON_PATH="$(PYTHON -a)"
+ emake ${MY_MAKEOPTS} \
+ DESTDIR="${D}" \
+ OPTCFLAGS="${CFLAGS}" \
+ OPTLDFLAGS="${LDFLAGS}" \
+ OPTCC="$(tc-getCC)" \
+ OPTAR="$(tc-getAR)" \
+ prefix="${EPREFIX}"/usr \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ sysconfdir="${EPREFIX}"/etc \
+ PYTHON_PATH="${PYTHON_PATH}" \
+ PERL_MM_OPT="" \
+ GIT_TEST_OPTS="--no-color" \
+ V=1 \
+ "$@"
+ # This is the fix for bug #326625, but it also causes breakage, see bug
+ # #352693.
+ # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+ exportmakeopts
+}
+
+src_compile() {
+ if use perl ; then
+ git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+ git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+ fi
+ git_emake || die "emake failed"
+
+ if use emacs ; then
+ elisp-compile contrib/emacs/git{,-blame}.el \
+ || die "emacs modules failed"
+ fi
+
+ if use perl && use cgi ; then
+ git_emake \
+ gitweb/gitweb.cgi \
+ || die "emake gitweb/gitweb.cgi failed"
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+ git_emake || die "emake credential-osxkeychain"
+ fi
+
+ cd "${S}"/Documentation
+ if [[ ${PV} == *9999 ]] ; then
+ git_emake man \
+ || die "emake man failed"
+ if use doc ; then
+ git_emake info html \
+ || die "emake info html failed"
+ fi
+ else
+ if use doc ; then
+ git_emake info \
+ || die "emake info html failed"
+ fi
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+ if use doc ; then
+ git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+ fi
+ cd "${S}"
+ fi
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ git_emake || die "emake git-credential-gnome-keyring failed"
+ fi
+
+ cd "${S}"/contrib/subtree
+ git_emake
+ use doc && git_emake doc
+}
+
+src_install() {
+ git_emake \
+ install || \
+ die "make install failed"
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+ fi
+
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+ dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ use doc && dodir /usr/share/doc/${PF}/html
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ use doc && dohtml -p ${d} Documentation${d}*.html
+ done
+ docinto /
+ # Upstream does not ship this pre-built :-(
+ use doc && doinfo Documentation/{git,gitman}.info
+
+ newbashcomp contrib/completion/git-completion.bash ${PN}
+ newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
+
+ if use emacs ; then
+ elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+ # don't add automatically to the load-path, so the sitefile
+ # can do a conditional loading
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+ fi
+
+ if use python && use gtk ; then
+ dobin "${S}"/contrib/gitview/gitview
+ python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
+ dodoc "${S}"/contrib/gitview/gitview.txt
+ fi
+
+ #dobin contrib/fast-import/git-p4 # Moved upstream
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream
+ newbin contrib/fast-import/import-tars.perl import-tars
+ newbin contrib/git-resurrect.sh git-resurrect
+
+ # git-subtree
+ cd "${S}"/contrib/subtree
+ git_emake install || die "Failed to emake install git-subtree"
+ if use doc ; then
+ git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+ fi
+ newdoc README README.git-subtree
+ dodoc git-subtree.txt
+ cd "${S}"
+
+ # git-diffall
+ dobin contrib/diffall/git-diffall
+ newdoc contrib/diffall/README git-diffall.txt
+
+ # diff-highlight
+ dobin contrib/diff-highlight/diff-highlight
+ newdoc contrib/diff-highlight/README README.diff-highlight
+
+ # git-jump
+ dobin contrib/git-jump/git-jump
+ newdoc contrib/git-jump/README git-jump.txt
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ dobin git-credential-gnome-keyring
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ dobin svn-fe
+ dodoc svn-fe.txt
+ use doc && doman svn-fe.1 && dohtml svn-fe.html
+ cd "${S}"
+ fi
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # completion - installed above
+ # credential/gnome-keyring TODO
+ # diff-highlight - done above
+ # diffall - done above
+ # emacs - installed above
+ # examples - these are stuff that is not used in Git anymore actually
+ # git-jump - done above
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
+ # patches - stuff the Git guys made to go upstream to other places
+ # persistent-https - TODO
+ # mw-to-git - TODO
+ # subtree - build seperately
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ for i in \
+ blameview buildsystems ciabot continuous convert-objects fast-import \
+ hg-to-git hooks remotes2config.sh rerere-train.sh \
+ stats vim workdir \
+ ; do
+ cp -rf \
+ "${S}"/contrib/${i} \
+ "${ED}"/usr/share/${PN}/contrib \
+ || die "Failed contrib ${i}"
+ done
+
+ if use perl && use cgi ; then
+ # We used to install in /usr/share/${PN}/gitweb
+ # but upstream installs in /usr/share/gitweb
+ # so we will install a symlink and use their location for compat with other
+ # distros
+ dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+ # INSTALL discusses configuration issues, not just installation
+ docinto /
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
+ newdoc "${S}"/gitweb/README README.gitweb
+
+ find "${ED}"/usr/lib64/perl5/ \
+ -name .packlist \
+ -exec rm \{\} \;
+ else
+ rm -rf "${ED}"/usr/share/gitweb
+ fi
+
+ if ! use subversion ; then
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ if use !prefix ; then
+ newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+ systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+ systemd_dounit "${FILESDIR}/git-daemon.socket"
+ fi
+
+ fixlocalpod
+}
+
+src_test() {
+ local disabled=""
+ local tests_cvs="t9200-git-cvsexportcommit.sh \
+ t9400-git-cvsserver-server.sh \
+ t9401-git-cvsserver-crlf.sh \
+ t9402-git-cvsserver-refs.sh \
+ t9600-cvsimport.sh \
+ t9601-cvsimport-vendor-branch.sh \
+ t9602-cvsimport-branches-tags.sh \
+ t9603-cvsimport-patchsets.sh \
+ t9604-cvsimport-timestamps.sh"
+ local tests_perl="t5502-quickfetch.sh \
+ t5512-ls-remote.sh \
+ t5520-pull.sh"
+ # Bug #225601 - t0004 is not suitable for root perm
+ # Bug #219839 - t1004 is not suitable for root perm
+ # t0001-init.sh - check for init notices EPERM* fails
+ local tests_nonroot="t0001-init.sh \
+ t0004-unwritable.sh \
+ t0070-fundamental.sh \
+ t1004-read-tree-m-u-wf.sh \
+ t3700-add.sh \
+ t7300-clean.sh"
+ # t9100 still fails with symlinks in SVN 1.7
+ local test_svn="t9100-git-svn-basic.sh"
+
+ # Unzip is used only for the testcase code, not by any normal parts of Git.
+ if ! has_version app-arch/unzip ; then
+ einfo "Disabling tar-tree tests"
+ disabled="${disabled} t5000-tar-tree.sh"
+ fi
+
+ cvs=0
+ use cvs && let cvs=$cvs+1
+ if [[ ${EUID} -eq 0 ]]; then
+ if [[ $cvs -eq 1 ]]; then
+ ewarn "Skipping CVS tests because CVS does not work as root!"
+ ewarn "You should retest with FEATURES=userpriv!"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ einfo "Skipping other tests that require being non-root"
+ disabled="${disabled} ${tests_nonroot}"
+ else
+ [[ $cvs -gt 0 ]] && \
+ has_version dev-vcs/cvs && \
+ let cvs=$cvs+1
+ [[ $cvs -gt 1 ]] && \
+ built_with_use dev-vcs/cvs server && \
+ let cvs=$cvs+1
+ if [[ $cvs -lt 3 ]]; then
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ fi
+
+ if ! use perl ; then
+ einfo "Disabling tests that need Perl"
+ disabled="${disabled} ${tests_perl}"
+ fi
+
+ einfo "Disabling tests that fail with SVN 1.7"
+ disabled="${disabled} ${test_svn}"
+
+ # Reset all previously disabled tests
+ cd "${S}/t"
+ for i in *.sh.DISABLED ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+ done
+ einfo "Disabled tests:"
+ for i in ${disabled} ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+ done
+
+ # Avoid the test system removing the results because we want them ourselves
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+ -i "${S}"/t/Makefile
+
+ # Clean old results first, must always run
+ cd "${S}/t"
+ nonfatal git_emake clean
+
+ # Now run the tests, keep going if we hit an error, and don't terminate on
+ # failure
+ cd "${S}"
+ einfo "Start test run"
+ #MAKEOPTS=-j1
+ nonfatal git_emake --keep-going test
+ rc=$?
+
+ # Display nice results, now print the results
+ cd "${S}/t"
+ nonfatal git_emake aggregate-results
+
+ # And bail if there was a problem
+ [ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+ local pkg=$1
+ shift
+ elog " $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ use python && python_mod_optimize git_remote_helpers
+ einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+ einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
+ einfo "Note that the prompt bash code is now in the seperate script"
+ elog "These additional scripts need some dependencies:"
+ echo
+ showpkgdeps git-quiltimport "dev-util/quilt"
+ showpkgdeps git-instaweb \
+ "|| ( www-servers/lighttpd www-servers/apache )"
+ echo
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ use python && python_mod_cleanup git_remote_helpers
+}
diff --git a/dev-vcs/git/git-1.8.3.2-r1.ebuild b/dev-vcs/git/git-1.8.3.2-r1.ebuild
new file mode 100644
index 0000000..818b022
--- /dev/null
+++ b/dev-vcs/git/git-1.8.3.2-r1.ebuild
@@ -0,0 +1,614 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.3.2-r1.ebuild,v 1.10 2013/12/11 10:39:17 pinkbyte Exp $
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_{6,7} )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI_SUFFIX="gz"
+ SRC_URI_GOOG="http://git-core.googlecode.com/files"
+ SRC_URI_KORG="mirror://kernel/software/scm/git"
+ SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ doc? (
+ ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ )"
+ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ SRC_URI=""
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+ dev-libs/openssl
+ sys-libs/zlib
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl[-build(-)] )
+ tk? ( dev-lang/tk )
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ emacs? ( virtual/emacs )
+ gnome-keyring? ( gnome-base/gnome-keyring )"
+
+RDEPEND="${CDEPEND}
+ gpg? ( app-crypt/gnupg )
+ perl? ( dev-perl/Error
+ dev-perl/Net-SMTP-SSL
+ dev-perl/Authen-SASL
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
+ cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+ subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+ )
+ python? ( gtk?
+ (
+ >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+ >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+ )
+ ${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+ app-arch/cpio
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ sys-apps/texinfo
+ app-text/xmlto
+ )
+ test? (
+ app-crypt/gnupg
+ )"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ cgi? ( perl )
+ cvs? ( perl )
+ subversion? ( perl )
+ webdav? ( curl )
+ gtk? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+pkg_setup() {
+ if use subversion && has_version "dev-vcs/subversion[dso]"; then
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+ ewarn "have been warned."
+ fi
+ if use python ; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+ local myopts
+
+ if use blksha1 ; then
+ myopts="${myopts} BLK_SHA1=YesPlease"
+ elif use ppcsha1 ; then
+ myopts="${myopts} PPC_SHA1=YesPlease"
+ fi
+
+ if use curl ; then
+ use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ else
+ myopts="${myopts} NO_CURL=YesPlease"
+ fi
+
+ # broken assumptions, because of broken build system ...
+ myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts="${myopts} INSTALL=install TAR=tar"
+ myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts="${myopts} SANE_TOOL_PATH="
+ myopts="${myopts} OLD_ICONV="
+ myopts="${myopts} NO_EXTERNAL_GREP="
+
+ # For svn-fe
+ extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+ # can't define this to null, since the entire makefile depends on it
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+ use iconv \
+ || myopts="${myopts} NO_ICONV=YesPlease"
+ use nls \
+ || myopts="${myopts} NO_GETTEXT=YesPlease"
+ use tk \
+ || myopts="${myopts} NO_TCLTK=YesPlease"
+ use pcre \
+ && myopts="${myopts} USE_LIBPCRE=yes" \
+ && extlibs="${extlibs} -lpcre"
+ use perl \
+ && myopts="${myopts} INSTALLDIRS=vendor" \
+ || myopts="${myopts} NO_PERL=YesPlease"
+ use python \
+ || myopts="${myopts} NO_PYTHON=YesPlease"
+ use subversion \
+ || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+ use threads \
+ && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
+ || myopts="${myopts} NO_PTHREADS=YesPlease"
+ use cvs \
+ || myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+# if [[ ${CHOST} == *-mint* ]] ; then
+# myopts="${myopts} NO_MMAP=YesPlease"
+# myopts="${myopts} NO_IPV6=YesPlease"
+# myopts="${myopts} NO_STRLCPY=YesPlease"
+# myopts="${myopts} NO_MEMMEM=YesPlease"
+# myopts="${myopts} NO_MKDTEMP=YesPlease"
+# myopts="${myopts} NO_MKSTEMPS=YesPlease"
+# fi
+ if [[ ${CHOST} == ia64-*-hpux* ]]; then
+ myopts="${myopts} NO_NSEC=YesPlease"
+ fi
+ if [[ ${CHOST} == *-*-aix* ]]; then
+ myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+ fi
+ if [[ ${CHOST} == *-solaris* ]]; then
+ myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+ fi
+
+ has_version '>=app-text/asciidoc-8.0' \
+ && myopts="${myopts} ASCIIDOC8=YesPlease"
+ myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+ # Bug 290465:
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+ [[ "${CHOST}" == *-uclibc* ]] && \
+ myopts="${myopts} NO_NSEC=YesPlease"
+
+ export MY_MAKEOPTS="${myopts}"
+ export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ use doc && \
+ cd "${S}"/Documentation && \
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ else
+ git-2_src_unpack
+ cd "${S}"
+ #cp "${FILESDIR}"/GIT-VERSION-GEN .
+ fi
+
+}
+
+src_prepare() {
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ epatch "${FILESDIR}"/git-1.8.2-optional-cvs.patch
+
+ sed -i \
+ -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+ -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+ -e 's:^\(CC = \).*$:\1$(OPTCC):' \
+ -e 's:^\(AR = \).*$:\1$(OPTAR):' \
+ -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+ -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+ Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+ # Never install the private copy of Error.pm (bug #296310)
+ sed -i \
+ -e '/private-Error.pm/s,^,#,' \
+ perl/Makefile.PL
+
+ # Fix docbook2texi command
+ sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+ Documentation/Makefile || die "sed failed"
+
+ # Fix git-subtree missing DESTDIR
+ sed -i \
+ -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+ -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
+ contrib/subtree/Makefile
+}
+
+git_emake() {
+ # bug #326625: PERL_PATH, PERL_MM_OPT
+ # bug #320647: PYTHON_PATH
+ PYTHON_PATH=""
+ use python && PYTHON_PATH="${PYTHON}"
+ emake ${MY_MAKEOPTS} \
+ DESTDIR="${D}" \
+ OPTCFLAGS="${CFLAGS}" \
+ OPTLDFLAGS="${LDFLAGS}" \
+ OPTCC="$(tc-getCC)" \
+ OPTAR="$(tc-getAR)" \
+ prefix="${EPREFIX}"/usr \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ sysconfdir="${EPREFIX}"/etc \
+ PYTHON_PATH="${PYTHON_PATH}" \
+ PERL_MM_OPT="" \
+ GIT_TEST_OPTS="--no-color" \
+ V=1 \
+ "$@"
+ # This is the fix for bug #326625, but it also causes breakage, see bug
+ # #352693.
+ # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+ exportmakeopts
+}
+
+src_compile() {
+ if use perl ; then
+ git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+ git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+ fi
+ git_emake || die "emake failed"
+
+ if use emacs ; then
+ elisp-compile contrib/emacs/git{,-blame}.el
+ fi
+
+ if use perl && use cgi ; then
+ git_emake \
+ gitweb/gitweb.cgi \
+ || die "emake gitweb/gitweb.cgi failed"
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+ git_emake || die "emake credential-osxkeychain"
+ fi
+
+ cd "${S}"/Documentation
+ if [[ ${PV} == *9999 ]] ; then
+ git_emake man \
+ || die "emake man failed"
+ if use doc ; then
+ git_emake info html \
+ || die "emake info html failed"
+ fi
+ else
+ if use doc ; then
+ git_emake info \
+ || die "emake info html failed"
+ fi
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+ if use doc ; then
+ git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+ fi
+ cd "${S}"
+ fi
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ git_emake || die "emake git-credential-gnome-keyring failed"
+ fi
+
+ cd "${S}"/contrib/subtree
+ git_emake
+ use doc && git_emake doc
+}
+
+src_install() {
+ git_emake \
+ install || \
+ die "make install failed"
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+ fi
+
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+ dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ use doc && dodir /usr/share/doc/${PF}/html
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ use doc && dohtml -p ${d} Documentation${d}*.html
+ done
+ docinto /
+ # Upstream does not ship this pre-built :-(
+ use doc && doinfo Documentation/{git,gitman}.info
+
+ newbashcomp contrib/completion/git-completion.bash ${PN}
+ newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
+
+ if use emacs ; then
+ elisp-install ${PN} contrib/emacs/git.{el,elc}
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+ # don't add automatically to the load-path, so the sitefile
+ # can do a conditional loading
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ fi
+
+ if use python && use gtk ; then
+ python_doscript "${S}"/contrib/gitview/gitview
+ dodoc "${S}"/contrib/gitview/gitview.txt
+ fi
+
+ #dobin contrib/fast-import/git-p4 # Moved upstream
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream
+ newbin contrib/fast-import/import-tars.perl import-tars
+ exeinto /usr/libexec/git-core/
+ newexe contrib/git-resurrect.sh git-resurrect
+
+ # git-subtree
+ cd "${S}"/contrib/subtree
+ git_emake install || die "Failed to emake install git-subtree"
+ if use doc ; then
+ git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+ fi
+ newdoc README README.git-subtree
+ dodoc git-subtree.txt
+ cd "${S}"
+
+ # git-diffall
+ dobin contrib/diffall/git-diffall
+ newdoc contrib/diffall/README git-diffall.txt
+
+ # diff-highlight
+ dobin contrib/diff-highlight/diff-highlight
+ newdoc contrib/diff-highlight/README README.diff-highlight
+
+ # git-jump
+ exeinto /usr/libexec/git-core/
+ doexe contrib/git-jump/git-jump
+ newdoc contrib/git-jump/README git-jump.txt
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ dobin git-credential-gnome-keyring
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ dobin svn-fe
+ dodoc svn-fe.txt
+ use doc && doman svn-fe.1 && dohtml svn-fe.html
+ cd "${S}"
+ fi
+
+ # remote-helpers
+ if use python ; then
+ python_scriptinto /usr/libexec/git-core/
+ python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
+ python_optimize
+ fi
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # completion - installed above
+ # credential/gnome-keyring TODO
+ # diff-highlight - done above
+ # diffall - done above
+ # emacs - installed above
+ # examples - these are stuff that is not used in Git anymore actually
+ # git-jump - done above
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
+ # patches - stuff the Git guys made to go upstream to other places
+ # persistent-https - TODO
+ # mw-to-git - TODO
+ # subtree - build seperately
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ for i in \
+ blameview buildsystems ciabot continuous convert-objects fast-import \
+ hg-to-git hooks remotes2config.sh rerere-train.sh \
+ stats vim workdir \
+ ; do
+ cp -rf \
+ "${S}"/contrib/${i} \
+ "${ED}"/usr/share/${PN}/contrib \
+ || die "Failed contrib ${i}"
+ done
+
+ if use perl && use cgi ; then
+ # We used to install in /usr/share/${PN}/gitweb
+ # but upstream installs in /usr/share/gitweb
+ # so we will install a symlink and use their location for compat with other
+ # distros
+ dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+ # INSTALL discusses configuration issues, not just installation
+ docinto /
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
+ newdoc "${S}"/gitweb/README README.gitweb
+
+ find "${ED}"/usr/lib64/perl5/ \
+ -name .packlist \
+ -exec rm \{\} \;
+ else
+ rm -rf "${ED}"/usr/share/gitweb
+ fi
+
+ if ! use subversion ; then
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ if use !prefix ; then
+ newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+ systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+ systemd_dounit "${FILESDIR}/git-daemon.socket"
+ fi
+
+ fixlocalpod
+}
+
+src_test() {
+ local disabled=""
+ local tests_cvs="t9200-git-cvsexportcommit.sh \
+ t9400-git-cvsserver-server.sh \
+ t9401-git-cvsserver-crlf.sh \
+ t9402-git-cvsserver-refs.sh \
+ t9600-cvsimport.sh \
+ t9601-cvsimport-vendor-branch.sh \
+ t9602-cvsimport-branches-tags.sh \
+ t9603-cvsimport-patchsets.sh \
+ t9604-cvsimport-timestamps.sh"
+ local tests_perl="t3701-add-interactive.sh \
+ t5502-quickfetch.sh \
+ t5512-ls-remote.sh \
+ t5520-pull.sh \
+ t7106-reset-unborn-branch.sh \
+ t7501-commit.sh"
+ # Bug #225601 - t0004 is not suitable for root perm
+ # Bug #219839 - t1004 is not suitable for root perm
+ # t0001-init.sh - check for init notices EPERM* fails
+ local tests_nonroot="t0001-init.sh \
+ t0004-unwritable.sh \
+ t0070-fundamental.sh \
+ t1004-read-tree-m-u-wf.sh \
+ t3700-add.sh \
+ t7300-clean.sh"
+ # t9100 still fails with symlinks in SVN 1.7
+ local test_svn="t9100-git-svn-basic.sh"
+
+ # Unzip is used only for the testcase code, not by any normal parts of Git.
+ if ! has_version app-arch/unzip ; then
+ einfo "Disabling tar-tree tests"
+ disabled="${disabled} t5000-tar-tree.sh"
+ fi
+
+ cvs=0
+ use cvs && let cvs=$cvs+1
+ if [[ ${EUID} -eq 0 ]]; then
+ if [[ $cvs -eq 1 ]]; then
+ ewarn "Skipping CVS tests because CVS does not work as root!"
+ ewarn "You should retest with FEATURES=userpriv!"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ einfo "Skipping other tests that require being non-root"
+ disabled="${disabled} ${tests_nonroot}"
+ else
+ [[ $cvs -gt 0 ]] && \
+ has_version dev-vcs/cvs && \
+ let cvs=$cvs+1
+ [[ $cvs -gt 1 ]] && \
+ has_version "dev-vcs/cvs[server]" && \
+ let cvs=$cvs+1
+ if [[ $cvs -lt 3 ]]; then
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ fi
+
+ if ! use perl ; then
+ einfo "Disabling tests that need Perl"
+ disabled="${disabled} ${tests_perl}"
+ fi
+
+ einfo "Disabling tests that fail with SVN 1.7"
+ disabled="${disabled} ${test_svn}"
+
+ # Reset all previously disabled tests
+ cd "${S}/t"
+ for i in *.sh.DISABLED ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+ done
+ einfo "Disabled tests:"
+ for i in ${disabled} ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+ done
+
+ # Avoid the test system removing the results because we want them ourselves
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+ -i "${S}"/t/Makefile
+
+ # Clean old results first, must always run
+ cd "${S}/t"
+ nonfatal git_emake clean
+
+ # Now run the tests, keep going if we hit an error, and don't terminate on
+ # failure
+ cd "${S}"
+ einfo "Start test run"
+ #MAKEOPTS=-j1
+ nonfatal git_emake --keep-going test
+ rc=$?
+
+ # Display nice results, now print the results
+ cd "${S}/t"
+ nonfatal git_emake aggregate-results
+
+ # And bail if there was a problem
+ [ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+ local pkg=$1
+ shift
+ elog " $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+ einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
+ einfo "Note that the prompt bash code is now in the seperate script"
+ elog "These additional scripts need some dependencies:"
+ echo
+ showpkgdeps git-quiltimport "dev-util/quilt"
+ showpkgdeps git-instaweb \
+ "|| ( www-servers/lighttpd www-servers/apache )"
+ echo
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-1.8.4.5.ebuild b/dev-vcs/git/git-1.8.4.5.ebuild
new file mode 100644
index 0000000..7d63244
--- /dev/null
+++ b/dev-vcs/git/git-1.8.4.5.ebuild
@@ -0,0 +1,619 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.4.5.ebuild,v 1.2 2013/12/11 10:27:22 polynomial-c Exp $
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_{6,7} )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI_SUFFIX="gz"
+ SRC_URI_GOOG="http://git-core.googlecode.com/files"
+ SRC_URI_KORG="mirror://kernel/software/scm/git"
+ SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ doc? (
+ ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ )"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ SRC_URI=""
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+ dev-libs/openssl
+ sys-libs/zlib
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl[-build(-)] )
+ tk? ( dev-lang/tk )
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ emacs? ( virtual/emacs )
+ gnome-keyring? ( gnome-base/gnome-keyring )"
+
+RDEPEND="${CDEPEND}
+ gpg? ( app-crypt/gnupg )
+ perl? ( dev-perl/Error
+ dev-perl/Net-SMTP-SSL
+ dev-perl/Authen-SASL
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
+ cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+ subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+ )
+ python? ( gtk?
+ (
+ >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+ >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+ )
+ ${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+ app-arch/cpio
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ sys-apps/texinfo
+ app-text/xmlto
+ )
+ test? (
+ app-crypt/gnupg
+ )"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ cgi? ( perl )
+ cvs? ( perl )
+ subversion? ( perl )
+ webdav? ( curl )
+ gtk? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+pkg_setup() {
+ if use subversion && has_version "dev-vcs/subversion[dso]"; then
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+ ewarn "have been warned."
+ fi
+ if use python ; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+ local myopts
+
+ if use blksha1 ; then
+ myopts="${myopts} BLK_SHA1=YesPlease"
+ elif use ppcsha1 ; then
+ myopts="${myopts} PPC_SHA1=YesPlease"
+ fi
+
+ if use curl ; then
+ use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ else
+ myopts="${myopts} NO_CURL=YesPlease"
+ fi
+
+ # broken assumptions, because of broken build system ...
+ myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts="${myopts} INSTALL=install TAR=tar"
+ myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts="${myopts} SANE_TOOL_PATH="
+ myopts="${myopts} OLD_ICONV="
+ myopts="${myopts} NO_EXTERNAL_GREP="
+
+ # For svn-fe
+ extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+ # can't define this to null, since the entire makefile depends on it
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+ use iconv \
+ || myopts="${myopts} NO_ICONV=YesPlease"
+ use nls \
+ || myopts="${myopts} NO_GETTEXT=YesPlease"
+ use tk \
+ || myopts="${myopts} NO_TCLTK=YesPlease"
+ use pcre \
+ && myopts="${myopts} USE_LIBPCRE=yes" \
+ && extlibs="${extlibs} -lpcre"
+ use perl \
+ && myopts="${myopts} INSTALLDIRS=vendor" \
+ || myopts="${myopts} NO_PERL=YesPlease"
+ use python \
+ || myopts="${myopts} NO_PYTHON=YesPlease"
+ use subversion \
+ || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+ use threads \
+ && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
+ || myopts="${myopts} NO_PTHREADS=YesPlease"
+ use cvs \
+ || myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+# if [[ ${CHOST} == *-mint* ]] ; then
+# myopts="${myopts} NO_MMAP=YesPlease"
+# myopts="${myopts} NO_IPV6=YesPlease"
+# myopts="${myopts} NO_STRLCPY=YesPlease"
+# myopts="${myopts} NO_MEMMEM=YesPlease"
+# myopts="${myopts} NO_MKDTEMP=YesPlease"
+# myopts="${myopts} NO_MKSTEMPS=YesPlease"
+# fi
+ if [[ ${CHOST} == ia64-*-hpux* ]]; then
+ myopts="${myopts} NO_NSEC=YesPlease"
+ fi
+ if [[ ${CHOST} == *-*-aix* ]]; then
+ myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+ fi
+ if [[ ${CHOST} == *-solaris* ]]; then
+ myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+ fi
+
+ has_version '>=app-text/asciidoc-8.0' \
+ && myopts="${myopts} ASCIIDOC8=YesPlease"
+ myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+ # Bug 290465:
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+ [[ "${CHOST}" == *-uclibc* ]] && \
+ myopts="${myopts} NO_NSEC=YesPlease"
+
+ export MY_MAKEOPTS="${myopts}"
+ export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ use doc && \
+ cd "${S}"/Documentation && \
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ else
+ git-2_src_unpack
+ cd "${S}"
+ #cp "${FILESDIR}"/GIT-VERSION-GEN .
+ fi
+
+}
+
+src_prepare() {
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ epatch "${FILESDIR}"/git-1.8.4-optional-cvs.patch
+
+ sed -i \
+ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+ -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+ -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+ # Never install the private copy of Error.pm (bug #296310)
+ sed -i \
+ -e '/private-Error.pm/s,^,#,' \
+ perl/Makefile.PL
+
+ # Fix docbook2texi command
+ sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+ Documentation/Makefile || die "sed failed"
+
+ # Fix git-subtree missing DESTDIR
+ sed -i \
+ -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+ -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
+ contrib/subtree/Makefile
+}
+
+git_emake() {
+ # bug #326625: PERL_PATH, PERL_MM_OPT
+ # bug #320647: PYTHON_PATH
+ PYTHON_PATH=""
+ use python && PYTHON_PATH="${PYTHON}"
+ emake ${MY_MAKEOPTS} \
+ DESTDIR="${D}" \
+ OPTCFLAGS="${CFLAGS}" \
+ OPTLDFLAGS="${LDFLAGS}" \
+ OPTCC="$(tc-getCC)" \
+ OPTAR="$(tc-getAR)" \
+ prefix="${EPREFIX}"/usr \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ sysconfdir="${EPREFIX}"/etc \
+ PYTHON_PATH="${PYTHON_PATH}" \
+ PERL_MM_OPT="" \
+ GIT_TEST_OPTS="--no-color" \
+ V=1 \
+ "$@"
+ # This is the fix for bug #326625, but it also causes breakage, see bug
+ # #352693.
+ # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+ exportmakeopts
+}
+
+src_compile() {
+ if use perl ; then
+ git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+ git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+ fi
+ git_emake || die "emake failed"
+
+ if use emacs ; then
+ elisp-compile contrib/emacs/git{,-blame}.el
+ fi
+
+ if use perl && use cgi ; then
+ git_emake \
+ gitweb/gitweb.cgi \
+ || die "emake gitweb/gitweb.cgi failed"
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+ git_emake || die "emake credential-osxkeychain"
+ fi
+
+ cd "${S}"/Documentation
+ if [[ ${PV} == *9999 ]] ; then
+ git_emake man \
+ || die "emake man failed"
+ if use doc ; then
+ git_emake info html \
+ || die "emake info html failed"
+ fi
+ else
+ if use doc ; then
+ git_emake info \
+ || die "emake info html failed"
+ fi
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+ if use doc ; then
+ git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+ fi
+ cd "${S}"
+ fi
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ git_emake || die "emake git-credential-gnome-keyring failed"
+ fi
+
+ cd "${S}"/contrib/subtree
+ git_emake
+ use doc && git_emake doc
+}
+
+src_install() {
+ git_emake \
+ install || \
+ die "make install failed"
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+ fi
+
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+ dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ use doc && dodir /usr/share/doc/${PF}/html
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ use doc && dohtml -p ${d} Documentation${d}*.html
+ done
+ docinto /
+ # Upstream does not ship this pre-built :-(
+ use doc && doinfo Documentation/{git,gitman}.info
+
+ newbashcomp contrib/completion/git-completion.bash ${PN}
+ newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
+
+ if use emacs ; then
+ elisp-install ${PN} contrib/emacs/git.{el,elc}
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+ # don't add automatically to the load-path, so the sitefile
+ # can do a conditional loading
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ fi
+
+ if use python && use gtk ; then
+ python_doscript "${S}"/contrib/gitview/gitview
+ dodoc "${S}"/contrib/gitview/gitview.txt
+ fi
+
+ #dobin contrib/fast-import/git-p4 # Moved upstream
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream
+ newbin contrib/fast-import/import-tars.perl import-tars
+ exeinto /usr/libexec/git-core/
+ newexe contrib/git-resurrect.sh git-resurrect
+
+ # git-subtree
+ cd "${S}"/contrib/subtree
+ git_emake install || die "Failed to emake install git-subtree"
+ if use doc ; then
+ git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+ fi
+ newdoc README README.git-subtree
+ dodoc git-subtree.txt
+ cd "${S}"
+
+ # git-diffall
+ dobin contrib/diffall/git-diffall
+ newdoc contrib/diffall/README git-diffall.txt
+
+ # diff-highlight
+ dobin contrib/diff-highlight/diff-highlight
+ newdoc contrib/diff-highlight/README README.diff-highlight
+
+ # git-jump
+ exeinto /usr/libexec/git-core/
+ doexe contrib/git-jump/git-jump
+ newdoc contrib/git-jump/README git-jump.txt
+
+ # git-contacts
+ exeinto /usr/libexec/git-core/
+ doexe contrib/contacts/git-contacts
+ dodoc contrib/contacts/git-contacts.txt
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ dobin git-credential-gnome-keyring
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ dobin svn-fe
+ dodoc svn-fe.txt
+ use doc && doman svn-fe.1 && dohtml svn-fe.html
+ cd "${S}"
+ fi
+
+ # remote-helpers
+ if use python ; then
+ python_scriptinto /usr/libexec/git-core/
+ python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
+ python_optimize
+ fi
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # completion - installed above
+ # credential/gnome-keyring TODO
+ # diff-highlight - done above
+ # diffall - done above
+ # emacs - installed above
+ # examples - these are stuff that is not used in Git anymore actually
+ # git-jump - done above
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
+ # patches - stuff the Git guys made to go upstream to other places
+ # persistent-https - TODO
+ # mw-to-git - TODO
+ # subtree - build seperately
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ for i in \
+ buildsystems ciabot convert-objects fast-import \
+ hg-to-git hooks remotes2config.sh rerere-train.sh \
+ stats vim workdir \
+ ; do
+ cp -rf \
+ "${S}"/contrib/${i} \
+ "${ED}"/usr/share/${PN}/contrib \
+ || die "Failed contrib ${i}"
+ done
+
+ if use perl && use cgi ; then
+ # We used to install in /usr/share/${PN}/gitweb
+ # but upstream installs in /usr/share/gitweb
+ # so we will install a symlink and use their location for compat with other
+ # distros
+ dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+ # INSTALL discusses configuration issues, not just installation
+ docinto /
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
+ newdoc "${S}"/gitweb/README README.gitweb
+
+ find "${ED}"/usr/lib64/perl5/ \
+ -name .packlist \
+ -exec rm \{\} \;
+ else
+ rm -rf "${ED}"/usr/share/gitweb
+ fi
+
+ if ! use subversion ; then
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ if use !prefix ; then
+ newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+ systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+ systemd_dounit "${FILESDIR}/git-daemon.socket"
+ fi
+
+ fixlocalpod
+}
+
+src_test() {
+ local disabled=""
+ local tests_cvs="t9200-git-cvsexportcommit.sh \
+ t9400-git-cvsserver-server.sh \
+ t9401-git-cvsserver-crlf.sh \
+ t9402-git-cvsserver-refs.sh \
+ t9600-cvsimport.sh \
+ t9601-cvsimport-vendor-branch.sh \
+ t9602-cvsimport-branches-tags.sh \
+ t9603-cvsimport-patchsets.sh \
+ t9604-cvsimport-timestamps.sh"
+ local tests_perl="t3701-add-interactive.sh \
+ t5502-quickfetch.sh \
+ t5512-ls-remote.sh \
+ t5520-pull.sh \
+ t7106-reset-unborn-branch.sh \
+ t7501-commit.sh"
+ # Bug #225601 - t0004 is not suitable for root perm
+ # Bug #219839 - t1004 is not suitable for root perm
+ # t0001-init.sh - check for init notices EPERM* fails
+ local tests_nonroot="t0001-init.sh \
+ t0004-unwritable.sh \
+ t0070-fundamental.sh \
+ t1004-read-tree-m-u-wf.sh \
+ t3700-add.sh \
+ t7300-clean.sh"
+ # t9100 still fails with symlinks in SVN 1.7
+ local test_svn="t9100-git-svn-basic.sh"
+
+ # Unzip is used only for the testcase code, not by any normal parts of Git.
+ if ! has_version app-arch/unzip ; then
+ einfo "Disabling tar-tree tests"
+ disabled="${disabled} t5000-tar-tree.sh"
+ fi
+
+ cvs=0
+ use cvs && let cvs=$cvs+1
+ if [[ ${EUID} -eq 0 ]]; then
+ if [[ $cvs -eq 1 ]]; then
+ ewarn "Skipping CVS tests because CVS does not work as root!"
+ ewarn "You should retest with FEATURES=userpriv!"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ einfo "Skipping other tests that require being non-root"
+ disabled="${disabled} ${tests_nonroot}"
+ else
+ [[ $cvs -gt 0 ]] && \
+ has_version dev-vcs/cvs && \
+ let cvs=$cvs+1
+ [[ $cvs -gt 1 ]] && \
+ has_version "dev-vcs/cvs[server]" && \
+ let cvs=$cvs+1
+ if [[ $cvs -lt 3 ]]; then
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ fi
+
+ if ! use perl ; then
+ einfo "Disabling tests that need Perl"
+ disabled="${disabled} ${tests_perl}"
+ fi
+
+ einfo "Disabling tests that fail with SVN 1.7"
+ disabled="${disabled} ${test_svn}"
+
+ # Reset all previously disabled tests
+ cd "${S}/t"
+ for i in *.sh.DISABLED ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+ done
+ einfo "Disabled tests:"
+ for i in ${disabled} ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+ done
+
+ # Avoid the test system removing the results because we want them ourselves
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+ -i "${S}"/t/Makefile
+
+ # Clean old results first, must always run
+ cd "${S}/t"
+ nonfatal git_emake clean
+
+ # Now run the tests, keep going if we hit an error, and don't terminate on
+ # failure
+ cd "${S}"
+ einfo "Start test run"
+ #MAKEOPTS=-j1
+ nonfatal git_emake --keep-going test
+ rc=$?
+
+ # Display nice results, now print the results
+ cd "${S}/t"
+ nonfatal git_emake aggregate-results
+
+ # And bail if there was a problem
+ [ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+ local pkg=$1
+ shift
+ elog " $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+ einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
+ einfo "Note that the prompt bash code is now in the seperate script"
+ elog "These additional scripts need some dependencies:"
+ echo
+ showpkgdeps git-quiltimport "dev-util/quilt"
+ showpkgdeps git-instaweb \
+ "|| ( www-servers/lighttpd www-servers/apache )"
+ echo
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-1.8.5.1.ebuild b/dev-vcs/git/git-1.8.5.1.ebuild
new file mode 100644
index 0000000..9262d6c
--- /dev/null
+++ b/dev-vcs/git/git-1.8.5.1.ebuild
@@ -0,0 +1,619 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.1.ebuild,v 1.2 2013/12/11 10:27:22 polynomial-c Exp $
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_{6,7} )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI_SUFFIX="gz"
+ SRC_URI_GOOG="http://git-core.googlecode.com/files"
+ SRC_URI_KORG="mirror://kernel/software/scm/git"
+ SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ doc? (
+ ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ )"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ SRC_URI=""
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+ dev-libs/openssl
+ sys-libs/zlib
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl[-build(-)] )
+ tk? ( dev-lang/tk )
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ emacs? ( virtual/emacs )
+ gnome-keyring? ( gnome-base/gnome-keyring )"
+
+RDEPEND="${CDEPEND}
+ gpg? ( app-crypt/gnupg )
+ perl? ( dev-perl/Error
+ dev-perl/Net-SMTP-SSL
+ dev-perl/Authen-SASL
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
+ cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+ subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+ )
+ python? ( gtk?
+ (
+ >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+ >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+ )
+ ${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+ app-arch/cpio
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ sys-apps/texinfo
+ app-text/xmlto
+ )
+ test? (
+ app-crypt/gnupg
+ )"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ cgi? ( perl )
+ cvs? ( perl )
+ subversion? ( perl )
+ webdav? ( curl )
+ gtk? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+pkg_setup() {
+ if use subversion && has_version "dev-vcs/subversion[dso]"; then
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+ ewarn "have been warned."
+ fi
+ if use python ; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+ local myopts
+
+ if use blksha1 ; then
+ myopts="${myopts} BLK_SHA1=YesPlease"
+ elif use ppcsha1 ; then
+ myopts="${myopts} PPC_SHA1=YesPlease"
+ fi
+
+ if use curl ; then
+ use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ else
+ myopts="${myopts} NO_CURL=YesPlease"
+ fi
+
+ # broken assumptions, because of broken build system ...
+ myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts="${myopts} INSTALL=install TAR=tar"
+ myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts="${myopts} SANE_TOOL_PATH="
+ myopts="${myopts} OLD_ICONV="
+ myopts="${myopts} NO_EXTERNAL_GREP="
+
+ # For svn-fe
+ extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+ # can't define this to null, since the entire makefile depends on it
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+ use iconv \
+ || myopts="${myopts} NO_ICONV=YesPlease"
+ use nls \
+ || myopts="${myopts} NO_GETTEXT=YesPlease"
+ use tk \
+ || myopts="${myopts} NO_TCLTK=YesPlease"
+ use pcre \
+ && myopts="${myopts} USE_LIBPCRE=yes" \
+ && extlibs="${extlibs} -lpcre"
+ use perl \
+ && myopts="${myopts} INSTALLDIRS=vendor" \
+ || myopts="${myopts} NO_PERL=YesPlease"
+ use python \
+ || myopts="${myopts} NO_PYTHON=YesPlease"
+ use subversion \
+ || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+ use threads \
+ && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
+ || myopts="${myopts} NO_PTHREADS=YesPlease"
+ use cvs \
+ || myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+# if [[ ${CHOST} == *-mint* ]] ; then
+# myopts="${myopts} NO_MMAP=YesPlease"
+# myopts="${myopts} NO_IPV6=YesPlease"
+# myopts="${myopts} NO_STRLCPY=YesPlease"
+# myopts="${myopts} NO_MEMMEM=YesPlease"
+# myopts="${myopts} NO_MKDTEMP=YesPlease"
+# myopts="${myopts} NO_MKSTEMPS=YesPlease"
+# fi
+ if [[ ${CHOST} == ia64-*-hpux* ]]; then
+ myopts="${myopts} NO_NSEC=YesPlease"
+ fi
+ if [[ ${CHOST} == *-*-aix* ]]; then
+ myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+ fi
+ if [[ ${CHOST} == *-solaris* ]]; then
+ myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+ fi
+
+ has_version '>=app-text/asciidoc-8.0' \
+ && myopts="${myopts} ASCIIDOC8=YesPlease"
+ myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+ # Bug 290465:
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+ [[ "${CHOST}" == *-uclibc* ]] && \
+ myopts="${myopts} NO_NSEC=YesPlease"
+
+ export MY_MAKEOPTS="${myopts}"
+ export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ use doc && \
+ cd "${S}"/Documentation && \
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ else
+ git-2_src_unpack
+ cd "${S}"
+ #cp "${FILESDIR}"/GIT-VERSION-GEN .
+ fi
+
+}
+
+src_prepare() {
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch
+
+ sed -i \
+ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+ -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+ -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+ # Never install the private copy of Error.pm (bug #296310)
+ sed -i \
+ -e '/private-Error.pm/s,^,#,' \
+ perl/Makefile.PL
+
+ # Fix docbook2texi command
+ sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+ Documentation/Makefile || die "sed failed"
+
+ # Fix git-subtree missing DESTDIR
+ sed -i \
+ -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+ -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
+ contrib/subtree/Makefile
+}
+
+git_emake() {
+ # bug #326625: PERL_PATH, PERL_MM_OPT
+ # bug #320647: PYTHON_PATH
+ PYTHON_PATH=""
+ use python && PYTHON_PATH="${PYTHON}"
+ emake ${MY_MAKEOPTS} \
+ DESTDIR="${D}" \
+ OPTCFLAGS="${CFLAGS}" \
+ OPTLDFLAGS="${LDFLAGS}" \
+ OPTCC="$(tc-getCC)" \
+ OPTAR="$(tc-getAR)" \
+ prefix="${EPREFIX}"/usr \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ sysconfdir="${EPREFIX}"/etc \
+ PYTHON_PATH="${PYTHON_PATH}" \
+ PERL_MM_OPT="" \
+ GIT_TEST_OPTS="--no-color" \
+ V=1 \
+ "$@"
+ # This is the fix for bug #326625, but it also causes breakage, see bug
+ # #352693.
+ # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+ exportmakeopts
+}
+
+src_compile() {
+ if use perl ; then
+ git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+ git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+ fi
+ git_emake || die "emake failed"
+
+ if use emacs ; then
+ elisp-compile contrib/emacs/git{,-blame}.el
+ fi
+
+ if use perl && use cgi ; then
+ git_emake \
+ gitweb/gitweb.cgi \
+ || die "emake gitweb/gitweb.cgi failed"
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+ git_emake || die "emake credential-osxkeychain"
+ fi
+
+ cd "${S}"/Documentation
+ if [[ ${PV} == *9999 ]] ; then
+ git_emake man \
+ || die "emake man failed"
+ if use doc ; then
+ git_emake info html \
+ || die "emake info html failed"
+ fi
+ else
+ if use doc ; then
+ git_emake info \
+ || die "emake info html failed"
+ fi
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+ if use doc ; then
+ git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+ fi
+ cd "${S}"
+ fi
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ git_emake || die "emake git-credential-gnome-keyring failed"
+ fi
+
+ cd "${S}"/contrib/subtree
+ git_emake
+ use doc && git_emake doc
+}
+
+src_install() {
+ git_emake \
+ install || \
+ die "make install failed"
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+ fi
+
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+ dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ use doc && dodir /usr/share/doc/${PF}/html
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ use doc && dohtml -p ${d} Documentation${d}*.html
+ done
+ docinto /
+ # Upstream does not ship this pre-built :-(
+ use doc && doinfo Documentation/{git,gitman}.info
+
+ newbashcomp contrib/completion/git-completion.bash ${PN}
+ newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
+
+ if use emacs ; then
+ elisp-install ${PN} contrib/emacs/git.{el,elc}
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+ # don't add automatically to the load-path, so the sitefile
+ # can do a conditional loading
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ fi
+
+ if use python && use gtk ; then
+ python_doscript "${S}"/contrib/gitview/gitview
+ dodoc "${S}"/contrib/gitview/gitview.txt
+ fi
+
+ #dobin contrib/fast-import/git-p4 # Moved upstream
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream
+ newbin contrib/fast-import/import-tars.perl import-tars
+ exeinto /usr/libexec/git-core/
+ newexe contrib/git-resurrect.sh git-resurrect
+
+ # git-subtree
+ cd "${S}"/contrib/subtree
+ git_emake install || die "Failed to emake install git-subtree"
+ if use doc ; then
+ git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+ fi
+ newdoc README README.git-subtree
+ dodoc git-subtree.txt
+ cd "${S}"
+
+ # git-diffall
+ dobin contrib/diffall/git-diffall
+ newdoc contrib/diffall/README git-diffall.txt
+
+ # diff-highlight
+ dobin contrib/diff-highlight/diff-highlight
+ newdoc contrib/diff-highlight/README README.diff-highlight
+
+ # git-jump
+ exeinto /usr/libexec/git-core/
+ doexe contrib/git-jump/git-jump
+ newdoc contrib/git-jump/README git-jump.txt
+
+ # git-contacts
+ exeinto /usr/libexec/git-core/
+ doexe contrib/contacts/git-contacts
+ dodoc contrib/contacts/git-contacts.txt
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ dobin git-credential-gnome-keyring
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ dobin svn-fe
+ dodoc svn-fe.txt
+ use doc && doman svn-fe.1 && dohtml svn-fe.html
+ cd "${S}"
+ fi
+
+ # remote-helpers
+ if use python ; then
+ python_scriptinto /usr/libexec/git-core/
+ python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
+ python_optimize
+ fi
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # completion - installed above
+ # credential/gnome-keyring TODO
+ # diff-highlight - done above
+ # diffall - done above
+ # emacs - installed above
+ # examples - these are stuff that is not used in Git anymore actually
+ # git-jump - done above
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
+ # patches - stuff the Git guys made to go upstream to other places
+ # persistent-https - TODO
+ # mw-to-git - TODO
+ # subtree - build seperately
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ for i in \
+ buildsystems convert-objects fast-import \
+ hg-to-git hooks remotes2config.sh rerere-train.sh \
+ stats vim workdir \
+ ; do
+ cp -rf \
+ "${S}"/contrib/${i} \
+ "${ED}"/usr/share/${PN}/contrib \
+ || die "Failed contrib ${i}"
+ done
+
+ if use perl && use cgi ; then
+ # We used to install in /usr/share/${PN}/gitweb
+ # but upstream installs in /usr/share/gitweb
+ # so we will install a symlink and use their location for compat with other
+ # distros
+ dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+ # INSTALL discusses configuration issues, not just installation
+ docinto /
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
+ newdoc "${S}"/gitweb/README README.gitweb
+
+ find "${ED}"/usr/lib64/perl5/ \
+ -name .packlist \
+ -exec rm \{\} \;
+ else
+ rm -rf "${ED}"/usr/share/gitweb
+ fi
+
+ if ! use subversion ; then
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ if use !prefix ; then
+ newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+ systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+ systemd_dounit "${FILESDIR}/git-daemon.socket"
+ fi
+
+ fixlocalpod
+}
+
+src_test() {
+ local disabled=""
+ local tests_cvs="t9200-git-cvsexportcommit.sh \
+ t9400-git-cvsserver-server.sh \
+ t9401-git-cvsserver-crlf.sh \
+ t9402-git-cvsserver-refs.sh \
+ t9600-cvsimport.sh \
+ t9601-cvsimport-vendor-branch.sh \
+ t9602-cvsimport-branches-tags.sh \
+ t9603-cvsimport-patchsets.sh \
+ t9604-cvsimport-timestamps.sh"
+ local tests_perl="t3701-add-interactive.sh \
+ t5502-quickfetch.sh \
+ t5512-ls-remote.sh \
+ t5520-pull.sh \
+ t7106-reset-unborn-branch.sh \
+ t7501-commit.sh"
+ # Bug #225601 - t0004 is not suitable for root perm
+ # Bug #219839 - t1004 is not suitable for root perm
+ # t0001-init.sh - check for init notices EPERM* fails
+ local tests_nonroot="t0001-init.sh \
+ t0004-unwritable.sh \
+ t0070-fundamental.sh \
+ t1004-read-tree-m-u-wf.sh \
+ t3700-add.sh \
+ t7300-clean.sh"
+ # t9100 still fails with symlinks in SVN 1.7
+ local test_svn="t9100-git-svn-basic.sh"
+
+ # Unzip is used only for the testcase code, not by any normal parts of Git.
+ if ! has_version app-arch/unzip ; then
+ einfo "Disabling tar-tree tests"
+ disabled="${disabled} t5000-tar-tree.sh"
+ fi
+
+ cvs=0
+ use cvs && let cvs=$cvs+1
+ if [[ ${EUID} -eq 0 ]]; then
+ if [[ $cvs -eq 1 ]]; then
+ ewarn "Skipping CVS tests because CVS does not work as root!"
+ ewarn "You should retest with FEATURES=userpriv!"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ einfo "Skipping other tests that require being non-root"
+ disabled="${disabled} ${tests_nonroot}"
+ else
+ [[ $cvs -gt 0 ]] && \
+ has_version dev-vcs/cvs && \
+ let cvs=$cvs+1
+ [[ $cvs -gt 1 ]] && \
+ has_version "dev-vcs/cvs[server]" && \
+ let cvs=$cvs+1
+ if [[ $cvs -lt 3 ]]; then
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ fi
+
+ if ! use perl ; then
+ einfo "Disabling tests that need Perl"
+ disabled="${disabled} ${tests_perl}"
+ fi
+
+ einfo "Disabling tests that fail with SVN 1.7"
+ disabled="${disabled} ${test_svn}"
+
+ # Reset all previously disabled tests
+ cd "${S}/t"
+ for i in *.sh.DISABLED ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+ done
+ einfo "Disabled tests:"
+ for i in ${disabled} ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+ done
+
+ # Avoid the test system removing the results because we want them ourselves
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+ -i "${S}"/t/Makefile
+
+ # Clean old results first, must always run
+ cd "${S}/t"
+ nonfatal git_emake clean
+
+ # Now run the tests, keep going if we hit an error, and don't terminate on
+ # failure
+ cd "${S}"
+ einfo "Start test run"
+ #MAKEOPTS=-j1
+ nonfatal git_emake --keep-going test
+ rc=$?
+
+ # Display nice results, now print the results
+ cd "${S}/t"
+ nonfatal git_emake aggregate-results
+
+ # And bail if there was a problem
+ [ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+ local pkg=$1
+ shift
+ elog " $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+ einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
+ einfo "Note that the prompt bash code is now in the seperate script"
+ elog "These additional scripts need some dependencies:"
+ echo
+ showpkgdeps git-quiltimport "dev-util/quilt"
+ showpkgdeps git-instaweb \
+ "|| ( www-servers/lighttpd www-servers/apache )"
+ echo
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-1.8.5.2.ebuild b/dev-vcs/git/git-1.8.5.2.ebuild
new file mode 100644
index 0000000..048f393
--- /dev/null
+++ b/dev-vcs/git/git-1.8.5.2.ebuild
@@ -0,0 +1,619 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.2.ebuild,v 1.1 2013/12/18 12:19:16 polynomial-c Exp $
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_{6,7} )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI_SUFFIX="gz"
+ SRC_URI_GOOG="http://git-core.googlecode.com/files"
+ SRC_URI_KORG="mirror://kernel/software/scm/git"
+ SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ doc? (
+ ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ )"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ SRC_URI=""
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+ dev-libs/openssl
+ sys-libs/zlib
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl[-build(-)] )
+ tk? ( dev-lang/tk )
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ emacs? ( virtual/emacs )
+ gnome-keyring? ( gnome-base/gnome-keyring )"
+
+RDEPEND="${CDEPEND}
+ gpg? ( app-crypt/gnupg )
+ perl? ( dev-perl/Error
+ dev-perl/Net-SMTP-SSL
+ dev-perl/Authen-SASL
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
+ cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+ subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+ )
+ python? ( gtk?
+ (
+ >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+ >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+ )
+ ${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+ app-arch/cpio
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ sys-apps/texinfo
+ app-text/xmlto
+ )
+ test? (
+ app-crypt/gnupg
+ )"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ cgi? ( perl )
+ cvs? ( perl )
+ subversion? ( perl )
+ webdav? ( curl )
+ gtk? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+pkg_setup() {
+ if use subversion && has_version "dev-vcs/subversion[dso]"; then
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+ ewarn "have been warned."
+ fi
+ if use python ; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+ local myopts
+
+ if use blksha1 ; then
+ myopts="${myopts} BLK_SHA1=YesPlease"
+ elif use ppcsha1 ; then
+ myopts="${myopts} PPC_SHA1=YesPlease"
+ fi
+
+ if use curl ; then
+ use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ else
+ myopts="${myopts} NO_CURL=YesPlease"
+ fi
+
+ # broken assumptions, because of broken build system ...
+ myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts="${myopts} INSTALL=install TAR=tar"
+ myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts="${myopts} SANE_TOOL_PATH="
+ myopts="${myopts} OLD_ICONV="
+ myopts="${myopts} NO_EXTERNAL_GREP="
+
+ # For svn-fe
+ extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+ # can't define this to null, since the entire makefile depends on it
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+ use iconv \
+ || myopts="${myopts} NO_ICONV=YesPlease"
+ use nls \
+ || myopts="${myopts} NO_GETTEXT=YesPlease"
+ use tk \
+ || myopts="${myopts} NO_TCLTK=YesPlease"
+ use pcre \
+ && myopts="${myopts} USE_LIBPCRE=yes" \
+ && extlibs="${extlibs} -lpcre"
+ use perl \
+ && myopts="${myopts} INSTALLDIRS=vendor" \
+ || myopts="${myopts} NO_PERL=YesPlease"
+ use python \
+ || myopts="${myopts} NO_PYTHON=YesPlease"
+ use subversion \
+ || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+ use threads \
+ && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
+ || myopts="${myopts} NO_PTHREADS=YesPlease"
+ use cvs \
+ || myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+# if [[ ${CHOST} == *-mint* ]] ; then
+# myopts="${myopts} NO_MMAP=YesPlease"
+# myopts="${myopts} NO_IPV6=YesPlease"
+# myopts="${myopts} NO_STRLCPY=YesPlease"
+# myopts="${myopts} NO_MEMMEM=YesPlease"
+# myopts="${myopts} NO_MKDTEMP=YesPlease"
+# myopts="${myopts} NO_MKSTEMPS=YesPlease"
+# fi
+ if [[ ${CHOST} == ia64-*-hpux* ]]; then
+ myopts="${myopts} NO_NSEC=YesPlease"
+ fi
+ if [[ ${CHOST} == *-*-aix* ]]; then
+ myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+ fi
+ if [[ ${CHOST} == *-solaris* ]]; then
+ myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+ fi
+
+ has_version '>=app-text/asciidoc-8.0' \
+ && myopts="${myopts} ASCIIDOC8=YesPlease"
+ myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+ # Bug 290465:
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+ [[ "${CHOST}" == *-uclibc* ]] && \
+ myopts="${myopts} NO_NSEC=YesPlease"
+
+ export MY_MAKEOPTS="${myopts}"
+ export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ use doc && \
+ cd "${S}"/Documentation && \
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ else
+ git-2_src_unpack
+ cd "${S}"
+ #cp "${FILESDIR}"/GIT-VERSION-GEN .
+ fi
+
+}
+
+src_prepare() {
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch
+
+ sed -i \
+ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+ -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+ -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+ # Never install the private copy of Error.pm (bug #296310)
+ sed -i \
+ -e '/private-Error.pm/s,^,#,' \
+ perl/Makefile.PL
+
+ # Fix docbook2texi command
+ sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+ Documentation/Makefile || die "sed failed"
+
+ # Fix git-subtree missing DESTDIR
+ sed -i \
+ -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+ -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
+ contrib/subtree/Makefile
+}
+
+git_emake() {
+ # bug #326625: PERL_PATH, PERL_MM_OPT
+ # bug #320647: PYTHON_PATH
+ PYTHON_PATH=""
+ use python && PYTHON_PATH="${PYTHON}"
+ emake ${MY_MAKEOPTS} \
+ DESTDIR="${D}" \
+ OPTCFLAGS="${CFLAGS}" \
+ OPTLDFLAGS="${LDFLAGS}" \
+ OPTCC="$(tc-getCC)" \
+ OPTAR="$(tc-getAR)" \
+ prefix="${EPREFIX}"/usr \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ sysconfdir="${EPREFIX}"/etc \
+ PYTHON_PATH="${PYTHON_PATH}" \
+ PERL_MM_OPT="" \
+ GIT_TEST_OPTS="--no-color" \
+ V=1 \
+ "$@"
+ # This is the fix for bug #326625, but it also causes breakage, see bug
+ # #352693.
+ # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+ exportmakeopts
+}
+
+src_compile() {
+ if use perl ; then
+ git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+ git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+ fi
+ git_emake || die "emake failed"
+
+ if use emacs ; then
+ elisp-compile contrib/emacs/git{,-blame}.el
+ fi
+
+ if use perl && use cgi ; then
+ git_emake \
+ gitweb/gitweb.cgi \
+ || die "emake gitweb/gitweb.cgi failed"
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+ git_emake || die "emake credential-osxkeychain"
+ fi
+
+ cd "${S}"/Documentation
+ if [[ ${PV} == *9999 ]] ; then
+ git_emake man \
+ || die "emake man failed"
+ if use doc ; then
+ git_emake info html \
+ || die "emake info html failed"
+ fi
+ else
+ if use doc ; then
+ git_emake info \
+ || die "emake info html failed"
+ fi
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+ if use doc ; then
+ git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+ fi
+ cd "${S}"
+ fi
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ git_emake || die "emake git-credential-gnome-keyring failed"
+ fi
+
+ cd "${S}"/contrib/subtree
+ git_emake
+ use doc && git_emake doc
+}
+
+src_install() {
+ git_emake \
+ install || \
+ die "make install failed"
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+ fi
+
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+ dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ use doc && dodir /usr/share/doc/${PF}/html
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ use doc && dohtml -p ${d} Documentation${d}*.html
+ done
+ docinto /
+ # Upstream does not ship this pre-built :-(
+ use doc && doinfo Documentation/{git,gitman}.info
+
+ newbashcomp contrib/completion/git-completion.bash ${PN}
+ newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
+
+ if use emacs ; then
+ elisp-install ${PN} contrib/emacs/git.{el,elc}
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+ # don't add automatically to the load-path, so the sitefile
+ # can do a conditional loading
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ fi
+
+ if use python && use gtk ; then
+ python_doscript "${S}"/contrib/gitview/gitview
+ dodoc "${S}"/contrib/gitview/gitview.txt
+ fi
+
+ #dobin contrib/fast-import/git-p4 # Moved upstream
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream
+ newbin contrib/fast-import/import-tars.perl import-tars
+ exeinto /usr/libexec/git-core/
+ newexe contrib/git-resurrect.sh git-resurrect
+
+ # git-subtree
+ cd "${S}"/contrib/subtree
+ git_emake install || die "Failed to emake install git-subtree"
+ if use doc ; then
+ git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+ fi
+ newdoc README README.git-subtree
+ dodoc git-subtree.txt
+ cd "${S}"
+
+ # git-diffall
+ dobin contrib/diffall/git-diffall
+ newdoc contrib/diffall/README git-diffall.txt
+
+ # diff-highlight
+ dobin contrib/diff-highlight/diff-highlight
+ newdoc contrib/diff-highlight/README README.diff-highlight
+
+ # git-jump
+ exeinto /usr/libexec/git-core/
+ doexe contrib/git-jump/git-jump
+ newdoc contrib/git-jump/README git-jump.txt
+
+ # git-contacts
+ exeinto /usr/libexec/git-core/
+ doexe contrib/contacts/git-contacts
+ dodoc contrib/contacts/git-contacts.txt
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ dobin git-credential-gnome-keyring
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ dobin svn-fe
+ dodoc svn-fe.txt
+ use doc && doman svn-fe.1 && dohtml svn-fe.html
+ cd "${S}"
+ fi
+
+ # remote-helpers
+ if use python ; then
+ python_scriptinto /usr/libexec/git-core/
+ python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
+ python_optimize
+ fi
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # completion - installed above
+ # credential/gnome-keyring TODO
+ # diff-highlight - done above
+ # diffall - done above
+ # emacs - installed above
+ # examples - these are stuff that is not used in Git anymore actually
+ # git-jump - done above
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
+ # patches - stuff the Git guys made to go upstream to other places
+ # persistent-https - TODO
+ # mw-to-git - TODO
+ # subtree - build seperately
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ for i in \
+ buildsystems convert-objects fast-import \
+ hg-to-git hooks remotes2config.sh rerere-train.sh \
+ stats vim workdir \
+ ; do
+ cp -rf \
+ "${S}"/contrib/${i} \
+ "${ED}"/usr/share/${PN}/contrib \
+ || die "Failed contrib ${i}"
+ done
+
+ if use perl && use cgi ; then
+ # We used to install in /usr/share/${PN}/gitweb
+ # but upstream installs in /usr/share/gitweb
+ # so we will install a symlink and use their location for compat with other
+ # distros
+ dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+ # INSTALL discusses configuration issues, not just installation
+ docinto /
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
+ newdoc "${S}"/gitweb/README README.gitweb
+
+ find "${ED}"/usr/lib64/perl5/ \
+ -name .packlist \
+ -exec rm \{\} \;
+ else
+ rm -rf "${ED}"/usr/share/gitweb
+ fi
+
+ if ! use subversion ; then
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ if use !prefix ; then
+ newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+ systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+ systemd_dounit "${FILESDIR}/git-daemon.socket"
+ fi
+
+ fixlocalpod
+}
+
+src_test() {
+ local disabled=""
+ local tests_cvs="t9200-git-cvsexportcommit.sh \
+ t9400-git-cvsserver-server.sh \
+ t9401-git-cvsserver-crlf.sh \
+ t9402-git-cvsserver-refs.sh \
+ t9600-cvsimport.sh \
+ t9601-cvsimport-vendor-branch.sh \
+ t9602-cvsimport-branches-tags.sh \
+ t9603-cvsimport-patchsets.sh \
+ t9604-cvsimport-timestamps.sh"
+ local tests_perl="t3701-add-interactive.sh \
+ t5502-quickfetch.sh \
+ t5512-ls-remote.sh \
+ t5520-pull.sh \
+ t7106-reset-unborn-branch.sh \
+ t7501-commit.sh"
+ # Bug #225601 - t0004 is not suitable for root perm
+ # Bug #219839 - t1004 is not suitable for root perm
+ # t0001-init.sh - check for init notices EPERM* fails
+ local tests_nonroot="t0001-init.sh \
+ t0004-unwritable.sh \
+ t0070-fundamental.sh \
+ t1004-read-tree-m-u-wf.sh \
+ t3700-add.sh \
+ t7300-clean.sh"
+ # t9100 still fails with symlinks in SVN 1.7
+ local test_svn="t9100-git-svn-basic.sh"
+
+ # Unzip is used only for the testcase code, not by any normal parts of Git.
+ if ! has_version app-arch/unzip ; then
+ einfo "Disabling tar-tree tests"
+ disabled="${disabled} t5000-tar-tree.sh"
+ fi
+
+ cvs=0
+ use cvs && let cvs=$cvs+1
+ if [[ ${EUID} -eq 0 ]]; then
+ if [[ $cvs -eq 1 ]]; then
+ ewarn "Skipping CVS tests because CVS does not work as root!"
+ ewarn "You should retest with FEATURES=userpriv!"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ einfo "Skipping other tests that require being non-root"
+ disabled="${disabled} ${tests_nonroot}"
+ else
+ [[ $cvs -gt 0 ]] && \
+ has_version dev-vcs/cvs && \
+ let cvs=$cvs+1
+ [[ $cvs -gt 1 ]] && \
+ has_version "dev-vcs/cvs[server]" && \
+ let cvs=$cvs+1
+ if [[ $cvs -lt 3 ]]; then
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ fi
+
+ if ! use perl ; then
+ einfo "Disabling tests that need Perl"
+ disabled="${disabled} ${tests_perl}"
+ fi
+
+ einfo "Disabling tests that fail with SVN 1.7"
+ disabled="${disabled} ${test_svn}"
+
+ # Reset all previously disabled tests
+ cd "${S}/t"
+ for i in *.sh.DISABLED ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+ done
+ einfo "Disabled tests:"
+ for i in ${disabled} ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+ done
+
+ # Avoid the test system removing the results because we want them ourselves
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+ -i "${S}"/t/Makefile
+
+ # Clean old results first, must always run
+ cd "${S}/t"
+ nonfatal git_emake clean
+
+ # Now run the tests, keep going if we hit an error, and don't terminate on
+ # failure
+ cd "${S}"
+ einfo "Start test run"
+ #MAKEOPTS=-j1
+ nonfatal git_emake --keep-going test
+ rc=$?
+
+ # Display nice results, now print the results
+ cd "${S}/t"
+ nonfatal git_emake aggregate-results
+
+ # And bail if there was a problem
+ [ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+ local pkg=$1
+ shift
+ elog " $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+ einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
+ einfo "Note that the prompt bash code is now in the seperate script"
+ elog "These additional scripts need some dependencies:"
+ echo
+ showpkgdeps git-quiltimport "dev-util/quilt"
+ showpkgdeps git-instaweb \
+ "|| ( www-servers/lighttpd www-servers/apache )"
+ echo
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
new file mode 100644
index 0000000..4d4ee50
--- /dev/null
+++ b/dev-vcs/git/git-9999.ebuild
@@ -0,0 +1,618 @@
+# Copyright 1999-2013 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.50 2013/12/11 10:27:22 polynomial-c Exp $
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_{6,7} )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI_SUFFIX="gz"
+ SRC_URI_GOOG="http://git-core.googlecode.com/files"
+ SRC_URI_KORG="mirror://kernel/software/scm/git"
+ SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ doc? (
+ ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ )"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ SRC_URI=""
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+ dev-libs/openssl
+ sys-libs/zlib
+ pcre? ( dev-libs/libpcre )
+ perl? ( dev-lang/perl[-build(-)] )
+ tk? ( dev-lang/tk )
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ emacs? ( virtual/emacs )
+ gnome-keyring? ( gnome-base/gnome-keyring )"
+
+RDEPEND="${CDEPEND}
+ gpg? ( app-crypt/gnupg )
+ perl? ( dev-perl/Error
+ dev-perl/Net-SMTP-SSL
+ dev-perl/Authen-SASL
+ cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
+ cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+ subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+ )
+ python? ( gtk?
+ (
+ >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+ >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+ )
+ ${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+ app-arch/cpio
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ sys-apps/texinfo
+ app-text/xmlto
+ )
+ test? (
+ app-crypt/gnupg
+ )"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+ DEPEND="${DEPEND}
+ app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ cgi? ( perl )
+ cvs? ( perl )
+ subversion? ( perl )
+ webdav? ( curl )
+ gtk? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+pkg_setup() {
+ if use subversion && has_version "dev-vcs/subversion[dso]"; then
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+ ewarn "have been warned."
+ fi
+ if use python ; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+ local myopts
+
+ if use blksha1 ; then
+ myopts="${myopts} BLK_SHA1=YesPlease"
+ elif use ppcsha1 ; then
+ myopts="${myopts} PPC_SHA1=YesPlease"
+ fi
+
+ if use curl ; then
+ use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+ else
+ myopts="${myopts} NO_CURL=YesPlease"
+ fi
+
+ # broken assumptions, because of broken build system ...
+ myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+ myopts="${myopts} INSTALL=install TAR=tar"
+ myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+ myopts="${myopts} SANE_TOOL_PATH="
+ myopts="${myopts} OLD_ICONV="
+ myopts="${myopts} NO_EXTERNAL_GREP="
+
+ # For svn-fe
+ extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+ # can't define this to null, since the entire makefile depends on it
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+ use iconv \
+ || myopts="${myopts} NO_ICONV=YesPlease"
+ use nls \
+ || myopts="${myopts} NO_GETTEXT=YesPlease"
+ use tk \
+ || myopts="${myopts} NO_TCLTK=YesPlease"
+ use pcre \
+ && myopts="${myopts} USE_LIBPCRE=yes" \
+ && extlibs="${extlibs} -lpcre"
+ use perl \
+ && myopts="${myopts} INSTALLDIRS=vendor" \
+ || myopts="${myopts} NO_PERL=YesPlease"
+ use python \
+ || myopts="${myopts} NO_PYTHON=YesPlease"
+ use subversion \
+ || myopts="${myopts} NO_SVN_TESTS=YesPlease"
+ use threads \
+ && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
+ || myopts="${myopts} NO_PTHREADS=YesPlease"
+ use cvs \
+ || myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+# if [[ ${CHOST} == *-mint* ]] ; then
+# myopts="${myopts} NO_MMAP=YesPlease"
+# myopts="${myopts} NO_IPV6=YesPlease"
+# myopts="${myopts} NO_STRLCPY=YesPlease"
+# myopts="${myopts} NO_MEMMEM=YesPlease"
+# myopts="${myopts} NO_MKDTEMP=YesPlease"
+# myopts="${myopts} NO_MKSTEMPS=YesPlease"
+# fi
+ if [[ ${CHOST} == ia64-*-hpux* ]]; then
+ myopts="${myopts} NO_NSEC=YesPlease"
+ fi
+ if [[ ${CHOST} == *-*-aix* ]]; then
+ myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+ fi
+ if [[ ${CHOST} == *-solaris* ]]; then
+ myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+ fi
+
+ has_version '>=app-text/asciidoc-8.0' \
+ && myopts="${myopts} ASCIIDOC8=YesPlease"
+ myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+ # Bug 290465:
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+ [[ "${CHOST}" == *-uclibc* ]] && \
+ myopts="${myopts} NO_NSEC=YesPlease"
+
+ export MY_MAKEOPTS="${myopts}"
+ export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ use doc && \
+ cd "${S}"/Documentation && \
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ cd "${S}"
+ else
+ git-2_src_unpack
+ cd "${S}"
+ #cp "${FILESDIR}"/GIT-VERSION-GEN .
+ fi
+
+}
+
+src_prepare() {
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch
+
+ sed -i \
+ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+ -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+ -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+ # Never install the private copy of Error.pm (bug #296310)
+ sed -i \
+ -e '/private-Error.pm/s,^,#,' \
+ perl/Makefile.PL
+
+ # Fix docbook2texi command
+ sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+ Documentation/Makefile || die "sed failed"
+
+ # Fix git-subtree missing DESTDIR
+ sed -i \
+ -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+ -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
+ contrib/subtree/Makefile
+}
+
+git_emake() {
+ # bug #326625: PERL_PATH, PERL_MM_OPT
+ # bug #320647: PYTHON_PATH
+ PYTHON_PATH=""
+ use python && PYTHON_PATH="${PYTHON}"
+ emake ${MY_MAKEOPTS} \
+ DESTDIR="${D}" \
+ OPTCFLAGS="${CFLAGS}" \
+ OPTLDFLAGS="${LDFLAGS}" \
+ OPTCC="$(tc-getCC)" \
+ OPTAR="$(tc-getAR)" \
+ prefix="${EPREFIX}"/usr \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ sysconfdir="${EPREFIX}"/etc \
+ PYTHON_PATH="${PYTHON_PATH}" \
+ PERL_MM_OPT="" \
+ GIT_TEST_OPTS="--no-color" \
+ V=1 \
+ "$@"
+ # This is the fix for bug #326625, but it also causes breakage, see bug
+ # #352693.
+ # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+ exportmakeopts
+}
+
+src_compile() {
+ if use perl ; then
+ git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+ git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+ fi
+ git_emake || die "emake failed"
+
+ if use emacs ; then
+ elisp-compile contrib/emacs/git{,-blame}.el
+ fi
+
+ if use perl && use cgi ; then
+ git_emake \
+ gitweb/gitweb.cgi \
+ || die "emake gitweb/gitweb.cgi failed"
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+ git_emake || die "emake credential-osxkeychain"
+ fi
+
+ cd "${S}"/Documentation
+ if [[ ${PV} == *9999 ]] ; then
+ git_emake man \
+ || die "emake man failed"
+ if use doc ; then
+ git_emake info html \
+ || die "emake info html failed"
+ fi
+ else
+ if use doc ; then
+ git_emake info \
+ || die "emake info html failed"
+ fi
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+ if use doc ; then
+ git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+ fi
+ cd "${S}"
+ fi
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ git_emake || die "emake git-credential-gnome-keyring failed"
+ fi
+
+ cd "${S}"/contrib/subtree
+ git_emake
+ use doc && git_emake doc
+}
+
+src_install() {
+ git_emake \
+ install || \
+ die "make install failed"
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+ fi
+
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+ dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+ use doc && dodir /usr/share/doc/${PF}/html
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ use doc && dohtml -p ${d} Documentation${d}*.html
+ done
+ docinto /
+ # Upstream does not ship this pre-built :-(
+ use doc && doinfo Documentation/{git,gitman}.info
+
+ newbashcomp contrib/completion/git-completion.bash ${PN}
+ newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
+
+ if use emacs ; then
+ elisp-install ${PN} contrib/emacs/git.{el,elc}
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+ # don't add automatically to the load-path, so the sitefile
+ # can do a conditional loading
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ fi
+
+ if use python && use gtk ; then
+ python_doscript "${S}"/contrib/gitview/gitview
+ dodoc "${S}"/contrib/gitview/gitview.txt
+ fi
+
+ #dobin contrib/fast-import/git-p4 # Moved upstream
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream
+ newbin contrib/fast-import/import-tars.perl import-tars
+ exeinto /usr/libexec/git-core/
+ newexe contrib/git-resurrect.sh git-resurrect
+
+ # git-subtree
+ cd "${S}"/contrib/subtree
+ git_emake install || die "Failed to emake install git-subtree"
+ if use doc ; then
+ git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+ fi
+ newdoc README README.git-subtree
+ dodoc git-subtree.txt
+ cd "${S}"
+
+ # git-diffall
+ dobin contrib/diffall/git-diffall
+ newdoc contrib/diffall/README git-diffall.txt
+
+ # diff-highlight
+ dobin contrib/diff-highlight/diff-highlight
+ newdoc contrib/diff-highlight/README README.diff-highlight
+
+ # git-jump
+ exeinto /usr/libexec/git-core/
+ doexe contrib/git-jump/git-jump
+ newdoc contrib/git-jump/README git-jump.txt
+
+ # git-contacts
+ exeinto /usr/libexec/git-core/
+ doexe contrib/contacts/git-contacts
+ dodoc contrib/contacts/git-contacts.txt
+
+ if use gnome-keyring ; then
+ cd "${S}"/contrib/credential/gnome-keyring
+ dobin git-credential-gnome-keyring
+ fi
+
+ if use subversion ; then
+ cd "${S}"/contrib/svn-fe
+ dobin svn-fe
+ dodoc svn-fe.txt
+ use doc && doman svn-fe.1 && dohtml svn-fe.html
+ cd "${S}"
+ fi
+
+ # remote-helpers
+ if use python ; then
+ python_scriptinto /usr/libexec/git-core/
+ python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
+ python_optimize
+ fi
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # completion - installed above
+ # credential/gnome-keyring TODO
+ # diff-highlight - done above
+ # diffall - done above
+ # emacs - installed above
+ # examples - these are stuff that is not used in Git anymore actually
+ # git-jump - done above
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
+ # patches - stuff the Git guys made to go upstream to other places
+ # persistent-https - TODO
+ # mw-to-git - TODO
+ # subtree - build seperately
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ for i in \
+ buildsystems convert-objects fast-import \
+ hg-to-git hooks remotes2config.sh rerere-train.sh \
+ stats vim workdir \
+ ; do
+ cp -rf \
+ "${S}"/contrib/${i} \
+ "${ED}"/usr/share/${PN}/contrib \
+ || die "Failed contrib ${i}"
+ done
+
+ if use perl && use cgi ; then
+ # We used to install in /usr/share/${PN}/gitweb
+ # but upstream installs in /usr/share/gitweb
+ # so we will install a symlink and use their location for compat with other
+ # distros
+ dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+ # INSTALL discusses configuration issues, not just installation
+ docinto /
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
+ newdoc "${S}"/gitweb/README README.gitweb
+
+ find "${ED}"/usr/lib64/perl5/ \
+ -name .packlist \
+ -exec rm \{\} \;
+ else
+ rm -rf "${ED}"/usr/share/gitweb
+ fi
+
+ if ! use subversion ; then
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ if use !prefix ; then
+ newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+ systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+ systemd_dounit "${FILESDIR}/git-daemon.socket"
+ fi
+
+ fixlocalpod
+}
+
+src_test() {
+ local disabled=""
+ local tests_cvs="t9200-git-cvsexportcommit.sh \
+ t9400-git-cvsserver-server.sh \
+ t9401-git-cvsserver-crlf.sh \
+ t9600-cvsimport.sh \
+ t9601-cvsimport-vendor-branch.sh \
+ t9602-cvsimport-branches-tags.sh \
+ t9603-cvsimport-patchsets.sh \
+ t9604-cvsimport-timestamps.sh"
+ local tests_perl="t3701-add-interactive.sh \
+ t5502-quickfetch.sh \
+ t5512-ls-remote.sh \
+ t5520-pull.sh \
+ t7106-reset-unborn-branch.sh \
+ t7501-commit.sh"
+ # Bug #225601 - t0004 is not suitable for root perm
+ # Bug #219839 - t1004 is not suitable for root perm
+ # t0001-init.sh - check for init notices EPERM* fails
+ local tests_nonroot="t0001-init.sh \
+ t0004-unwritable.sh \
+ t0070-fundamental.sh \
+ t1004-read-tree-m-u-wf.sh \
+ t3700-add.sh \
+ t7300-clean.sh"
+ # t9100 still fails with symlinks in SVN 1.7
+ local test_svn="t9100-git-svn-basic.sh"
+
+ # Unzip is used only for the testcase code, not by any normal parts of Git.
+ if ! has_version app-arch/unzip ; then
+ einfo "Disabling tar-tree tests"
+ disabled="${disabled} t5000-tar-tree.sh"
+ fi
+
+ cvs=0
+ use cvs && let cvs=$cvs+1
+ if [[ ${EUID} -eq 0 ]]; then
+ if [[ $cvs -eq 1 ]]; then
+ ewarn "Skipping CVS tests because CVS does not work as root!"
+ ewarn "You should retest with FEATURES=userpriv!"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ einfo "Skipping other tests that require being non-root"
+ disabled="${disabled} ${tests_nonroot}"
+ else
+ [[ $cvs -gt 0 ]] && \
+ has_version dev-vcs/cvs && \
+ let cvs=$cvs+1
+ [[ $cvs -gt 1 ]] && \
+ has_version "dev-vcs/cvs[server]" && \
+ let cvs=$cvs+1
+ if [[ $cvs -lt 3 ]]; then
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+ disabled="${disabled} ${tests_cvs}"
+ fi
+ fi
+
+ if ! use perl ; then
+ einfo "Disabling tests that need Perl"
+ disabled="${disabled} ${tests_perl}"
+ fi
+
+ einfo "Disabling tests that fail with SVN 1.7"
+ disabled="${disabled} ${test_svn}"
+
+ # Reset all previously disabled tests
+ cd "${S}/t"
+ for i in *.sh.DISABLED ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+ done
+ einfo "Disabled tests:"
+ for i in ${disabled} ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+ done
+
+ # Avoid the test system removing the results because we want them ourselves
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+ -i "${S}"/t/Makefile
+
+ # Clean old results first, must always run
+ cd "${S}/t"
+ nonfatal git_emake clean
+
+ # Now run the tests, keep going if we hit an error, and don't terminate on
+ # failure
+ cd "${S}"
+ einfo "Start test run"
+ #MAKEOPTS=-j1
+ nonfatal git_emake --keep-going test
+ rc=$?
+
+ # Display nice results, now print the results
+ cd "${S}/t"
+ nonfatal git_emake aggregate-results
+
+ # And bail if there was a problem
+ [ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+ local pkg=$1
+ shift
+ elog " $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+ einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
+ einfo "Note that the prompt bash code is now in the seperate script"
+ elog "These additional scripts need some dependencies:"
+ echo
+ showpkgdeps git-quiltimport "dev-util/quilt"
+ showpkgdeps git-instaweb \
+ "|| ( www-servers/lighttpd www-servers/apache )"
+ echo
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml
new file mode 100644
index 0000000..106f3a8
--- /dev/null
+++ b/dev-vcs/git/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>robbat2@gentoo.org</email>
+ <name>Robin H. Johnson</name>
+ </maintainer>
+ <maintainer>
+ <email>prometheanfire@gentoo.org</email>
+ </maintainer>
+ <maintainer>
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
+ <longdescription lang="en">
+ Git - Fast Version Control System. Official titled
+ "GIT - the stupid content tracker".
+
+ Git is a popular version control system designed to handle very large
+ projects with speed and efficiency; it is used mainly for various open
+ source projects, most notably the Linux kernel.
+
+ Git falls in the category of distributed source code management tools,
+ similar to e.g. GNU Arch or Monotone (or BitKeeper in the proprietary
+ world). Every Git working directory is a full-fledged repository with full
+ revision tracking capabilities, not dependent on network access or a central
+ server.
+ </longdescription>
+ <use>
+ <flag name="blksha1">Use the new optimized SHA1 implementation</flag>
+ <flag name="cgi">Install gitweb too</flag>
+ <flag name="curl">Support fetching and pushing (requires webdav too) over http:// and https:// protocols</flag>
+ <flag name="gpg">Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime!</flag>
+ <flag name="gtk">Include the gitview contrib tool</flag>
+ <flag name="highlight">GitWeb support for app-text/highlight</flag>
+ <flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag>
+ <flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag>
+ <flag name="webdav">Adds support for push'ing to HTTP/HTTPS repositories via DAV</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: dev-vcs/git/, dev-vcs/git/files/
@ 2014-01-04 19:55 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2014-01-04 19:55 UTC (permalink / raw
To: gentoo-commits
commit: 7c990a218af32e00e4a79ba0ec066d31e7dad884
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 4 19:55:48 2014 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 4 19:56:24 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=7c990a21
[dev-vcs/git] clean up
Package-Manager: portage-2.2.7
---
dev-vcs/git/ChangeLog | 288 ---
dev-vcs/git/ChangeLog-2012 | 2705 --------------------
dev-vcs/git/Manifest | 55 -
.../git/files/git-1.7.12-git-svn-backport.patch | 1288 ----------
dev-vcs/git/files/git-1.7.12-optional-cvs.patch | 368 ---
dev-vcs/git/files/git-1.8.2-texinfo.patch | 19 -
dev-vcs/git/files/git-1.8.4-optional-cvs.patch | 370 ---
dev-vcs/git/git-1.8.1.5-r1.ebuild | 600 -----
dev-vcs/git/git-1.8.1.5.ebuild | 598 -----
dev-vcs/git/git-1.8.2.1.ebuild | 610 -----
dev-vcs/git/git-1.8.4.5.ebuild | 619 -----
dev-vcs/git/git-1.8.5.1.ebuild | 619 -----
12 files changed, 8139 deletions(-)
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
deleted file mode 100644
index ab73814..0000000
--- a/dev-vcs/git/ChangeLog
+++ /dev/null
@@ -1,288 +0,0 @@
-# ChangeLog for dev-vcs/git
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.236 2013/12/18 12:19:15 polynomial-c Exp $
-
-*git-1.8.5.2 (18 Dec 2013)
-
- 18 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> +git-1.8.5.2.ebuild:
- Version bump.
-
- 11 Dec 2013; Sergey Popov <pinkbyte@gentoo.org> git-1.8.3.2-r1.ebuild:
- Stable on arm, wrt bug #480306
-
- 11 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> git-1.8.1.5.ebuild,
- git-1.8.1.5-r1.ebuild, git-1.8.2.1.ebuild, git-1.8.3.2-r1.ebuild,
- git-1.8.4.5.ebuild, git-1.8.5.1.ebuild, git-9999.ebuild:
- Added t9402-git-cvsserver-refs.sh and t9604-cvsimport-timestamps.sh to the
- cvs-only tests (bug #492556).
-
- 09 Dec 2013; Mikle Kolyada <zlogene@gentoo.org> git-1.8.3.2-r1.ebuild:
- ia64 stable wrt bug #480306
-
- 07 Dec 2013; Johannes Huber <johu@gentoo.org> git-1.8.3.2-r1.ebuild:
- x86 stable, bug #480306
-
- 06 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> git-1.8.1.5.ebuild,
- git-1.8.1.5-r1.ebuild, git-1.8.2.1.ebuild, -git-1.8.3.2.ebuild,
- -git-1.8.4.ebuild, -git-1.8.4.2.ebuild, -git-1.8.4.3.ebuild,
- -git-1.8.4.4.ebuild:
- Fixed remaining ebuilds who suffer from bug #485166. Removed some older
- versions.
-
- 05 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> git-9999.ebuild:
- Added changes to live ebuild.
-
-*git-1.8.5.1 (05 Dec 2013)
-
- 05 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> -git-1.6.4.5.ebuild,
- -git-1.7.2.5.ebuild, -git-1.7.3.4-r1.ebuild, -git-1.7.8.6.ebuild,
- -git-1.7.12.4.ebuild, -git-1.8.0.2.ebuild, +git-1.8.5.1.ebuild,
- -files/git-1.6.6.1-interix6.patch, -files/git-1.7.1-interix.patch,
- -files/git-1.7.2-always-install-js.patch, -files/git-1.7.3.2-interix.patch,
- -files/git-1.7.3.4-avoid-shell-issues.patch,
- -files/git-1.7.3.4-fix-perl-test-prereq.patch,
- -files/git-1.7.3.5-optional-cvs.patch, -files/git-1.7.11-optional-cvs.patch,
- +files/git-1.8.5-optional-cvs.patch, metadata.xml:
- Version bump. Removed old.
-
-*git-1.8.4.5 (04 Dec 2013)
-
- 04 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> +git-1.8.4.5.ebuild:
- Version bump (bug #493348).
-
-*git-1.8.4.4 (21 Nov 2013)
-
- 21 Nov 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.4.4.ebuild:
- Bump.
-
- 09 Nov 2013; Pacho Ramos <pacho@gentoo.org> git-1.8.3.2-r1.ebuild:
- amd64 stable, bug #480306
-
-*git-1.8.4.3 (09 Nov 2013)
-
- 09 Nov 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.4.3.ebuild:
- Bump.
-
- 06 Nov 2013; Patrick Lauer <patrick@gentoo.org> git-1.8.3.2-r1.ebuild:
- Un-stabling for amd64 as dependencies are not ready
-
- 05 Nov 2013; Mikle Kolyada <zlogene@gentoo.org> git-1.8.3.2-r1.ebuild:
- amd64 stable wrt bug #480306
-
- 03 Nov 2013; Matt Turner <mattst88@gentoo.org> git-1.8.3.2-r1.ebuild:
- alpha stable, bug 480306.
-
- 03 Nov 2013; Matthew Thode <prometheanfire@gentoo.org> metadata.xml:
- just adding myself to the list of maintianers
-
- 01 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> metadata.xml:
- Added myself as maintainer.
-
-*git-1.8.4.2 (28 Oct 2013)
-
- 28 Oct 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.4.2.ebuild:
- Bump.
-
- 20 Oct 2013; Fabian Groffen <grobian@gentoo.org> git-1.8.4.ebuild,
- git-9999.ebuild:
- Fix sed expression not to be too greedy, bug #488440
-
- 17 Oct 2013; Jeroen Roovers <jer@gentoo.org> git-1.8.3.2-r1.ebuild:
- Stable for HPPA (bug #480306).
-
-*git-1.8.3.2-r1 (15 Oct 2013)
-
- 15 Oct 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.3.2-r1.ebuild:
- Backport fixes for bug #477096: Fix git-remote-bzr file collision & bug
- #479628: Fix pthread usage to 1.8.3.
-
-*git-1.8.4 (15 Oct 2013)
-
- 15 Oct 2013; Robin H. Johnson <robbat2@gentoo.org>
- +files/git-1.8.4-optional-cvs.patch, +git-1.8.4.ebuild, git-9999.ebuild:
- Bug #485844: Bump. Bug #477096: Fix git-remote-bzr file collision. Bug
- #479628: Fix pthread usage.
-
- 15 Oct 2013; Mikle Kolyada <zlogene@gentoo.org> git-1.8.1.5-r1.ebuild:
- x86 stable wrt bug #480054
-
- 14 Oct 2013; Tony Vroon <chainsaw@gentoo.org> git-1.8.1.5-r1.ebuild:
- Marked stable on AMD64 based on arch tester report by Elijah "Armageddon" El
- Lazkani in bug #480054.
-
- 07 Oct 2013; William Hubbs <williamh@gentoo.org> git-9999.ebuild:
- sync live ebuild
-
- 07 Oct 2013; Rick Farina <zerochaos@gentoo.org> git-1.8.3.2.ebuild:
- changing dep to make error message more useful because earlier version of dev-
- python/pygtksourceview:2 have no []
-
- 06 Oct 2013; Jeroen Roovers <jer@gentoo.org> git-1.8.1.5-r1.ebuild:
- Stable for HPPA (bug #480054).
-
- 06 Oct 2013; Markus Meier <maekke@gentoo.org> git-1.8.1.5-r1.ebuild:
- arm stable, bug #480054
-
-*git-1.8.1.5-r1 (28 Sep 2013)
-
- 28 Sep 2013; Pacho Ramos <pacho@gentoo.org> +git-1.8.1.5-r1.ebuild:
- Backport unit files to allow faster stabilization
-
- 16 Sep 2013; Michał Górny <mgorny@gentoo.org> git-1.8.3.2.ebuild,
- git-9999.ebuild:
- Use ${PYTHON} rather than $(python_get_PYTHON). It is exported anyway.
-
- 31 Jul 2013; Matt Turner <mattst88@gentoo.org> git-1.8.3.2.ebuild,
- git-9999.ebuild:
- Allow building against >=dev-lang/perl-5.16 without 'build' in IUSE.
-
- 26 Jul 2013; William Hubbs <williamh@gentoo.org> git-9999.ebuild:
- non-maintainer commit: sync live ebuild with git-1.8.3.2.
-
- 15 Jul 2013; Jonathan Callen <abcd@gentoo.org> git-1.8.3.2.ebuild:
- Non-maintainer update: make ${PYTHON_REQUIRED_USE} conditional on USE=python;
- fix pygtk and pygtksourceview deps to require that they be built with the same
- version of python as this package; replace built_with_use calls with
- has_version; remove python 2.5 support as none of the dependencies support it.
-
- 11 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> git-1.8.3.2.ebuild:
- Non-maintainer commit: Fixed test failure when built with USE="-perl" (bug
- #476472). Also fixed wrong located python_optimize call. Thanks to Arfrever
- for pointing this out in IRC and mgorny for giving advice how to fix this.
-
-*git-1.8.3.2 (09 Jul 2013)
-
- 09 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> +git-1.8.3.2.ebuild:
- Non-maintainer commit: Version bump (bug #467856). Converted ebuild to EAPI-5
- and python-single-r1 eclass. Added gtk -> python REQUIRED_USE (bug #451374).
- Hopefully fixed test failure with USE=-perl (bug #470592). Added installation
- of git-remote-hg (bug #465808) and git-remote-bzr with USE=python.
-
- 18 May 2013; Fabio Erculiani <lxnay@gentoo.org> git-1.8.2.1.ebuild,
- git-9999.ebuild, +files/git-daemon.socket, +files/git-daemon_at.service:
- add systemd unit supporting socket activation to 1.8.21 and 9999, fix bug
- #468846
-
- 19 Apr 2013; Mike Frysinger <vapier@gentoo.org> git-1.8.2.1.ebuild:
- Add missing pthreads linkage for svn-fe #466178 by Mike Gilbert.
-
- 17 Apr 2013; Robin H. Johnson <robbat2@gentoo.org> git-1.8.2.1.ebuild:
- Bug #466178: better use of variables to make svn-fe always compile right.
-
-*git-1.8.2.1 (16 Apr 2013)
-
- 16 Apr 2013; Robin H. Johnson <robbat2@gentoo.org>
- +files/git-1.8.2-optional-cvs.patch, +files/git-1.8.2-texinfo.patch,
- +git-1.8.2.1.ebuild:
- Verbump. Bug #464210: fix texinfo 5.1 @anchor handling.
-
- 19 Mar 2013; Agostino Sarubbo <ago@gentoo.org> -git-1.7.12-r1.ebuild,
- -git-1.7.12-r2.ebuild, -git-1.7.12.3-r1.ebuild, -git-1.7.12.3.ebuild,
- -git-1.7.12.ebuild, -git-1.8.0-r1.ebuild, -git-1.8.0.ebuild,
- -git-1.8.1.1.ebuild, -git-1.8.1.2.ebuild, -git-1.8.1.4.ebuild,
- -git-1.8.1.ebuild:
- Remove old
-
- 10 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
- Stable for s390, wrt bug #459158
-
- 09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
- Stable for sparc, wrt bug #459158
-
- 09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
- Stable for ia64, wrt bug #459158
-
- 09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
- Stable for alpha, wrt bug #459158
-
- 09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
- Stable for ppc64, wrt bug #459158
-
- 08 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
- Stable for arm, wrt bug #459158
-
- 06 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
- Stable for sh, wrt bug #459158
-
- 05 Mar 2013; Jeroen Roovers <jer@gentoo.org> git-1.8.1.5.ebuild:
- Stable for HPPA (bug #459158).
-
- 04 Mar 2013; Brent Baude <ranger@gentoo.org> git-1.8.1.5.ebuild:
- Marking git-1.8.1.5 ppc for bug 459158
-
- 04 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
- Stable for x86, wrt bug #459158
-
- 04 Mar 2013; Agostino Sarubbo <ago@gentoo.org> git-1.8.1.5.ebuild:
- Stable for amd64, wrt bug #459158
-
-*git-1.8.1.5 (01 Mar 2013)
-
- 01 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.1.5.ebuild:
- Bump.
-
- 24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
- Stable for sh, wrt bug #436704
-
- 22 Feb 2013; Zac Medico <zmedico@gentoo.org> git-1.8.1.2.ebuild,
- git-1.8.1.4.ebuild, git-9999.ebuild:
- Add ~arm-linux keywords.
-
-*git-1.8.1.4 (20 Feb 2013)
-
- 20 Feb 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.1.4.ebuild:
- Bump.
-
- 20 Feb 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
- Stable for s390, wrt bug #436704
-
- 29 Jan 2013; Fabian Groffen <grobian@gentoo.org> git-1.8.0.2.ebuild,
- git-1.8.1.2.ebuild:
- Do not install git daemon init.d script on Prefix
-
-*git-1.8.1.2 (28 Jan 2013)
-
- 28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.1.2.ebuild:
- Autobump.
-
- 21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
- Stable for sparc, wrt bug #436704
-
- 21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
- Stable for ia64, wrt bug #436704
-
- 20 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
- Stable for alpha, wrt bug #436704
-
- 16 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
- Stable for ppc64, wrt bug #436704
-
- 16 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
- Stable for ppc, wrt bug #436704
-
- 15 Jan 2013; Markus Meier <maekke@gentoo.org> git-1.7.12.4.ebuild:
- arm stable, bug #436704
-
-*git-1.8.1.1 (15 Jan 2013)
-
- 15 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.1.1.ebuild:
- Bump.
-
- 15 Jan 2013; Jeroen Roovers <jer@gentoo.org> git-1.7.12.4.ebuild:
- Stable for HPPA (bug #436704).
-
- 10 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
- Stable for x86, wrt bug #436704
-
- 10 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
- Stable for amd64, wrt bug #436704
-
-*git-1.8.1 (03 Jan 2013)
-
- 03 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.1.ebuild:
- Bump.
-
- 01 Jan 2013; Andreas K. Huettel <dilfridge@gentoo.org> +ChangeLog-2012:
- Split ChangeLog.
-
- For previous entries, please see ChangeLog-2012.
diff --git a/dev-vcs/git/ChangeLog-2012 b/dev-vcs/git/ChangeLog-2012
deleted file mode 100644
index 0efb9f3..0000000
--- a/dev-vcs/git/ChangeLog-2012
+++ /dev/null
@@ -1,2705 +0,0 @@
-# ChangeLog for dev-vcs/git
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog-2012,v 1.1 2013/01/01 13:19:51 dilfridge Exp $
-
-*git-1.8.0.2 (11 Dec 2012)
-
- 11 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.0.2.ebuild:
- Bump.
-
- 06 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> git-1.8.0-r1.ebuild,
- git-9999.ebuild:
- Bug #441740: Update doc build deps.
-
- 18 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
- Bug #439154: Copy latest ebuild back to 9999 revision.
-
- 09 Nov 2012; Fabian Groffen <grobian@gentoo.org> git-1.8.0-r1.ebuild,
- git-9999.ebuild:
- Fix linking on Solaris, it needs libiconv
-
-*git-1.8.0-r1 (02 Nov 2012)
-
- 02 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.0-r1.ebuild:
- Update contrib extras, per bug #434098.
-
-*git-1.8.0 (02 Nov 2012)
-
- 02 Nov 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.0.ebuild:
- Bump.
-
- 31 Oct 2012; Mike Frysinger <vapier@gentoo.org> metadata.xml:
- Add information on USE=curl.
-
-*git-1.7.12.4 (18 Oct 2012)
-
- 18 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.12.4.ebuild:
- Bump.
-
-*git-1.7.12.3-r1 (11 Oct 2012)
-
- 11 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.12.3-r1.ebuild:
- 1.7.12.3 was based off 1.7.12-r1 instead of 1.7.12-r2, revbump to get the
- other fixes again.
-
-*git-1.7.12.3 (10 Oct 2012)
-
- 10 Oct 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.12.3.ebuild:
- Version bump per bug 437870.
-
- 24 Aug 2012; Robin H. Johnson <robbat2@gentoo.org>
- -files/git-1.7.10.2-optional-cvs.patch,
- -files/git-1.7.11.1-optional-cvs.patch, -files/git-1.7.5-interix.patch,
- -files/git-1.7.6-interix.patch,
- -files/git-1.7.8-git-svn-1.7-canonical-path.patch, -git-1.7.10.2.ebuild,
- -git-1.7.10.ebuild, -git-1.7.11.1.ebuild, -git-1.7.9.1.ebuild,
- -git-1.7.9.2.ebuild, -git-1.7.9.3.ebuild, -git-1.7.9.4.ebuild,
- -git-1.7.9.7.ebuild, -git-1.7.9.ebuild, -git-1.7.9_rc2.ebuild:
- Trim versions that were always masked.
-
- 24 Aug 2012; Robin H. Johnson <robbat2@gentoo.org> git-1.7.12-r2.ebuild,
- git-1.7.8.6.ebuild:
- Warn about the bash completion split: prompt is now in a seperate bashcomp
- file.
-
- 24 Aug 2012; Zac Medico <zmedico@gentoo.org> git-1.7.10.2.ebuild,
- git-1.7.10.ebuild, git-1.7.11.1.ebuild, git-1.7.12-r1.ebuild,
- git-1.7.12-r2.ebuild, git-1.7.12.ebuild, git-1.7.9.1.ebuild,
- git-1.7.9.2.ebuild, git-1.7.9.3.ebuild, git-1.7.9.4.ebuild,
- git-1.7.9.7.ebuild, git-1.7.9.ebuild, git-1.7.9_rc2.ebuild, git-9999.ebuild:
- Fix IUSE.missing for new highlight flag.
-
- 23 Aug 2012; Robin H. Johnson <robbat2@gentoo.org> git-1.6.4.5.ebuild,
- git-1.7.10.2.ebuild, git-1.7.10.ebuild, git-1.7.11.1.ebuild,
- git-1.7.12-r1.ebuild, git-1.7.12-r2.ebuild, git-1.7.12.ebuild,
- git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild, git-1.7.8.6.ebuild,
- git-1.7.9.1.ebuild, git-1.7.9.2.ebuild, git-1.7.9.3.ebuild,
- git-1.7.9.4.ebuild, git-1.7.9.7.ebuild, git-1.7.9.ebuild,
- git-1.7.9_rc2.ebuild, git-9999.ebuild, metadata.xml:
- Bug #432388: Make app-text/highlight optional as has heavy dependencies and is
- disabled by default in gitweb.
-
-*git-1.7.12-r2 (23 Aug 2012)
-
- 23 Aug 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.12-r2.ebuild,
- files/git-daemon.confd:
- Bug #373335: missing --base-path in conf.d/git. Bug #414437: OpenSSL is
- required for more parts of Git now. Bug #423605: OSX keychain helper. Bug
- #432328: Upstream has split the bash completion in two parts: git & git-
- prompt; the latter defines __git_ps1 for your nice prompt.
-
- 22 Aug 2012; Zac Medico <zmedico@gentoo.org> git-1.7.12-r1.ebuild:
- Quick fix for USE=-perl.
-
- 22 Aug 2012; Robin H. Johnson <robbat2@gentoo.org> git-1.7.12-r1.ebuild,
- git-1.7.12.ebuild, git-9999.ebuild:
- ~amd64-fbsd was not placed in all ebuilds. Also sync live ebuild.
-
-*git-1.7.12-r1 (22 Aug 2012)
-*git-1.7.12 (22 Aug 2012)
-
- 22 Aug 2012; Robin H. Johnson <robbat2@gentoo.org>
- +files/git-1.7.12-git-svn-backport.patch,
- +files/git-1.7.12-optional-cvs.patch, +git-1.7.12-r1.ebuild,
- +git-1.7.12.ebuild:
- Finally, a Git that works with SVN 1.7, per bug #418431! 1.7.12-r1 contains
- backported ms/git-svn-1.7 branch that will be merged into Git 1.7.13.
- 1.7.12-r0 excludes that backport but is otherwise identical. Thanks to Michael
- Schwern for the development work!
-
- 19 Aug 2012; Raúl Porcel <armin76@gentoo.org> git-1.7.8.6.ebuild:
- alpha/s390/sh/sparc stable wrt #418381
-
- 27 Jul 2012; Fabian Groffen <grobian@gentoo.org> git-1.7.8.6.ebuild,
- git-1.7.9.7.ebuild:
- Fix compilation on Solaris (libiconv), set perl path correctly for Prefix,
- drop applied/commented out interix patches
-
- 14 Jul 2012; Markus Meier <maekke@gentoo.org> git-1.7.8.6.ebuild:
- arm stable, bug #418381
-
- 10 Jul 2012; Brent Baude <ranger@gentoo.org> git-1.7.8.6.ebuild:
- Marking git-1.7.8.6 ppc64 for bug 418381
-
- 10 Jul 2012; Akinori Hattori <hattya@gentoo.org> git-1.7.8.6.ebuild:
- ia64 stable wrt bug #418381
-
- 08 Jul 2012; Michael Weber <xmw@gentoo.org> git-1.7.8.6.ebuild:
- ppc stable (bug 418381)
-
-*git-1.7.11.1 (07 Jul 2012)
-
- 07 Jul 2012; Robin H. Johnson <robbat2@gentoo.org>
- +files/git-1.7.11.1-optional-cvs.patch, +git-1.7.11.1.ebuild:
- Version bump. Still suffers from bug #391707: git-svn failures.
-
- 03 Jul 2012; Jeroen Roovers <jer@gentoo.org> git-1.7.8.6.ebuild:
- Stable for HPPA (bug #418381).
-
- 02 Jul 2012; Jeff Horelick <jdhore@gentoo.org> git-1.7.8.6.ebuild:
- marked x86 per bug 418381
-
- 27 Jun 2012; Agostino Sarubbo <ago@gentoo.org> git-1.7.8.6.ebuild:
- Stable for amd64, wrt bug #418381
-
- 26 Jun 2012; Jeremy Olexa <darkside@gentoo.org> -git-1.7.3.5-r2.ebuild,
- -git-1.7.4.5.ebuild, -git-1.7.5.3.ebuild, -git-1.7.6.4.ebuild,
- -git-1.7.7.6.ebuild, -git-1.7.7.7.ebuild, -git-1.7.8.ebuild,
- -git-1.7.8.1.ebuild, -git-1.7.8.2.ebuild, -git-1.7.8.3.ebuild,
- -git-1.7.8.4.ebuild, -git-1.7.8.5.ebuild:
- Cleanup some unstable ebuilds
-
- 14 Jun 2012; Mike Frysinger <vapier@gentoo.org> git-1.7.10.2.ebuild,
- git-1.7.10.ebuild, git-1.7.9.1.ebuild, git-1.7.9.2.ebuild, git-1.7.9.3.ebuild,
- git-1.7.9.4.ebuild, git-1.7.9.7.ebuild, git-1.7.9.ebuild, git-9999.ebuild,
- metadata.xml:
- Put gpg dep behind a USE flag as this signing requirement only really matters
- to the client side when signing is in use.
-
- 14 Jun 2012; Mike Frysinger <vapier@gentoo.org> git-1.7.9.1.ebuild,
- git-1.7.9.2.ebuild, git-1.7.9.3.ebuild, git-1.7.9.4.ebuild,
- git-1.7.9.7.ebuild, git-1.7.9.ebuild, git-1.7.10.ebuild,
- git-1.7.10.2.ebuild, git-9999.ebuild:
- Add USE=nls support to control gettext requirement.
-
- 14 Jun 2012; Mike Frysinger <vapier@gentoo.org> git-1.7.8.1.ebuild,
- git-1.7.8.2.ebuild, git-1.7.8.3.ebuild, git-1.7.8.4.ebuild,
- git-1.7.8.5.ebuild, git-1.7.8.6.ebuild, git-1.7.8.ebuild, git-1.7.9.1.ebuild,
- git-1.7.9.2.ebuild, git-1.7.9.3.ebuild, git-1.7.9.4.ebuild,
- git-1.7.9.7.ebuild, git-1.7.9.ebuild, git-1.7.9_rc2.ebuild,
- git-1.7.10.ebuild, git-1.7.10.2.ebuild, git-9999.ebuild:
- Re-enable USE=-iconv support now that the bug originally disabling it was
- fixed in upstream, and make sure we default to USE=iconv so that
- unicode/etc... messages "just work" out of the box #355467 by Tom Lloyd.
-
-*git-1.7.10.2 (20 May 2012)
-
- 20 May 2012; Robin H. Johnson <robbat2@gentoo.org>
- +files/git-1.7.10.2-optional-cvs.patch, +files/git-1.7.11-optional-cvs.patch,
- +git-1.7.10.2.ebuild, git-9999.ebuild:
- Version bump, update optional CVS patch to apply on latest git HEAD and
- 1.7.10.2 release. Port libpcre changes to live ebuild.
-
- 09 May 2012; Alexis Ballier <aballier@gentoo.org> git-1.7.8.6.ebuild:
- keyword ~amd64-fbsd
-
-*git-1.7.9.7 (26 Apr 2012)
-*git-1.7.7.7 (26 Apr 2012)
-*git-1.7.8.6 (26 Apr 2012)
-
- 26 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.7.ebuild,
- +git-1.7.8.6.ebuild, +git-1.7.9.7.ebuild:
- Version bump.
-
- 23 Apr 2012; Mike Frysinger <vapier@gentoo.org> git-1.7.10.ebuild,
- git-1.7.9.1.ebuild, git-1.7.9.2.ebuild, git-1.7.9.3.ebuild,
- git-1.7.9.4.ebuild, git-1.7.9.ebuild:
- Kill spurious backslash.
-
-*git-1.7.10 (08 Apr 2012)
-
- 08 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.10.ebuild:
- Version bump. Still no keywords due to major git-svn breakage.
-
-*git-1.7.9.4 (12 Mar 2012)
-
- 12 Mar 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.9.4.ebuild:
- Version bump.
-
-*git-1.7.9.3 (06 Mar 2012)
-
- 06 Mar 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.9.3.ebuild:
- Version bump. SVN problem still not fixed by upstream.
-
-*git-1.7.8.5 (28 Feb 2012)
-
- 28 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8.5.ebuild:
- Version bump.
-
-*git-1.7.9.2 (23 Feb 2012)
-
- 23 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.9.2.ebuild:
- Version bump.
-
-*git-1.7.9.1 (15 Feb 2012)
-
- 15 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.9.1.ebuild:
- Version bump.
-
-*git-1.7.9 (05 Feb 2012)
-
- 05 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.9.ebuild:
- Version bump. Please be careful of git-svn functionality with SVN 1.7 if your
- SVN repo URL, branch name or tag names contains characters that need URL
- escaping.
-
- 28 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> git-1.7.9_rc2.ebuild,
- git-9999.ebuild:
- Bug #384233: Fix the gitweb syntax highlighting implicit dependency on
- highlight.
-
- 20 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.3.5-r1.ebuild,
- -git-1.7.3.5.ebuild, -git-1.7.4.1.ebuild, -git-1.7.4.4.ebuild,
- -git-1.7.4.ebuild, -git-1.7.5_rc1.ebuild, -git-1.7.5_rc3.ebuild,
- -git-1.7.6.1.ebuild, -git-1.7.6.ebuild, -git-1.7.7.1-r1.ebuild,
- -git-1.7.7.1.ebuild, -git-1.7.7.2.ebuild, -git-1.7.7.3.ebuild,
- -git-1.7.7.4.ebuild, -git-1.7.7.ebuild:
- Clean up some unstable ebuilds.
-
-*git-1.7.7.6 (20 Jan 2012)
-*git-1.7.8.4 (20 Jan 2012)
-
- 20 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.6.ebuild,
- +git-1.7.8.4.ebuild:
- Version bump.
-
-*git-1.7.9_rc2 (20 Jan 2012)
-
- 20 Jan 2012; Robin H. Johnson <robbat2@gentoo.org>
- +files/git-1.7.8-git-svn-1.7-canonical-path.patch, +git-1.7.9_rc2.ebuild,
- git-9999.ebuild:
- Version bump, keywords temporarily removed as git-svn has issues still.
-
- 13 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
- Propogate libpcre change to live ebuild.
-
-*git-1.7.8.3 (07 Jan 2012)
-
- 07 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8.3.ebuild:
- Version bump.
-
-*git-1.7.8.2 (02 Jan 2012)
-
- 02 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8.2.ebuild:
- Version bump.
-
-*git-1.7.8.1 (21 Dec 2011)
-
- 21 Dec 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8.1.ebuild:
- Version bump.
-
-*git-1.7.8 (03 Dec 2011)
-
- 03 Dec 2011; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.8_rc1.ebuild,
- -git-1.7.8_rc1-r1.ebuild, -git-1.7.8_rc3.ebuild, -git-1.7.8_rc4.ebuild,
- +git-1.7.8.ebuild:
- Version bump.
-
-*git-1.7.8_rc4 (29 Nov 2011)
-
- 29 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8_rc4.ebuild:
- Version bump.
-
- 22 Nov 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
- Drop maintainer due retirement, bug #195316
-
-*git-1.7.7.4 (18 Nov 2011)
-
- 18 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.4.ebuild:
- Version bump.
-
-*git-1.7.8_rc3 (17 Nov 2011)
-
- 17 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8_rc3.ebuild:
- Version bump.
-
-*git-1.7.8_rc1-r1 (16 Nov 2011)
-
- 16 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8_rc1-r1.ebuild:
- Bug #377883: build correctly with libpcre for git-grep -P.
-
-*git-1.7.7.3 (09 Nov 2011)
-
- 09 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.3.ebuild:
- Version bump.
-
-*git-1.7.8_rc1 (08 Nov 2011)
-
- 08 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8_rc1.ebuild:
- Version bump.
-
-*git-1.7.7.2 (02 Nov 2011)
-
- 02 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.2.ebuild:
- Version bump.
-
-*git-1.7.7.1-r1 (24 Oct 2011)
-
- 24 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.1-r1.ebuild,
- git-9999.ebuild:
- EAPI=4 and bash-completion-r1 support now that python.eclass has EAPI4, now
- uses REQUIRED_USE instead of warning blocks. Patch by Tomas Chvatal
- <scarabeus@gentoo.org>.
-
-*git-1.7.7.1 (24 Oct 2011)
-
- 24 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.1.ebuild:
- Version bump.
-
- 03 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
- Update live ebuild to sync.
-
-*git-1.7.7 (01 Oct 2011)
-*git-1.7.6.4 (01 Oct 2011)
-
- 01 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.6.4.ebuild,
- +git-1.7.7.ebuild:
- Version bump. Was delayed by getting html/manpage tarballs on the alternative
- mirroring location.
-
-*git-1.7.6.1 (25 Aug 2011)
-
- 25 Aug 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.6.1.ebuild:
- Version bump.
-
- 19 Aug 2011; Jeremy Olexa <darkside@gentoo.org> git-1.7.2.5.ebuild,
- git-1.7.3.4-r1.ebuild, git-1.7.3.5.ebuild, git-1.7.3.5-r1.ebuild,
- git-1.7.3.5-r2.ebuild, git-1.7.4.ebuild, git-1.7.4.1.ebuild,
- git-1.7.4.4.ebuild, git-1.7.4.5.ebuild, git-1.7.5_rc1.ebuild,
- git-1.7.5_rc3.ebuild, git-1.7.5.3.ebuild, git-1.7.6.ebuild, git-9999.ebuild:
- Remove useless/redundant built_with_use check for subversion[perl] since the
- addition of USE-deps. Signed off by maintainer. Tangentially related to bug
- 250179
-
- 13 Jul 2011; Markus Duft <mduft@gentoo.org> git-1.7.6.ebuild,
- +files/git-1.7.6-interix.patch:
- re-added interix prefix specific patch, as some things didnt make it into the
- current release.
-
-*git-1.7.6 (27 Jun 2011)
-
- 27 Jun 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.6.ebuild,
- git-9999.ebuild:
- Version bump. Bug #354439: instructions for bash completion. Bug #352693:
- revert env perl change from bug #326625. Bug #370579: One more test that
- requires FEATURES=userpriv.
-
- 30 May 2011; Markus Duft <mduft@gentoo.org> git-1.7.5.3.ebuild,
- git-9999.ebuild, +files/git-1.7.5-interix.patch:
- add build fix for interix.
-
-*git-1.7.5.2 (30 May 2011)
-
- 30 May 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.5.3.ebuild,
- git-9999.ebuild:
- Version bump. Sync keywords to -9999 ebuild.
-
- 03 May 2011; Fabian Groffen <grobian@gentoo.org> git-1.7.5_rc3.ebuild:
- Marked ~x64-freebsd
-
-*git-1.7.5_rc3 (27 Apr 2011)
-*git-1.7.4.5 (27 Apr 2011)
-
- 27 Apr 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4.5.ebuild,
- +git-1.7.5_rc3.ebuild:
- Version bump.
-
- 20 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> git-9999.ebuild:
- Migrate to git-2 eclass. Update live/stable logic conditionals.
-
-*git-1.7.5_rc1 (06 Apr 2011)
-*git-1.7.4.4 (06 Apr 2011)
-
- 06 Apr 2011; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.4_rc1.ebuild,
- -git-1.7.4_rc1-r1.ebuild, -git-1.7.4_rc1-r2.ebuild, -git-1.7.4_rc2.ebuild,
- -git-1.7.4_rc3.ebuild, +git-1.7.4.4.ebuild, +git-1.7.5_rc1.ebuild:
- Clean up old 1.7.4_rc versions. Version bump to other new versions.
-
- 04 Apr 2011; Pacho Ramos <pacho@gentoo.org> git-1.6.4.5.ebuild,
- git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild, git-1.7.3.5.ebuild,
- git-1.7.3.5-r1.ebuild, git-1.7.3.5-r2.ebuild, git-1.7.4_rc1.ebuild,
- git-1.7.4_rc1-r1.ebuild, git-1.7.4_rc1-r2.ebuild, git-1.7.4_rc2.ebuild,
- git-1.7.4_rc3.ebuild, git-1.7.4.ebuild, git-1.7.4.1.ebuild, git-9999.ebuild:
- RDEPEND only in dev-python/pygtksourceview:2 as
- dev-python/gtksourceview-python will be dropped soon (bug #355049 with Robin
- Johnson authorization).
-
- 12 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> -git-1.6.4.4.ebuild,
- -git-1.6.4.4-r1.ebuild, -files/git-1.6.4.5-gitweb-cve-2010-3906.patch,
- -files/git-1.7.0-always-install-js.patch,
- -files/git-1.7.1-always-install-js.patch,
- -files/git-1.7.1-noiconv-segfault-fix.patch, -git-1.7.2.2.ebuild,
- -git-1.7.2.3.ebuild, -git-1.7.2.4.ebuild, -git-1.7.2.4-r1.ebuild,
- -git-1.7.3.2.ebuild, -git-1.7.3.2-r1.ebuild, -git-1.7.3.3.ebuild,
- -git-1.7.3.4.ebuild:
- Cleanup old files.
-
-*git-1.7.4.1 (12 Feb 2011)
-
- 12 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4.1.ebuild:
- Version bump.
-
-*git-1.7.4 (01 Feb 2011)
-
- 01 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4.ebuild:
- Version bump.
-
-*git-1.7.4_rc3 (24 Jan 2011)
-
- 24 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4_rc3.ebuild:
- version bump
-
-*git-1.7.4_rc2 (15 Jan 2011)
-
- 15 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4_rc2.ebuild,
- git-9999.ebuild:
- Version bump.
-
- 12 Jan 2011; Michael Haubenwallner <haubi@gentoo.org>
- git-1.7.4_rc1-r2.ebuild:
- aix lacks FNMATCH_CASEFOLD
-
- 10 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
- git-1.7.3.5-r2.ebuild, git-1.7.4_rc1-r2.ebuild, git-9999.ebuild:
- Call python_mod_optimize() and python_mod_cleanup() (bug #329479).
-
- 08 Jan 2011; Fabian Groffen <grobian@gentoo.org> git-1.7.3.5-r2.ebuild,
- git-1.7.4_rc1-r2.ebuild, git-9999.ebuild:
- Fix for Prefix
-
- 08 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.4-r1.ebuild:
- Backport bug #350330 automagic CVS to stable ebuild.
-
- 08 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.5-r2.ebuild,
- -git-1.7.3.5-r2.ebuild.orig, git-1.7.4_rc1-r2.ebuild, git-9999.ebuild:
- Fix missing argument in call to python_convert_shebangs, and drop accidently
- added .orig file.
-
- 07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
- Also import python improvements to 9999 ebuild.
-
-*git-1.7.4_rc1-r2 (07 Jan 2011)
-*git-1.7.3.5-r2 (07 Jan 2011)
-
- 07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.5-r2.ebuild,
- +git-1.7.3.5-r2.ebuild.orig, +git-1.7.4_rc1-r2.ebuild:
- Bug #329479: improve python usage to new python eclass. Does not support
- multiple active versions of python easily.
-
- 07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.4_rc1-r1.ebuild,
- git-9999.ebuild:
- Port bug #350330 fixes to newer ebuilds.
-
- 07 Jan 2011; Markos Chandras <hwoarang@gentoo.org> git-1.6.4.5.ebuild,
- git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild:
- Stable on amd64 wrt bug #349045
-
- 07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.5-r1.ebuild,
- +files/git-1.7.3.5-optional-cvs.patch:
- Bug #350330: Avoid automagic CVS.
-
- 07 Jan 2011; Fabian Groffen <grobian@gentoo.org> git-1.7.3.5-r1.ebuild,
- git-1.7.4_rc1-r1.ebuild, git-9999.ebuild:
- Fix gitweb removal for Prefix
-
-*git-1.7.4_rc1-r1 (07 Jan 2011)
-
- 07 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4_rc1-r1.ebuild,
- git-9999.ebuild:
- Port the 1.7.3.5-r1 Prefix USE=python code to newer ebuilds since Prefix team
- has tested.
-
-*git-1.7.3.5-r1 (06 Jan 2011)
-
- 06 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.5-r1.ebuild:
- Bug #320647 redux: Full ability to disable Python usage for Prefix (needed to
- work around circular dependency loop).
-
-*git-1.7.4_rc1 (06 Jan 2011)
-
- 06 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4_rc1.ebuild:
- Version bump for new major release.
-
-*git-1.7.3.5 (06 Jan 2011)
-
- 06 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.4-r1.ebuild,
- +git-1.7.3.5.ebuild:
- Version bump. Also backport minor improvement to testsuite running to get
- cleaner repeat results.
-
- 01 Jan 2011; Raúl Porcel <armin76@gentoo.org> git-1.6.4.5.ebuild,
- git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild:
- alpha/arm/ia64/s390/sh/sparc stable wrt #349045
-
- 31 Dec 2010; Christian Faulhammer <fauli@gentoo.org>
- git-1.7.3.4-r1.ebuild:
- stable x86, security bug 349045
-
- 29 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.4-r1.ebuild,
- +files/git-1.7.3.4-fix-perl-test-prereq.patch:
- Bug #350075: t/t9001: fix missing prereq on some tests.
-
- 27 Dec 2010; Brent Baude <ranger@gentoo.org> git-1.6.4.5.ebuild,
- git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild:
- marking -1.6.4.5 -1.7.2.5 -1.7.3.4-r1 ppc64 stable for bug 349045
-
- 26 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.2.ebuild,
- git-1.7.3.2-r1.ebuild, git-1.7.3.3.ebuild, git-1.7.3.4.ebuild,
- git-1.7.3.4-r1.ebuild, +files/git-1.7.3.4-avoid-shell-issues.patch:
- Bug #349083: Fix a false positive in the Git testsuite, triggered when the
- portage user had a shell of /bin/false.
-
- 25 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.2.5.ebuild,
- git-1.7.3.4-r1.ebuild:
- Minor fail with displaying aggregate-results to fix.
-
- 25 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.2.5.ebuild,
- git-1.7.3.4-r1.ebuild:
- Improve output phase of src_test block for new stables.
-
- 23 Dec 2010; Jeroen Roovers <jer@gentoo.org> git-1.7.3.4-r1.ebuild:
- Stable for HPPA PPC (bug #349045).
-
- 23 Dec 2010; Jeroen Roovers <jer@gentoo.org> git-1.6.4.5.ebuild,
- git-1.7.2.5.ebuild:
- Stable for PPC (bug #349045).
-
- 22 Dec 2010; Jeroen Roovers <jer@gentoo.org> git-1.7.2.5.ebuild:
- Stable for HPPA (bug #349045).
-
- 22 Dec 2010; Jeroen Roovers <jer@gentoo.org> git-1.6.4.5.ebuild:
- Stable for HPPA (bug #349045).
-
- 20 Dec 2010; Tobias Klausmann <klausman@gentoo.org> git-1.7.3.4-r1.ebuild:
- Stable on alpha, bug #349045
-
- 20 Dec 2010; Tobias Klausmann <klausman@gentoo.org> git-1.7.2.5.ebuild:
- Stable on alpha, bug #349045
-
- 20 Dec 2010; Tobias Klausmann <klausman@gentoo.org> git-1.6.4.5.ebuild:
- Stable on alpha, bug #349045
-
- 20 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.6.4.4.ebuild,
- git-1.6.4.4-r1.ebuild, git-1.6.4.5.ebuild, git-1.7.2.2.ebuild,
- git-1.7.2.3.ebuild, git-1.7.2.4.ebuild, git-1.7.2.4-r1.ebuild,
- git-1.7.2.5.ebuild, git-1.7.3.2.ebuild:
- Backport the doman cosmetic fix to ALL ebuilds since I got yet another bug
- about it.
-
- 19 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> git-1.6.4.5.ebuild,
- git-1.7.2.5.ebuild:
- x86 stable wrt security bug #349045
-
-*git-1.7.3.4-r1 (19 Dec 2010)
-
- 19 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.4-r1.ebuild:
- Bug #339278: Do not install gitweb with USE=-cgi. Bug #320647: Python path
- for G/FreeBSD. Bug #326625: Perl path with local::lib. Bug #333405: no color
- for test output to make log parsing easier.
-
-*git-1.7.2.5 (19 Dec 2010)
-*git-1.6.4.5 (19 Dec 2010)
-
- 19 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.5.ebuild,
- +git-1.7.2.5.ebuild:
- Version bump to official releases with gitweb XSS fixes, rather than our
- revbumps with the patch.
-
-*git-1.7.3.4 (16 Dec 2010)
-*git-1.7.2.4-r1 (16 Dec 2010)
-*git-1.6.4.4-r1 (16 Dec 2010)
-
- 16 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.4-r1.ebuild,
- +files/git-1.6.4.5-gitweb-cve-2010-3906.patch, +git-1.7.2.4-r1.ebuild,
- +git-1.7.3.4.ebuild:
- Version bump. Contains fix for CVE-2010-3906: gitweb XSS.
-
-*git-1.7.3.3 (07 Dec 2010)
-*git-1.7.2.4 (07 Dec 2010)
-
- 07 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.0.ebuild,
- -git-1.7.1-r1.ebuild, -git-1.7.1.1.ebuild, -git-1.7.2.ebuild,
- -git-1.7.2-r2.ebuild, +git-1.7.2.4.ebuild, -git-1.7.3.ebuild,
- -git-1.7.3.1.ebuild, +git-1.7.3.3.ebuild:
- Version bump and cleanup.
-
- 11 Nov 2010; Sebastian Pipping <sping@gentoo.org> git-1.7.3.2-r1.ebuild:
- Merge changes to 9999 back into latest release ebuild.
-
- 11 Nov 2010; Sebastian Pipping <sping@gentoo.org> git-9999.ebuild:
- Make live ebuild depend on asciidoc and xmlto independent of flag "doc"
- (bug #343063)
-
- 09 Nov 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.2.3.ebuild,
- git-1.7.3.ebuild, git-1.7.3.1.ebuild, git-1.7.3.2.ebuild,
- git-1.7.3.2-r1.ebuild:
- Fix useless extra KEYWORDS.
-
- 29 Oct 2010; Mark Loeser <halcy0n@gentoo.org> git-9999.ebuild:
- Remove ~ppc and ~ppc64
-
- 27 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
- Bump live build.
-
- 27 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.2-r1.ebuild:
- Bug #342845: fix contrib install and doman warning.
-
-*git-1.7.3.2-r1 (26 Oct 2010)
-
- 26 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.2-r1.ebuild:
- revbump with installing more of new contrib.
-
- 22 Oct 2010; Daniel Pielmeier <billie@gentoo.org>
- +files/git-1.6.6.1-interix6.patch, +files/git-1.7.1-interix.patch:
- Interix patches are still needed for some older versions.
-
-*git-1.7.3.2 (22 Oct 2010)
-
- 22 Oct 2010; Markus Duft <mduft@gentoo.org> git-1.7.3.2.ebuild,
- +files/git-1.7.3.2-interix.patch,
- -files/git-1.6.6.1-interix6.patch,
- -files/git-1.7.1-interix.patch:
- removed obsolete patches, added a new one instead. the new patch matches
- more the spirit of upstream, and has been submitted there.
-
- 22 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.2.ebuild:
- Version bump.
-
-*git-1.7.3.1 (30 Sep 2010)
-
- 30 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.1.ebuild:
- Version bump.
-
-*git-1.7.3 (19 Sep 2010)
-
- 19 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.3.ebuild:
- Version bump.
-
-*git-1.7.2.3 (13 Sep 2010)
-
- 13 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.2.3.ebuild:
- Bug #337104: verbump.
-
- 11 Sep 2010; Raúl Porcel <armin76@gentoo.org> git-1.7.2.2.ebuild:
- arm/ia64/s390/sh/sparc stable wrt #335891
-
- 10 Sep 2010; Jeroen Roovers <jer@gentoo.org> git-1.7.2.2.ebuild:
- Stable for HPPA (bug #335891).
-
- 10 Sep 2010; Tobias Klausmann <klausman@gentoo.org> git-1.7.2.2.ebuild:
- Stable on alpha, bug #335891
-
- 07 Sep 2010; Jeroen Roovers <jer@gentoo.org> git-1.7.2.2.ebuild:
- Stable for PPC (bug #335891).
-
- 06 Sep 2010; Brent Baude <ranger@gentoo.org> git-1.7.2.2.ebuild:
- Marking git-1.7.2.2 ppc64 for bug 335891
-
- 06 Sep 2010; Markos Chandras <hwoarang@gentoo.org> git-1.7.2.2.ebuild:
- Stable on amd64 wrt bug #335891
-
- 06 Sep 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> git-1.7.2.2.ebuild:
- x86 stable wrt security bug #335891
-
- 03 Sep 2010; Christian Faulhammer <fauli@gentoo.org> git-1.7.2.2.ebuild:
- add ~x86-freebsd
-
- 29 Aug 2010; Sven Wegener <swegener@gentoo.org> git-1.7.2.ebuild,
- git-1.7.2-r2.ebuild, git-1.7.2.2.ebuild:
- Install static gitweb files into correct location.
-
-*git-1.7.2.2 (23 Aug 2010)
-
- 23 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.2.2.ebuild:
- Version bump.
-
- 16 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.6.4.4.ebuild,
- git-1.7.0.ebuild, git-1.7.1-r1.ebuild, git-1.7.1.1.ebuild,
- git-1.7.2.ebuild, git-1.7.2-r2.ebuild, git-9999.ebuild:
- Bug #332935: In newer EAPIs, perl-module brings in dev-lang/perl as well,
- which we do not always want.
-
-*git-1.7.2-r2 (09 Aug 2010)
-
- 09 Aug 2010; Fabian Groffen <grobian@gentoo.org> -git-1.7.2-r1.ebuild,
- +git-1.7.2-r2.ebuild:
- Change SHELL_PATH from bash to sh to resolve problems with git's shell
- scripts for some people, bug #331031
-
- 31 Jul 2010; Fabian Groffen <grobian@gentoo.org> git-1.7.2-r1.ebuild:
- Fix compilation with USE=-iconv on non-glibc platforms since disabling of
- iconv is still ignored due to bugs mentioned in the ebuild
-
- 30 Jul 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.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, -files/git-1.6.6-always-install-js.patch,
- -git-1.7.0.3.ebuild, -git-1.7.0.4.ebuild:
- Cleanup old versions.
-
-*git-1.7.2-r1 (22 Jul 2010)
-
- 22 Jul 2010; Jeremy Olexa <darkside@gentoo.org>
- +files/git-1.6.6.1-interix6.patch, +files/git-1.7.1-interix.patch,
- +git-1.7.2-r1.ebuild:
- Migrate changes from Gentoo Prefix overlay. Convert to EAPI3, add patches,
- modify paths, etc. Approved by maintainer, reference bug 329273. Revbump
- per request but no substantial changes for the end user
-
-*git-1.7.2 (22 Jul 2010)
-
- 22 Jul 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.2.ebuild,
- +files/git-1.7.2-always-install-js.patch:
- Version bump.
-
- 18 Jul 2010; Raúl Porcel <armin76@gentoo.org> git-1.7.1-r1.ebuild:
- alpha/arm/ia64/s390/sh/sparc stable wrt #321899
-
- 18 Jul 2010; <nixnut@gentoo.org> git-1.7.0.ebuild:
- ppc stable #321899
-
-*git-1.7.1.1 (30 Jun 2010)
-
- 30 Jun 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.1.1.ebuild:
- Version bump.
-
- 22 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@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, metadata.xml:
- dev-util/subversion renamed to dev-vcs/subversion.
-
- 22 Jun 2010; Jeroen Roovers <jer@gentoo.org> git-1.7.1-r1.ebuild:
- Stable for HPPA (bug #321899).
-
- 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
-
- 05 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> git-1.7.1-r1.ebuild:
- x86 stable wrt bug #321899
-
- 31 May 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.1-r1.ebuild:
- Bug #322205: The iconv patch added for -r1 just stopped the segfaults, the
- testsuite still fails, so forcing USE=iconv for now.
-
- 28 May 2010; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.1.ebuild:
- Remove broken 1.7.1.
-
-*git-1.7.1-r1 (28 May 2010)
-
- 28 May 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.1-r1.ebuild,
- +files/git-1.7.1-noiconv-segfault-fix.patch:
- Bug #321895: patch from upstream to avoid segfault with USE=-iconv.
-
-*git-1.7.1 (01 May 2010)
-
- 01 May 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.1.ebuild,
- +files/git-1.7.1-always-install-js.patch:
- Bug #317953: Version bump.
-
-*git-1.7.0.4 (01 Apr 2010)
-
- 01 Apr 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.0.4.ebuild:
- Version bump.
-
- 31 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> 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:
- Forward-port ~ppc64 keyword to other ebuilds since it came back in bug
- #290163.
-
- 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)
-
- 24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.0.2.ebuild,
- +git-1.7.0.3.ebuild:
- Bug #310967: 1.7.0.2 has a segfault bug in git-daemon, remove and replace
- with 1.7.0.3
-
- 17 Mar 2010; Sebastian Pipping <sping@gentoo.org> +files/50git-gentoo.el,
- +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,
- +files/git-1.6.6-always-install-js.patch, +git-1.7.0.ebuild,
- +git-1.7.0.2.ebuild, +files/git-1.7.0-always-install-js.patch,
- +git-9999.ebuild, +files/git-daemon.confd, +files/git-daemon.initd,
- +files/git-daemon.xinetd, +metadata.xml:
- New package (copied from dev-util/git)
-
-*git-1.7.0.2 (07 Mar 2010)
-
- 07 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.0.2.ebuild:
- version bump.
-
- 28 Feb 2010; Sebastian Pipping <sping@gentoo.org> git-9999.ebuild:
- Sync live ebuild with latest (bug #305157)
-
-*git-1.7.0 (13 Feb 2010)
-
- 13 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.0.ebuild,
- +files/git-1.7.0-always-install-js.patch:
- Version bump.
-
-*git-1.6.6.2 (13 Feb 2010)
-
- 13 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6.2.ebuild:
- Version bump.
-
-*git-1.6.6.1 (21 Jan 2010)
-*git-1.6.5.8 (21 Jan 2010)
-
- 21 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.8.ebuild,
- +git-1.6.6.1.ebuild:
- Version bump.
-
- 02 Jan 2010; Brent Baude <ranger@gentoo.org> git-1.6.5.1-r1.ebuild:
- Marking git-1.6.5.1-r1 ~ppc64 for bug 290163
-
-*git-1.6.6-r2 (26 Dec 2009)
-
- 26 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6-r2.ebuild,
- git-9999.ebuild:
- Bug #298390: All the Subversion ebuilds now offer perl, so we can USE-dep
- on it.
-
-*git-1.6.6-r1 (26 Dec 2009)
-
- 26 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6-r1.ebuild,
- +files/git-1.6.6-always-install-js.patch, git-9999.ebuild:
- Bug #298277: Fixup JS install for Gitweb. Also port all recent fixes to
- the live ebuild.
-
-*git-1.6.6 (24 Dec 2009)
-
- 24 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6.ebuild:
- Version bump.
-
-*git-1.6.6_rc4 (21 Dec 2009)
-
- 21 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6_rc4.ebuild:
- Version bump.
-
-*git-1.6.6_rc3 (17 Dec 2009)
-
- 17 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6_rc3.ebuild:
- Version bump for the upstream rc.
-
-*git-1.6.5.7 (17 Dec 2009)
-
- 17 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.7.ebuild:
- Version bump and fix bug #296310 for Perl 5.10 users.
-
-*git-1.6.5.6 (11 Dec 2009)
-
- 11 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.6.ebuild:
- version bump
-
-*git-1.6.5.5 (06 Dec 2009)
-
- 06 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.5.ebuild:
- Version bump.
-
-*git-1.6.5.4 (03 Dec 2009)
-
- 03 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.4.ebuild:
- Version bump.
-
- 18 Nov 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.5.1-r1.ebuild,
- git-1.6.5.2.ebuild, git-1.6.5.3.ebuild:
- Add ~alpha/~ia64 wrt #290163
-
- 17 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5.3.ebuild:
- Bug #290163: rekeyword for arm. Tested on mv78100.
-
- 17 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5.3.ebuild:
- Bug #290465: uclibc needs an additional define to select a codepath that
- it will compile against.
-
- 17 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5.3.ebuild:
- Bug #290131: cpio is only needed for building git-gui now, and nothing
- else at runtime.
-
-*git-1.6.5.3 (17 Nov 2009)
-
- 17 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.3.ebuild:
- Version bump. Testcases updated to run a working subset with
- FEATURES=-userpriv per bug #292865.
-
- 16 Nov 2009; Jeremy Olexa <darkside@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-9999.ebuild:
- Since app-misc/git was removed from the tree, remove that invalid atom
- from the CDEPEND variable in dev-util/git ebuilds
-
-*git-1.6.5.2 (30 Oct 2009)
-
- 30 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.2.ebuild:
- Bug #291107: version bump.
-
- 23 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> 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-9999.ebuild:
- USE-default on doc was unpopular, and got even more so with USE=doc now
- bringing in dependencies. Turn off the default.
-
-*git-1.6.5.1-r1 (22 Oct 2009)
-
- 22 Oct 2009; Sebastian Pipping <sping@gentoo.org> +git-1.6.5.1-r1.ebuild,
- git-9999.ebuild:
- Build and install info pages (bug 287112), add dependency on texinfo, drop
- keywords: alpha arm ia64 ppc64
-
- 22 Oct 2009; Tobias Klausmann <klausman@gentoo.org> git-1.6.4.4.ebuild:
- Added two more test sets to the black list for UID-0 testing
-
-*git-1.6.5.1 (18 Oct 2009)
-
- 18 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.1.ebuild:
- Version bump
-
- 12 Oct 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.4.4.ebuild:
- ia64/s390/sh/sparc stable wrt #287031
-
-*git-1.6.5 (11 Oct 2009)
-
- 11 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.ebuild,
- git-9999.ebuild:
- Version bump. Bug #287101: fix manpage formatting. Bug #287104: build
- manpages as needed.
-
- 11 Oct 2009; Tobias Klausmann <klausman@gentoo.org> git-1.6.4.4.ebuild:
- Stable on alpha, bug #287031
-
- 09 Oct 2009; Markus Meier <maekke@gentoo.org> git-1.6.4.4.ebuild:
- arm/x86 stable, bug #287031
-
- 09 Oct 2009; Markus Meier <maekke@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-9999.ebuild:
- fix dev-util/cvs detection in src_test due to built_with_use change for
- non-existant package
-
- 02 Oct 2009; Joseph Jezak <josejx@gentoo.org> git-1.6.4.4.ebuild:
- Marked ppc/ppc64 stable for bug #287031.
-
- 01 Oct 2009; Jeroen Roovers <jer@gentoo.org> git-1.6.4.4.ebuild:
- Stable for HPPA (bug #287031).
-
- 30 Sep 2009; Dawid Węgliński <cla@gentoo.org> git-1.6.4.4.ebuild:
- Stable on amd64 (bu #287031)
-
- 30 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5_rc2.ebuild:
- No git-svn by default.
-
-*git-1.6.5_rc2 (29 Sep 2009)
-
- 29 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5_rc2.ebuild,
- git-9999.ebuild, metadata.xml:
- Version bump again. Also handle bug #285238 to use the new SHA1
- implementation by default (and add other IUSE defaults too).
-
-*git-1.6.4.4 (18 Sep 2009)
-
- 18 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.4.ebuild:
- Bug #285418: Version bump
-
- 16 Sep 2009; 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.5_rc1.ebuild, git-9999.ebuild:
- Bug #283732: Perl module should be installed to vendor_perl instead of
- site_perl.
-
- 16 Sep 2009; 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.5_rc1.ebuild:
- Bug #278738: Do not use FEATURES.
-
- 16 Sep 2009; 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.5_rc1.ebuild, git-9999.ebuild:
- Bug #267853: Update deps for gtksourceviewer with newer GNOME.
-
-*git-1.6.5_rc1 (13 Sep 2009)
-
- 13 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5_rc1.ebuild:
- Version bump
-
-*git-1.6.4.3 (13 Sep 2009)
-
- 13 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.3.ebuild:
- Version bump
-
-*git-1.6.4.2 (30 Aug 2009)
-
- 30 Aug 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.2.ebuild:
- Version bump.
-
-*git-1.6.4.1 (27 Aug 2009)
-
- 27 Aug 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.1.ebuild:
- Bug #282667: version bump.
-
- 30 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
- -files/20080626-git-1.5.6.1-noperl.patch,
- -files/20081123-git-1.6.0.4-noperl-cvsserver.patch, -git-1.6.0.6.ebuild,
- -git-1.6.1.ebuild, -git-1.6.1.1.ebuild,
- -files/20090126-git-1.6.1.1-noperl.patch, -git-1.6.1.2.ebuild,
- -git-1.6.1.3.ebuild, -git-1.6.2.ebuild, -git-1.6.2.2.ebuild,
- -git-1.6.2.2-r1.ebuild, -git-1.6.2.3.ebuild, -git-1.6.2.5.ebuild,
- -git-1.6.2.5-r1.ebuild, -files/20090505-git-1.6.2.5-getopt-fixes.patch,
- -files/20090305-git-1.6.2-noperl.patch, -git-1.6.3.ebuild,
- -files/vim-ftdetect-gitcommit.vim:
- Trim old version.
-
-*git-1.6.4 (29 Jul 2009)
-*git-1.6.3.4 (29 Jul 2009)
-
- 29 Jul 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3.4.ebuild,
- +git-1.6.4.ebuild:
- New upstream releases.
-
- 30 Jun 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.3.3.ebuild:
- arm/ia64/s390/sh/sparc stable wrt #273905
-
- 27 Jun 2009; Brent Baude <ranger@gentoo.org> git-1.6.3.3.ebuild:
- Marking git-1.6.3.3 ppc64 and ppc for bug 273905
-
- 27 Jun 2009; Christian Faulhammer <fauli@gentoo.org> git-1.6.3.3.ebuild:
- stable x86, security bug 273905
-
- 26 Jun 2009; Tobias Heinlein <keytoaster@gentoo.org> git-1.6.3.3.ebuild:
- amd64 stable, security bug ##273905
-
- 26 Jun 2009; Tobias Klausmann <klausman@gentoo.org> git-1.6.3.3.ebuild:
- Stable on alpha, bug #273905
-
- 24 Jun 2009; Jeroen Roovers <jer@gentoo.org> git-1.6.3.3.ebuild:
- Stable for HPPA (bug #273905).
-
-*git-1.6.3.3 (22 Jun 2009)
-
- 22 Jun 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3.3.ebuild:
- Version bump per bugs 274608 and 273905, has DoS fixes for gid-daemon.
-
-*git-1.6.3.1 (18 May 2009)
-
- 18 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3.1.ebuild:
- Version bump.
-
- 10 May 2009; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
- getopt fixes in HEAD.
-
- 08 May 2009; Robin H. Johnson <robbat2@gentoo.org> +files/50git-gentoo.el:
- Accidently removed a used file.
-
- 08 May 2009; Robin H. Johnson <robbat2@gentoo.org> -git-1.5.1.6.ebuild,
- -git-1.5.3.7-r1.ebuild, -git-1.5.3.8.ebuild,
- -files/git-1.5.3.8-t9101.patch, -files/git-1.5.3.8-t9106.patch,
- -files/20080322-git-1.5.4.4-noperl.patch, -git-1.5.5.4.ebuild,
- -files/70git-gentoo.el, -files/git-1.5.0-symlinks.patch,
- -git-1.5.4.5.ebuild, -files/20080423-git-1.5.5.1-noperl.patch,
- -git-1.5.5.3.ebuild, -git-1.5.5.3-r1.ebuild,
- -files/20080528-git-1.5.5.3-noperl.patch, -git-1.5.6.1.ebuild,
- -files/50git-gentoo.el, -git-1.5.6.2.ebuild, -files/72git-gentoo.el,
- -files/git-1.5.3-symlinks.patch, -git-1.5.6.3.ebuild, -git-1.5.6.4.ebuild,
- -git-1.5.6.5.ebuild, -git-1.6.0.ebuild, -git-1.6.0.1.ebuild,
- -git-1.6.0.2.ebuild, -git-1.6.0.3.ebuild, -git-1.6.0.4.ebuild,
- -git-1.6.0.4-r1.ebuild, -git-1.6.0.4-r2.ebuild, -git-1.6.3_rc4.ebuild:
- Cleanup old ebuilds and files.
-
-*git-1.6.3 (08 May 2009)
-
- 08 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3.ebuild:
- Version bump.
-
-*git-1.6.2.5-r1 (08 May 2009)
-
- 08 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.5-r1.ebuild:
- Bug 268817: Accidently dropped the noperl patch, it's only merged in
- upstreams 1.6.3.x series.
-
- 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.5.ebuild,
- git-1.6.3_rc4.ebuild, git-9999.ebuild:
- Fix bug #267853: dev-python/gtksourceview-python needed for gitview.
- Update git-9999 for getopt fixes.
-
- 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.5.ebuild,
- git-1.6.3_rc4.ebuild:
- Backport a fix from the live ebuild.
-
- 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.5.ebuild,
- +files/20090505-git-1.6.2.5-getopt-fixes.patch, git-1.6.3_rc4.ebuild:
- Fix Getopt::Long usage bug, patch submitted to upstream as well.
-
-*git-1.6.2.5 (05 May 2009)
-
- 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.5.ebuild:
- Version bump.
-
-*git-1.6.3_rc4 (05 May 2009)
-
- 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3_rc4.ebuild:
- Version bump to release candidate for 1.6.3. In package.mask for the
- moment.
-
-*git-1.6.2.3 (13 Apr 2009)
-
- 13 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.3.ebuild:
- Version bump.
-
- 13 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.2-r1.ebuild,
- git-9999.ebuild:
- Bug #221179, do not install perl .packlist.
-
- 12 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.2-r1.ebuild,
- git-9999.ebuild:
- Manpages were missed in live ebuild.
-
- 05 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
- Upstream is mergign the noperl patch now.
-
- 05 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
- Forgot a bit.
-
- 05 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.2-r1.ebuild:
- Refix bug #237210, missed a part.
-
-*git-9999 (03 Apr 2009)
-*git-1.6.2.2-r1 (03 Apr 2009)
-
- 03 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.2-r1.ebuild,
- +git-9999.ebuild:
- Bug #238023 - add an scm-capable ebuild for Git, use it to tidy up the
- ebuild a bit too. Based on the work by Sebastian Pipping
- <webmaster@hartwork.org>.
-
-*git-1.6.2.2 (03 Apr 2009)
-
- 03 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.2.ebuild:
- Version bump, also fixes bug #237210 for Emacs users.
-
- 03 Apr 2009; Robin H. Johnson <robbat2@gentoo.org>
- files/20090305-git-1.6.2-noperl.patch:
- Fix testsuite functionality with USE=-perl, the add-interactive test uses
- perl and was not excluded.
-
- 23 Mar 2009; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
- Update metadata, ricmm is joining as a maintainer.
-
- 21 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
- metadata.xml:
- Removing ferdy as a maintainer since he was retired.
-
- 06 Mar 2009; Christian Faulhammer <fauli@gentoo.org> git-1.6.2.ebuild:
- fix HOMEPAGE
-
-*git-1.6.2 (06 Mar 2009)
-
- 06 Mar 2009; Robin H. Johnson <robbat2@gentoo.org>
- +files/20090305-git-1.6.2-noperl.patch, +git-1.6.2.ebuild:
- Version bump per bug #261241. Also fix bugs #256964, #238586. EAPI2 now in
- use.
-
-*git-1.6.1.3 (11 Feb 2009)
-
- 11 Feb 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.1.3.ebuild:
- Version bump.
-
-*git-1.6.1.2 (02 Feb 2009)
-
- 02 Feb 2009; Greg Kroah-Hartman <gregkh@gentoo.org> +git-1.6.1.2.ebuild:
- version bump to 1.6.1.2 to fix pack-objects problem in 1.6.1.1
-
-*git-1.6.1.1 (26 Jan 2009)
-
- 26 Jan 2009; Robin H. Johnson <robbat2@gentoo.org>
- +files/20090126-git-1.6.1.1-noperl.patch, +git-1.6.1.1.ebuild:
- Version bump. Also bug #254029 - fix noperl patch.
-
- 08 Jan 2009; Brent Baude <ranger@gentoo.org> git-1.6.0.6.ebuild:
- Marking git-1.6.0.6 ppc64 for bug 251343
-
-*git-1.6.1 (06 Jan 2009)
-
- 06 Jan 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.1.ebuild:
- Version bump, bug 250321.
-
- 01 Jan 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.0.6.ebuild:
- s390/sh stable wrt #251343
-
- 29 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> git-1.6.0.6.ebuild:
- ppc stable, bug #251343
-
- 25 Dec 2008; Jeroen Roovers <jer@gentoo.org> git-1.6.0.6.ebuild:
- Stable for HPPA (bug #251343).
-
- 23 Dec 2008; Raúl Porcel <armin76@gentoo.org> git-1.6.0.6.ebuild:
- alpha/arm/ia64 stable wrt #251343
-
- 23 Dec 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.6.0.6.ebuild:
- Factor out the long emake invocation so that we can consistently call it
- and avoid triggering a rebuild during install or test.
-
- 23 Dec 2008; Markus Meier <maekke@gentoo.org> git-1.6.0.6.ebuild:
- amd64/x86 stable, bug #251343
-
- 23 Dec 2008; Ferris McCormick <fmccor@gentoo.org> git-1.6.0.6.ebuild:
- Sparc stable --- Security Bug #251343 --- all tests expected to pass do pass.
-
-*git-1.6.0.6 (23 Dec 2008)
-
- 23 Dec 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.6.ebuild:
- Version bump.
-
- 27 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> files/git-daemon.initd:
- Refix bug #238351 so that it works under baselayout1 and baselayout2.
-
-*git-1.6.0.4-r2 (24 Nov 2008)
-
- 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> files/git-daemon.initd,
- +git-1.6.0.4-r2.ebuild:
- Fix dumb typo, revbump to ensure any users that got the typo also get the
- fix.
-
- 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
- Document what USE=gtk does for Git.
-
- 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.6.0.4-r1.ebuild:
- Bug #240280, fix to use CFLAGS/LDFLAGS better.
-
- 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.5.ebuild,
- git-1.5.5.3.ebuild, git-1.5.5.3-r1.ebuild, git-1.5.5.4.ebuild,
- git-1.5.6.1.ebuild, git-1.5.6.2.ebuild, git-1.5.6.3.ebuild,
- git-1.5.6.4.ebuild, git-1.5.6.5.ebuild, git-1.6.0.ebuild,
- git-1.6.0.1.ebuild, git-1.6.0.2.ebuild, git-1.6.0.3.ebuild,
- git-1.6.0.4.ebuild, git-1.6.0.4-r1.ebuild:
- Even better fixup for bug #238129.
-
- 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.6.0.4-r1.ebuild:
- Bug #238586, issue a warning for dev-util/subversion[dso].
-
- 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.5.ebuild,
- git-1.5.5.3.ebuild, git-1.5.5.3-r1.ebuild, git-1.5.5.4.ebuild,
- git-1.5.6.1.ebuild, git-1.5.6.2.ebuild, git-1.5.6.3.ebuild,
- git-1.5.6.4.ebuild, git-1.5.6.5.ebuild, git-1.6.0.ebuild,
- git-1.6.0.1.ebuild, git-1.6.0.2.ebuild, git-1.6.0.3.ebuild,
- git-1.6.0.4.ebuild, git-1.6.0.4-r1.ebuild:
- Bug #238129, the default behavior of built_with_use changed at some point.
- We do not want to die, but just to print a warning.
-
-*git-1.6.0.4-r1 (24 Nov 2008)
-
- 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> +files/50git-gentoo.el,
- +files/20081123-git-1.6.0.4-noperl-cvsserver.patch,
- files/git-daemon.confd, files/git-daemon.initd, +git-1.6.0.4-r1.ebuild:
- Fix bug #235393 for Emacs users. Fix bug #238351 for running the
- standalone init.d more safely as non-root and include the pidfile. Bug
- #247487, cvsserver now needs the Perl stuff. Bug #248446, fix htmldir
- support.
-
-*git-1.6.0.4 (18 Nov 2008)
-
- 18 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.4.ebuild:
- Bug #246244, version bump.
-
-*git-1.6.0.3 (29 Oct 2008)
-
- 29 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.3.ebuild:
- Version bump.
-
-*git-1.6.0.2 (21 Sep 2008)
-
- 21 Sep 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.2.ebuild:
- Version bump.
-
- 16 Sep 2008; Jeroen Roovers <jer@gentoo.org> git-1.5.6.4.ebuild:
- Stable for HPPA (bug #234075).
-
- 16 Sep 2008; Robin H. Johnson <robbat2@gentoo.org> files/git-daemon.initd,
- files/git-daemon.xinetd:
- Git 1.6 requires that daemon been an argument not part of the name.
-
-*git-1.6.0.1 (30 Aug 2008)
-
- 30 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.1.ebuild:
- Version bump, only bugfixes.
-
- 25 Aug 2008; Ulrich Mueller <ulm@gentoo.org> -files/71git-gentoo.el,
- files/72git-gentoo.el:
- Add comment in Emacs site-init file wrt bug 235393. Remove unused file.
-
- 27 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.6.4.ebuild,
- git-1.5.6.5.ebuild, git-1.6.0.ebuild:
- Remove references to dev-util/tla is latest stable and ~arch versions, per
- bug #235681
-
-*git-1.6.0 (24 Aug 2008)
-
- 24 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.ebuild:
- Major version bump. Fixes bugs 219839, 225601 for userpriv during testing,
- working subversion-1.5 support per bug 224185 and skips installing git-svn
- when USE=-subversion per bug 233550.
-
-*git-1.5.6.5 (16 Aug 2008)
-
- 16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.6.5.ebuild:
- Version bump.
-
- 16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
- Make repoman happy.
-
- 08 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org> git-1.5.6.4.ebuild:
- ppc stable, bug #234075
-
- 08 Aug 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.6.4.ebuild:
- alpha/ia64 stable wrt #234075
-
- 07 Aug 2008; Markus Meier <maekke@gentoo.org> git-1.5.6.4.ebuild:
- x86 stable, bug #234075
-
- 07 Aug 2008; Markus Rothe <corsair@gentoo.org> git-1.5.6.4.ebuild:
- Stable on ppc64; bug #234075
-
- 07 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org> git-1.5.6.4.ebuild:
- stable amd64, bug #234075
-
- 06 Aug 2008; Ferris McCormick <fmccor@gentoo.org> git-1.5.6.4.ebuild:
- Sparc stable, security bug #234075 (good for about a week anyway).
-
-*git-1.5.6.4 (28 Jul 2008)
-
- 28 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.6.4.ebuild:
- Version bump.
-
-*git-1.5.6.3 (17 Jul 2008)
-
- 17 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.6.3.ebuild:
- Bug #232068, version bump.
-
-*git-1.5.6.2 (10 Jul 2008)
-
- 10 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.6.2.ebuild:
- Version bump per bug #231380.
-
-*git-1.5.6.1 (26 Jun 2008)
-
- 26 Jun 2008; Robin H. Johnson <robbat2@gentoo.org>
- +files/20080626-git-1.5.6.1-noperl.patch, +git-1.5.6.1.ebuild:
- Version bump.
-
- 24 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.5.4.ebuild:
- Fix bug thanks to compnerd.
-
- 11 Jun 2008; nixnut <nixnut@gentoo.org> git-1.5.4.5.ebuild:
- Stable on ppc wrt bug 225231
-
- 11 Jun 2008; Kenneth Prugh <ken69267@gentoo.org> git-1.5.4.5.ebuild:
- amd64 stable, bug #225231
-
-*git-1.5.5.4 (11 Jun 2008)
-
- 11 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.5.4.ebuild:
- Version bump.
-
- 10 Jun 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.4.5.ebuild:
- alpha/ia64/sparc/x86 stable wrt #225231
-
- 09 Jun 2008; Brent Baude <ranger@gentoo.org> git-1.5.4.5.ebuild:
- stable ppc64, bug 225231
-
-*git-1.5.5.3-r1 (07 Jun 2008)
-
- 07 Jun 2008; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.2.5.ebuild,
- -git-1.5.4.ebuild, -git-1.5.4.2.ebuild, -git-1.5.4.3.ebuild,
- -git-1.5.4.4.ebuild, -git-1.5.4.4-r1.ebuild, -git-1.5.5.1.ebuild,
- -git-1.5.5.1-r1.ebuild, +git-1.5.5.3-r1.ebuild:
- Remove unneeded patches to Makefile. Stop die'ing upon a bad USE
- configuration by taking a sane decision. Remove unused versions.
-
- 28 May 2008; Robin H. Johnson <robbat2@gentoo.org>
- files/20080528-git-1.5.5.3-noperl.patch:
- Forgot to add doc at the top of the new patch.
-
-*git-1.5.5.3 (28 May 2008)
-
- 28 May 2008; Robin H. Johnson <robbat2@gentoo.org>
- +files/20080528-git-1.5.5.3-noperl.patch,
- +files/vim-ftdetect-gitcommit.vim, +git-1.5.5.3.ebuild:
- Version bump, 1.5.5 series is pretty ready for primetime.
-
-*git-1.5.5.1-r1 (29 Apr 2008)
-
- 29 Apr 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.5.1-r1.ebuild:
- The gitweb.cgi did not contain the build-time replacements. Ensure that it
- does, and also make it executable by default so that portage does not
- strip the executability on upgrade.
-
- 24 Apr 2008; Robin H. Johnson <robbat2@gentoo.org>
- +files/20080322-git-1.5.4.4-noperl.patch,
- -files/20080322-git-1.5.5.4-noperl.patch, git-1.5.4.4-r1.ebuild,
- git-1.5.4.5.ebuild:
- Fix bad numbering of file.
-
- 24 Apr 2008; Robin H. Johnson <robbat2@gentoo.org>
- files/20080423-git-1.5.5.1-noperl.patch:
- No absolute paths in patches! Bug #219099.
-
-*git-1.5.5.1 (24 Apr 2008)
-
- 24 Apr 2008; Robin H. Johnson <robbat2@gentoo.org>
- +files/20080423-git-1.5.5.1-noperl.patch, +git-1.5.5.1.ebuild:
- Bump to 1.5.5.1 per bug 217593, noperl patch ported by dberkholz.
-
-*git-1.5.4.5 (29 Mar 2008)
-
- 29 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4.5.ebuild:
- Version bump.
-
- 24 Mar 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.4.4-r1.ebuild:
- Re-add ~ia64 wrt #214464
-
-*git-1.5.4.4-r1 (24 Mar 2008)
-
- 24 Mar 2008; Robin H. Johnson <robbat2@gentoo.org>
- +files/20080322-git-1.5.5.4-noperl.patch, +git-1.5.4.4-r1.ebuild:
- Per bug 214168, some users are really picky about wanting a Perl-free Git.
- This new revision makes that a possibility, and now also introduces most
- of the dependancies that were only previously stated in the pkg_postinst
- phase. The following arch keywords have been dropped per bug 214464 until
- the arches can keyword the dependancies: arm, ia64, s390, sh.
-
- 20 Mar 2008; Mike Frysinger <vapier@gentoo.org> git-1.5.4.4.ebuild:
- Add support for USE=xinetd #213014.
-
- 20 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.4.ebuild:
- The base Git.pm module now requires dev-perl/Error, so it is no longer
- optional under USE=perl. dev-perl/Net-SMTP-SSL remains optional as it is
- only used for git-send-email.
-
- 17 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.4.ebuild:
- dev-perl/Authen-SASL is an indirect dependancy of Net-SMTP-SSL already w/
- USE=sasl, so we can skip it here.
-
-*git-1.5.4.4 (17 Mar 2008)
-
- 17 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4.4.ebuild:
- Version bump, fixing bugs #213549, #213543, #212131.
-
-*git-1.5.4.3 (27 Feb 2008)
-
- 27 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4.3.ebuild:
- Version bump.
-
-*git-1.5.4.2 (17 Feb 2008)
-
- 17 Feb 2008; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.4.2.ebuild:
- New upstream version
-
- 11 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> git-1.5.4.ebuild:
- Fix sed for LDFLAGS, and make CFLAGS sed as robust as that.
-
- 03 Feb 2008; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.4.ebuild:
- Add USE=threads as per bug #208422
-
-*git-1.5.4 (03 Feb 2008)
-
- 03 Feb 2008; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.4_rc2.ebuild,
- -git-1.5.4_rc3.ebuild, -git-1.5.4_rc4.ebuild, +git-1.5.4.ebuild:
- New upstream version. Remove RCs for 1.5.4
-
- 01 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.2.5.ebuild,
- git-1.5.3.7-r1.ebuild, git-1.5.3.8.ebuild, git-1.5.4_rc2.ebuild,
- git-1.5.4_rc3.ebuild, git-1.5.4_rc4.ebuild:
- Clarify the extra deps for git-svnimport.
-
-*git-1.5.4_rc4 (01 Feb 2008)
-
- 01 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc4.ebuild:
- Version bump.
-
- 14 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org>
- git-1.5.3.7-r1.ebuild:
- ppc. stable
-
-*git-1.5.4_rc3 (14 Jan 2008)
-
- 14 Jan 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc3.ebuild:
- Bump the release candidate for more testing.
-
- 13 Jan 2008; Fernando J. Pereda <ferdy@gentoo.org>
- +files/git-1.5.3.8-t9101.patch, git-1.5.3.8.ebuild:
- Add a fix for some test cases under subversion 1.4.6
-
-*git-1.5.3.8 (10 Jan 2008)
-
- 10 Jan 2008; Fernando J. Pereda <ferdy@gentoo.org>
- +files/git-1.5.3.8-t9106.patch, -git-1.5.3.2.ebuild, -git-1.5.3.3.ebuild,
- -git-1.5.3.4.ebuild, -git-1.5.3.4-r1.ebuild, -git-1.5.3.5.ebuild,
- -git-1.5.3.6.ebuild, -git-1.5.3.6-r1.ebuild, -git-1.5.3.7.ebuild,
- +git-1.5.3.8.ebuild, -git-1.5.4_rc0.ebuild, -git-1.5.4_rc1.ebuild,
- git-1.5.4_rc2.ebuild:
- Version bump. Fix some bugs and style nits. Remove unneeded verbosity.
- Remove unused versions.
-
-*git-1.5.4_rc2 (01 Jan 2008)
-
- 01 Jan 2008; Markus Ullmann <jokey@gentoo.org> +git-1.5.4_rc2.ebuild:
- Version bump, granted by robbat2 as test-suite passes
-
- 29 Dec 2007; <welp@gentoo.org> git-1.5.4_rc1.ebuild:
- Keyworded ~sparc-fbsd; bug 203655
-
- 27 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild:
- Stable on amd64. Tested by myself and gentoofan23.
-
- 25 Dec 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.3.7-r1.ebuild:
- alpha/ia64/sparc/x86 stable wrt #202383
-
- 25 Dec 2007; Brent Baude <ranger@gentoo.org> git-1.5.3.7-r1.ebuild:
- Marking git-1.5.3.7-r1 ppc64 for bug 203283
-
- 25 Dec 2007; nixnut <nixnut@gentoo.org> ChangeLog:
- Stable on ppc wrt bug 203283
-
- 25 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild,
- git-1.5.4_rc0.ebuild, git-1.5.4_rc1.ebuild:
- Bug 201544: Use the proper build mechanism to disable the Tk-using sections
- of git.
-
-*git-1.5.4_rc1 (25 Dec 2007)
-
- 25 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc1.ebuild:
- Add latest rc from upstream.
-
- 25 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild,
- git-1.5.4_rc0.ebuild:
- Install the git-p4 tool and the import-tars tool.
-
- 17 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.1.6.ebuild,
- git-1.5.2.5.ebuild, git-1.5.3.2.ebuild, git-1.5.3.3.ebuild,
- git-1.5.3.4.ebuild, git-1.5.3.4-r1.ebuild, git-1.5.3.5.ebuild,
- git-1.5.3.6.ebuild, git-1.5.3.6-r1.ebuild, git-1.5.3.7.ebuild,
- git-1.5.3.7-r1.ebuild, git-1.5.4_rc0.ebuild:
- Clean up all minorsyn problems with ebuilds.
-
-*git-1.5.4_rc0 (17 Dec 2007)
-
- 17 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc0.ebuild:
- Version bump. rc0 is for testing only, not production uage. Masked via
- package.mask.
-
- 06 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild:
- Fix typo.
-
-*git-1.5.3.7-r1 (06 Dec 2007)
-
- 06 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.3.7-r1.ebuild:
- Install the gitweb stuff, as it's used by instaweb, and is also
- independantly useful, but does not lend itself to webapp-config very well.
-
-*git-1.5.3.7 (05 Dec 2007)
-
- 05 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.3.7.ebuild:
- Version bump. Please note that the CVS testcases are disabled unless you
- have FEATURES=userpriv, as CVS rejects commits as root.
-
-*git-1.5.3.6-r1 (22 Nov 2007)
-
- 22 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.3.6-r1.ebuild:
- Add missing cpio dependancy, redo the documentation install so that the text
- versions and (optionally) HTML versions are installed including the release
- notes. Also install some new bits from contrib: blameview,
- continuous-integration, remotes2config.
-
-*git-1.5.3.6 (20 Nov 2007)
-
- 20 Nov 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.6.ebuild:
- New upstream version
-
-*git-1.5.3.5 (14 Nov 2007)
-
- 14 Nov 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.5.ebuild:
- Version bump (bug #198903)
-
- 19 Oct 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.3.4-r1.ebuild:
- vim-plugin.eclass pulls in vim, that is not desired. Revert that change for now
-
-*git-1.5.3.4-r1 (19 Oct 2007)
-
- 19 Oct 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.4-r1.ebuild:
- Install vim and some stuff from contrib (related: bug #194940)
-
- 05 Oct 2007; Mike Frysinger <vapier@gentoo.org> git-1.5.3.4.ebuild:
- Fix incorrect binding of iconv<->uclibc.
-
-*git-1.5.3.4 (04 Oct 2007)
-
- 04 Oct 2007; Fernando J. Pereda <ferdy@gentoo.org> +files/72git-gentoo.el,
- +git-1.5.3.4.ebuild:
- New upstream version. Include fixes from bug #194690 thanks to Christian
- Faulhammer <opfer@gentoo.org>
-
-*git-1.5.3.3 (30 Sep 2007)
-
- 30 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.3.ebuild:
- New upstream version
-
- 28 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.3.ebuild:
- Remove 1.5.3
-
- 28 Sep 2007; Joshua Kinard <kumba@gentoo.org> git-1.5.2.5.ebuild:
- Stable on mips, per #193113.
-
- 20 Sep 2007; Christoph Mende <angelos@gentoo.org> git-1.5.2.5.ebuild:
- Stable on amd64 wrt bug #193113
-
- 20 Sep 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.2.5.ebuild:
- alpha/ia64 stable wrt #193113
-
- 20 Sep 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.2.5.ebuild:
- Stable for SPARC (bug #193113).
-
- 20 Sep 2007; Brent Baude <ranger@gentoo.org> git-1.5.2.5.ebuild:
- Marking git-1.5.2.5 ppc64 for bug 193113
-
- 19 Sep 2007; Lars Weiler <pylon@gentoo.org> git-1.5.2.5.ebuild:
- Stable on ppc; bug #193113.
-
- 19 Sep 2007; Markus Meier <maekke@gentoo.org> git-1.5.2.5.ebuild:
- x86 stable, bug #193113
-
-*git-1.5.3.2 (19 Sep 2007)
-
- 19 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.2.ebuild:
- New upstream version
-
-*git-1.5.3 (02 Sep 2007)
-
- 02 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.3_rc7.ebuild,
- +git-1.5.3.ebuild:
- New upstream version. Remove rc7
-
-*git-1.5.3_rc7 (29 Aug 2007)
-
- 29 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org>
- -files/git-1.5.3_rc5-read-tree.patch, -git-1.5.3_rc5-r1.ebuild,
- +git-1.5.3_rc7.ebuild:
- New upstream version. Remove rc5
-
- 24 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.2.4.ebuild,
- -git-1.5.3_rc4.ebuild:
- Remove unused obsoleted versions
-
-*git-1.5.2.5 (15 Aug 2007)
-
- 15 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.2.5.ebuild:
- New maintenance version for 1.5.2 series
-
-*git-1.5.3_rc5-r1 (15 Aug 2007)
-
- 15 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org>
- +files/git-1.5.3_rc5-read-tree.patch, -git-1.5.3_rc5.ebuild,
- +git-1.5.3_rc5-r1.ebuild:
- Add a patch to fix a segfault in rc5. Remove the buggy version. rc4 is safe.
-
-*git-1.5.3_rc5 (15 Aug 2007)
-
- 15 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3_rc5.ebuild:
- New upstream version.
-
- 13 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org>
- -files/git-1.5.2-tempfile.patch, -git-1.5.0.7.ebuild, -git-1.5.2.ebuild,
- -git-1.5.2.1.ebuild, -git-1.5.2.2.ebuild:
- Remove old and unused stuff
-
-*git-1.5.3_rc4 (08 Aug 2007)
-
- 08 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org>
- +files/git-1.5.3-symlinks.patch, +git-1.5.3_rc4.ebuild:
- Version bump
-
- 29 Jul 2007; Christian Heim <phreak@gentoo.org> git-1.5.0.7.ebuild,
- git-1.5.1.6.ebuild, git-1.5.2.ebuild, git-1.5.2.1.ebuild,
- git-1.5.2.2.ebuild, git-1.5.2.4.ebuild:
- Fixing the DEPEND/RDEPEND for the move of net-www/apache to
- www-servers/apache (#78622).
-
-*git-1.5.2.4 (27 Jul 2007)
-
- 27 Jul 2007; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
- git-1.5.0.7.ebuild, git-1.5.1.6.ebuild, git-1.5.2.ebuild,
- git-1.5.2.1.ebuild, git-1.5.2.2.ebuild, +git-1.5.2.4.ebuild:
- Add new upstream version, and also improve the DESCRIPTION per bug #185057,
- and the longdescription in metadata at the same time.
-
- 25 Jun 2007; Joshua Kinard <kumba@gentoo.org> git-1.5.1.6.ebuild:
- Stable on mips, per #179245.
-
- 23 Jun 2007; Matti Bickel <mabi@gentoo.org> git-1.5.1.6.ebuild:
- ppc stable (bug #179245)
-
-*git-1.5.2.2 (16 Jun 2007)
-
- 16 Jun 2007; Fernando J. Pereda <ferdy@gentoo.org> +files/71git-gentoo.el,
- +git-1.5.2.2.ebuild:
- New upstream version. Fix for bug #181718
-
- 14 Jun 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.1.6.ebuild:
- Stable for HPPA (bug #179245).
-
-*git-1.5.2.1 (04 Jun 2007)
-
- 04 Jun 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.2.1.ebuild:
- New upstream version
-
- 31 May 2007; Daniel Gryniewicz <dang@gentoo.org> git-1.5.1.6.ebuild:
- Marked stable on amd64 for bug #179245
-
- 28 May 2007; Brent Baude <ranger@gentoo.org> git-1.5.1.6.ebuild:
- Marking git-1.5.1.6 ppc64 stable for bug 179245
-
- 24 May 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.1.6.ebuild:
- ia64 + x86 stable wrt #179245
-
- 23 May 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.2.ebuild:
- Add dev-perl/TermReadKey for git-svn. Fixes bug #179560
-
- 23 May 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.1.6.ebuild:
- Stable on alpha as per bug #179245
-
- 23 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> git-1.5.1.6.ebuild:
- Stable on sparc wrt #179245
-
- 21 May 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.1.6.ebuild:
- Reverting to ~hppa.
-
- 21 May 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.1.6.ebuild:
- Stable for HPPA (bug #179245).
-
-*git-1.5.2 (20 May 2007)
-*git-1.5.1.6 (20 May 2007)
-
- 20 May 2007; Fernando J. Pereda <ferdy@gentoo.org>
- +files/git-1.5.2-tempfile.patch, -git-1.5.1.2.ebuild, -git-1.5.1.3.ebuild,
- -git-1.5.1.4.ebuild, -git-1.5.1.5.ebuild, +git-1.5.1.6.ebuild,
- +git-1.5.2.ebuild:
- New upstream versions. Remove old ones.
-
-*git-1.5.1.5 (19 May 2007)
-
- 19 May 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.1.5.ebuild:
- New upstream version. Fixes bug #177280.
-
-*git-1.5.1.4 (09 May 2007)
-
- 09 May 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.1.4.ebuild:
- Version bump.
-
-*git-1.5.1.3 (01 May 2007)
-
- 01 May 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.1.3.ebuild:
- Version bump.
-
- 24 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.1.1.ebuild,
- -git-1.4.4.4.ebuild, -git-1.5.1.1.ebuild:
- Remove unused stuff
-
- 23 Apr 2007; Bryan Østergaard <kloeri@gentoo.org> git-1.5.0.7.ebuild:
- Stable on Mips, bug 173327.
-
-*git-1.5.1.2 (23 Apr 2007)
-
- 23 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.1.2.ebuild:
- New upstream version.
-
-*git-1.5.1.1 (12 Apr 2007)
-
- 12 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.1.ebuild,
- +git-1.5.1.1.ebuild:
- New upstream version, superceeds 1.5.1
-
- 11 Apr 2007; Christian Faulhammer <opfer@gentoo.org> git-1.5.0.7.ebuild:
- stable amd64, bug 173327
-
- 08 Apr 2007; Markus Rothe <corsair@gentoo.org> git-1.5.0.7.ebuild:
- Stable on ppc64; bug #173327
-
- 06 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> git-1.5.0.7.ebuild:
- ppc stable
-
- 04 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.0.7.ebuild:
- Stable on alpha wrt bug #173327
-
- 04 Apr 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.0.7.ebuild:
- Stable for HPPA (bug #173327).
-
- 04 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> git-1.5.0.7.ebuild:
- Stable on sparc wrt #173327
-
- 04 Apr 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.0.7.ebuild:
- ia64 + x86 stable wrt bug 173327
-
- 04 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.2.4.ebuild,
- -git-1.4.4.3.ebuild:
- Remove unused versions.
-
-*git-1.5.1 (04 Apr 2007)
-*git-1.5.0.7 (04 Apr 2007)
-
- 04 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.6.ebuild,
- +git-1.5.0.7.ebuild, +git-1.5.1.ebuild:
- Revision and version bump. Remove 1.5.0.6
-
-*git-1.5.0.6 (29 Mar 2007)
-
- 29 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.5.ebuild,
- +git-1.5.0.6.ebuild:
- New upstream version. Remove 1.5.0.5
-
-*git-1.5.0.5 (19 Mar 2007)
-
- 19 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.4.ebuild,
- +git-1.5.0.5.ebuild:
- New upstream version. Remove old one.
-
-*git-1.5.0.4 (16 Mar 2007)
-
- 16 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.3.ebuild,
- -git-1.5.0.3-r1.ebuild, +git-1.5.0.4.ebuild:
- New upstream version. Remove old ones.
-
-*git-1.5.0.3-r1 (11 Mar 2007)
-
- 11 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org>
- +files/git-1.5.0-symlinks.patch, +git-1.5.0.3-r1.ebuild:
- Create relative symlinks instead of absolute ones.
-
-*git-1.5.0.3 (09 Mar 2007)
-
- 09 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.2.ebuild,
- +git-1.5.0.3.ebuild:
- New upstream version. Fix for bug #170066. Remove old version.
-
-*git-1.5.0.2 (27 Feb 2007)
-
- 27 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.1.ebuild,
- +git-1.5.0.2.ebuild:
- New upstream version. Remove .1 since it is buggy
-
- 20 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.ebuild:
- Remove unused version, superceed by 1.5.0.1
-
-*git-1.5.0.1 (19 Feb 2007)
-
- 19 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.0.1.ebuild:
- New upstream version.
-
- 15 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.0.ebuild:
- Add a showpkgdeps message for git send-email. Fixes bug #167058. Reported by
- Christian Schlotter <again@gmx.de>
-
-*git-1.5.0 (14 Feb 2007)
-
- 14 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.0.ebuild:
- New upstream version.
-
- 15 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> git-1.4.4.4.ebuild:
- Stable on sparc wrt #159822
-
- 15 Jan 2007; Jeroen Roovers <jer@gentoo.org> git-1.4.4.4.ebuild:
- Stable for HPPA (bug #159822).
-
- 15 Jan 2007; Steve Dibb <beandog@gentoo.org> git-1.4.4.4.ebuild:
- amd64 stable, bug 159822
-
- 14 Jan 2007; Markus Rothe <corsair@gentoo.org> git-1.4.4.4.ebuild:
- Stable on ppc64; bug #159822
-
- 13 Jan 2007; Andrej Kacian <ticho@gentoo.org> git-1.4.4.4.ebuild:
- Stable on x86, bug #159822.
-
- 13 Jan 2007; nixnut <nixnut@gentoo.org> git-1.4.4.4.ebuild:
- Stable on ppc wrt bug 159822
-
-*git-1.4.4.4 (12 Jan 2007)
-
- 12 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.4.ebuild:
- Version bump + stable on Alpha. See bug #159822
-
- 09 Jan 2007; Markus Rothe <corsair@gentoo.org> git-1.4.4.3.ebuild:
- Stable on ppc64; bug #159822
-
- 07 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org> git-1.4.4.3.ebuild:
- ppc stable, bug #159822
-
- 06 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.5.ebuild,
- -git-1.4.4.2.ebuild:
- QA: Clean unused versions.
-
- 06 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.1.1.ebuild,
- git-1.4.2.4.ebuild, git-1.4.3.5.ebuild, git-1.4.4.2.ebuild,
- git-1.4.4.3.ebuild:
- einfo -> elog
-
- 04 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> git-1.4.4.3.ebuild:
- Stable on IA64.
-
- 04 Jan 2007; Torsten Veller <tove@gentoo.org> git-1.4.4.3.ebuild:
- Stable on x86 (#159822)
-
- 04 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.4.3.ebuild:
- Stable on alpha as per bug #159822
-
- 04 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> git-1.4.4.3.ebuild:
- Stable on sparc wrt #159822
-
- 03 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.4.3.ebuild:
- git-instaweb has some additional dependencies, fixes bug #159698
-
- 31 Dec 2006; Robin H. Johnson <robbat2@gentoo.org> git-1.4.3.5.ebuild,
- git-1.4.4.2.ebuild, git-1.4.4.3.ebuild:
- Fix type in einfo.
-
-*git-1.4.4.3 (20 Dec 2006)
-
- 20 Dec 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.3.ebuild:
- New upstream version.
-
-*git-1.4.4.2 (07 Dec 2006)
-
- 07 Dec 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.4.ebuild,
- -git-1.4.4.1.ebuild, +git-1.4.4.2.ebuild:
- New upstream version. Clean old ebuilds for the 1.4.4 branch.
-
-*git-1.4.4.1 (26 Nov 2006)
-
- 26 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.1.ebuild:
- New upstream version.
-
- 16 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.4.ebuild:
- Remove tar-tree tests if we don't have unzip installed.
-
-*git-1.4.4 (15 Nov 2006)
-
- 15 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.ebuild:
- New upstream version.
-
-*git-1.4.3.5 (12 Nov 2006)
-
- 12 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.4.ebuild,
- +git-1.4.3.5.ebuild:
- New upstream version, superceeds 1.4.3.4
-
- 09 Nov 2006; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
- git-1.4.3.4.ebuild:
- Add ~mips to keywords
-
- 08 Nov 2006; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
- git-1.4.1.1.ebuild:
- Stable on mips
-
-*git-1.4.3.4 (05 Nov 2006)
-
- 05 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.3.ebuild,
- +git-1.4.3.4.ebuild:
- New upstream version.
-
-*git-1.4.3.3 (30 Oct 2006)
-
- 30 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.2.ebuild,
- +git-1.4.3.3.ebuild:
- New upstream version, remove old one.
-
- 28 Oct 2006; Christian Faulhammer <opfer@gentoo.org> git-1.4.2.4.ebuild:
- x86 stable wrt bug #151669
-
-*git-1.4.3.2 (24 Oct 2006)
-
- 24 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.1.ebuild,
- +git-1.4.3.2.ebuild:
- New upstream version, remove buggy one. Also add a pkg_postinst message as
- per bug #152320.
-
-*git-1.4.3.1 (21 Oct 2006)
-
- 21 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.ebuild,
- +git-1.4.3.1.ebuild:
- New upstream version, remove a buggy one.
-
- 21 Oct 2006; <nixnut@gentoo.org> git-1.4.2.4.ebuild:
- Stable on ppc wrt bug 151669
-
- 20 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.3.ebuild:
- Add a needed fixlocalpod call to src_install spotted by Jakub Moc
- <jakub@gentoo.org>
-
-*git-1.4.3 (19 Oct 2006)
-
- 19 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.1.6.ebuild,
- +git-1.4.3.ebuild:
- New upstream version. Remove ancient one (1.1.6) since It is no longer useful
-
- 18 Oct 2006; Patrick McLean <chutzpah@gentoo.org> git-1.4.2.4.ebuild:
- Stable on amd64 (bug #151669).
-
- 17 Oct 2006; Jeroen Roovers <jer@gentoo.org> git-1.4.2.4.ebuild:
- Stable for HPPA (bug #151669).
-
- 17 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.4.2.4.ebuild:
- Stable on sparc wrt #151669
-
- 17 Oct 2006; Markus Rothe <corsair@gentoo.org> git-1.4.2.4.ebuild:
- Stable on ppc64; bug #151669
-
- 17 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.4.ebuild:
- Stable on alpha as per bug #151669
-
-*git-1.4.2.4 (17 Oct 2006)
-
- 17 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.0-r1.ebuild,
- -git-1.4.2.3.ebuild, +git-1.4.2.4.ebuild:
- New upstream version. Remove old (1.4.0-r1) and buggy (1.4.2.3) ones.
-
- 04 Oct 2006; Fabian Groffen <grobian@gentoo.org> git-1.4.0-r1.ebuild,
- git-1.4.1.1.ebuild, git-1.4.2.3.ebuild:
- Dropped ~ppc-macos, see you in prefix.
-
-*git-1.4.2.3 (02 Oct 2006)
-
- 02 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.2.1.ebuild,
- -git-1.4.2.2.ebuild, +git-1.4.2.3.ebuild:
- New upstream version. Remove buggy ones.
-
-*git-1.4.2.2 (30 Sep 2006)
-
- 30 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.2.2.ebuild:
- New upstream version.
-
- 27 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.2.ebuild:
- Remove git-1.4.2 since it has a buggy builtin-mv command.
-
- 22 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.1.ebuild:
- Typo fixed. Bug #148413 thanks to Jimmy.Jazz@gmx.net
-
- 13 Sep 2006; Aron Griffis <agriffis@gentoo.org> git-1.4.1.1.ebuild:
- Mark 1.4.1.1 stable on ia64
-
-*git-1.4.2.1 (13 Sep 2006)
-
- 13 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.2.1.ebuild:
- New upstream version.
-
- 11 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org>
- +files/git-daemon.xinetd, git-1.4.2.ebuild:
- Add a xinetd configuration file.As per bug #145177. Thanks to Patrick
- Guimond <patg@patg.homeunix.org>
-
- 07 Sep 2006; Christel Dahlskjaer <christel@gentoo.org> git-1.4.1.1.ebuild:
- Added ~mips, as per bug #126850
-
- 15 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.ebuild:
- Typo fixed: donsider -> consider
-
- 14 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.ebuild:
- Only run git-svn tests if we have dev-util/subversion
-
- 14 Aug 2006; <dougg@gentoo.org> git-1.1.6.ebuild, git-1.4.0-r1.ebuild,
- git-1.4.1.1.ebuild, git-1.4.2.ebuild:
- fixing tcltk USE flag as per bug #17808
-
- 13 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.ebuild:
- app-editors/emacs -> virtual/emacs
-
-*git-1.4.2 (13 Aug 2006)
-
- 13 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.2.ebuild:
- New upstream version.
-
- 12 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.4.ebuild,
- -git-1.3.3.ebuild, -git-1.4.0.ebuild, -git-1.4.1.ebuild:
- Clean old versions.
-
- 12 Aug 2006; Krzysiek Pawlik <nelchael@gentoo.org> git-1.4.1.1.ebuild:
- Stable on x86, see bug #143586.
-
- 12 Aug 2006; Markus Rothe <corsair@gentoo.org> git-1.4.1.1.ebuild:
- Stable on ppc64; bug #143586
-
- 12 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.1.1.ebuild:
- Add ( emacs? app-editors/emacs ) dependency since elisp-common.eclass
- doesn't provide it. Thanks to nixnut@gentoo.org for noticing.
-
- 12 Aug 2006; Luca Barbato <lu_zero@gentoo.org> git-1.4.1.1.ebuild:
- Marked ppc
-
- 11 Aug 2006; Jeroen Roovers <jer@gentoo.org> git-1.4.1.1.ebuild:
- Stable for HPPA (bug #143586).
-
- 11 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.4.1.1.ebuild:
- Stable on sparc wrt #143586
-
- 11 Aug 2006; Daniel Gryniewicz <dang@gentoo.org> git-1.4.1.1.ebuild:
- Marked stable on amd64 for
-
- 11 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.1.1.ebuild:
- Stable on alpha wrt bug #143586
-
- 08 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.1.1.ebuild:
- Recommend dev-perl/libwww-perl to use git-svn. Fixes bug #142116.
-
-*git-1.4.1.1 (25 Jul 2006)
-
- 25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> +git-1.4.1.1.ebuild:
- Version bump.
-
- 11 Jul 2006; Aron Griffis <agriffis@gentoo.org> git-1.4.0-r1.ebuild,
- git-1.4.1.ebuild:
- Mark 1.4.0-r1 stable on ia64, mark 1.4.1 ~ia64
-
-*git-1.4.1 (02 Jul 2006)
-
- 02 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> +git-1.4.1.ebuild:
- Version bump to version 1.4.1. No gitweb installed as of yet.
-
- 28 Jun 2006; Fabian Groffen <grobian@gentoo.org> git-1.4.0-r1.ebuild:
- Marked ~ppc-macos
-
-*git-1.4.0-r1 (27 Jun 2006)
-
- 27 Jun 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.0-r1.ebuild:
- Install gitview and git-svn. Fixes bug #137942, thanks to Nguyen Thai Ngoc
- Duy <pclouds@gentoo.org>.
-
-*git-1.4.0 (10 Jun 2006)
-
- 10 Jun 2006; Fernando J. Pereda <ferdy@gentoo.org> metadata.xml,
- -git-1.2.6.ebuild, -git-1.3.1.ebuild, -git-1.3.2.ebuild,
- +git-1.4.0.ebuild:
- New upstream version. Removed Carlos from metadata.xml as he requested.
- Removed some old versions, too.
-
- 21 May 2006; Fernando J. Pereda <ferdy@gentoo.org> +files/70git-gentoo.el,
- git-1.3.3.ebuild:
- Add USE=emacs support. Patch by Christian Schlotter <again@gmx.de> in bug
- #133883.
-
-*git-1.3.3 (17 May 2006)
-
- 17 May 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.3.3.ebuild:
- New upstream version.
-
- 14 May 2006; Diego Pettenò <flameeyes@gentoo.org> git-1.3.2.ebuild:
- Add ~x86-fbsd keyword.
-
-*git-1.3.2 (04 May 2006)
-
- 04 May 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.3.2.ebuild:
- New upstream version.
-
-*git-1.3.1 (25 Apr 2006)
-
- 25 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.3.0-r1.ebuild,
- +git-1.3.1.ebuild:
- Version bump. Remove 1.3.0-r1.
-
- 21 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.2.4.ebuild:
- Stable on hppa
-
-*git-1.3.0-r1 (19 Apr 2006)
-
- 19 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.3.0.ebuild,
- +git-1.3.0-r1.ebuild:
- Remove unneeded dependencies and add a new tarball with some late
- documentation changes. Install git-send-email unconditionally since now it
- doesn't require extra deps (the related USE-flag goes away). Inform about
- git-cvsserver. Remove the buggy old one.
-
-*git-1.3.0 (18 Apr 2006)
-
- 18 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.3.0.ebuild:
- New upstream version.
-
-*git-1.2.6 (08 Apr 2006)
-
- 08 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.5.ebuild,
- +git-1.2.6.ebuild:
- New upstream version. Removed 1.2.5
-
-*git-1.2.5 (05 Apr 2006)
-
- 05 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.3.ebuild,
- +git-1.2.5.ebuild:
- New upstream version. Use the X use flag instead of tcltk. Remove 1.2.3.
-
- 22 Mar 2006; Luis Medinas <metalgod@gentoo.org> git-1.2.4.ebuild:
- Stable on amd64. Bug #126850.
-
- 22 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.2.4.ebuild:
- ~hppa blessing
-
- 20 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.2.4.ebuild:
- Stable on sparc wrt #126850
-
- 20 Mar 2006; Luca Barbato <lu_zero@gentoo.org> git-1.2.4.ebuild:
- Marked ppc
-
- 19 Mar 2006; Krzysiek Pawlik <nelchael@gentoo.org> git-1.2.4.ebuild:
- Stable on x86, see bug #126850.
-
- 19 Mar 2006; Markus Rothe <corsair@gentoo.org> git-1.2.4.ebuild:
- Stable on ppc64; bug #126850
-
- 19 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.2.4.ebuild:
- Stable on alpha wrt bug #126850
-
-*git-1.2.4 (02 Mar 2006)
-
- 02 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.1.ebuild,
- -git-1.2.2.ebuild, +git-1.2.4.ebuild:
- New upstream version. Trim old ones
-
-*git-1.2.3 (23 Feb 2006)
-
- 23 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.2.3.ebuild:
- New upstream version
-
-*git-1.2.2 (19 Feb 2006)
-
- 19 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.0.ebuild,
- +git-1.2.2.ebuild:
- New upstream version. Remove old one.
-
- 18 Feb 2006; Simon Stelling <blubb@gentoo.org> git-1.1.6.ebuild:
- stable on amd64
-
- 17 Feb 2006; Joseph Jezak <josejx@gentoo.org> git-1.1.6.ebuild:
- Marked ppc stable for bug #122887.
-
-*git-1.2.1 (16 Feb 2006)
-
- 16 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-0.7.ebuild,
- +git-1.2.1.ebuild:
- New upstream version, remove ancient one
-
- 15 Feb 2006; Markus Rothe <corsair@gentoo.org> git-1.1.6.ebuild:
- Stable on ppc64; bug #122887
-
- 15 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.1.6.ebuild:
- Stable on sparc wrt #122887
-
- 15 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> git-1.1.6.ebuild:
- Stable on x86, bug #122887.
-
- 15 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8a.ebuild,
- -git-0.99.9n.ebuild, -git-1.0.6.ebuild, git-1.1.6.ebuild:
- git-1.1.6 stable on alpha. Remove ancienct ~arch versions
-
- 13 Feb 2006; Stuart Longland <redhatter@gentoo.org> git-1.1.6.ebuild:
- Added ~mips to git-1.1.6 as per bug #108215.
-
-*git-1.2.0 (13 Feb 2006)
-
- 13 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.1.5.ebuild,
- +git-1.2.0.ebuild:
- Version bump, remove 1.1.5
-
-*git-1.1.6 (30 Jan 2006)
-
- 30 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.1.3.ebuild,
- -git-1.1.4.ebuild, +git-1.1.6.ebuild:
- New upstream version, remove old ones
-
-*git-1.1.5 (28 Jan 2006)
-
- 28 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.1.5.ebuild:
- new upstream version
-
-*git-1.1.4 (20 Jan 2006)
-
- 20 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.1.2.ebuild,
- +git-1.1.4.ebuild:
- New upstream version.
-
-*git-1.1.3 (17 Jan 2006)
-
- 17 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org>
- -files/git-1.1.1-glossary-from-1.1.0.diff, -git-1.1.1.ebuild,
- +git-1.1.3.ebuild:
- new upstream version, remove 1.1.1
-
-*git-1.1.2 (14 Jan 2006)
-
- 14 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.1.2.ebuild:
- new upstream version
-
- 12 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.1.1.ebuild:
- We should only try to apply git-1.1.1-glossary-from-1.1.0.diff if USE=doc.
- Fixes bug #118755, thanks to Christian Heim <phreak@gentoo.org>
-
-*git-1.1.1 (11 Jan 2006)
-
- 11 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org>
- +files/git-1.1.1-glossary-from-1.1.0.diff, -git-1.1.0.ebuild,
- +git-1.1.1.ebuild:
- Version bump. Remove 1.1.0 as it reported a wrong version and might make
- confuse bugreports.
-
- 09 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.1.0.ebuild:
- http://kernel.org/pub -> mirror://kernel/ in SRC_URI
-
-*git-1.1.0 (09 Jan 2006)
-
- 09 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.1.0.ebuild:
- New upstream version
-
-*git-1.0.6 (28 Dec 2005)
-
- 28 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-1.0.5.ebuild,
- +git-1.0.6.ebuild:
- A new day, means a new upstream version
-
-*git-1.0.5 (27 Dec 2005)
-
- 27 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-1.0.4.ebuild,
- +git-1.0.5.ebuild:
- New upstream version.
-
-*git-1.0.4 (24 Dec 2005)
-
- 24 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-1.0.3.ebuild,
- +git-1.0.4.ebuild:
- New upstream version. Remove 1.0.3
-
-*git-1.0.3 (23 Dec 2005)
-
- 23 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org>
- -files/git-1.0.0-http-fix.patch, -git-1.0.0-r1.ebuild, +git-1.0.3.ebuild:
- Version bump, remove old version
-
-*git-1.0.0-r1 (21 Dec 2005)
-
- 21 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org>
- +files/git-1.0.0-http-fix.patch, -git-1.0.0.ebuild, +git-1.0.0-r1.ebuild:
- This is what upstream calls 1.0.0a. Remove 1.0.0 since it is a bit broken
-
-*git-1.0.0 (21 Dec 2005)
-
- 21 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> +git-1.0.0.ebuild:
- New upstream version
-
-*git-0.99.9n (15 Dec 2005)
-
- 15 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9m.ebuild,
- +git-0.99.9n.ebuild:
- New upstream version, remove old one
-
-*git-0.99.9m (12 Dec 2005)
-
- 12 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9l.ebuild,
- +git-0.99.9m.ebuild:
- version bump, remove old version
-
-*git-0.99.9l (04 Dec 2005)
-
- 04 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9k.ebuild,
- +git-0.99.9l.ebuild:
- version bump. remove old version
-
- 02 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org>
- -files/git-0.99.9j-binary-diff-fix.patch:
- remove unneeded patch
-
-*git-0.99.9k (01 Dec 2005)
-
- 01 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9j.ebuild,
- +git-0.99.9k.ebuild:
- version bump, remove old version
-
- 30 Nov 2005; Tom Gall <tgall@gentoo.org> git-0.99.9j.ebuild:
- stable on ppc64 (and works well!)
-
- 19 Nov 2005; Carlos Silva <r3pek@gentoo.org>
- +files/git-0.99.9j-binary-diff-fix.patch, -files/git-0.99.9j-diff.patch,
- git-0.99.9j.ebuild:
- Rename the patch to a more understandable name
-
-*git-0.99.9j (19 Nov 2005)
-
- 19 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org>
- +files/git-0.99.9j-diff.patch, -git-0.99.9i.ebuild, +git-0.99.9j.ebuild:
- version bump; this is 1.0rc2. Remove old version (aka 1.0rc1)
-
-*git-0.99.9i (15 Nov 2005)
-
- 15 Nov 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.9h.ebuild,
- +git-0.99.9i.ebuild:
- Version bump
-
-*git-0.99.9h (14 Nov 2005)
-
- 14 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9g.ebuild,
- +git-0.99.9h.ebuild:
- version bump, remove old version
-
-*git-0.99.9g (10 Nov 2005)
-
- 10 Nov 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.9f.ebuild,
- +git-0.99.9g.ebuild:
- Version bump
-
-*git-0.99.9f (08 Nov 2005)
-
- 08 Nov 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.9e.ebuild,
- +git-0.99.9f.ebuild:
- Version bump
-
-*git-0.99.9e (07 Nov 2005)
-
- 07 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9d.ebuild,
- +git-0.99.9e.ebuild:
- version bump, remove old one
-
-*git-0.99.9d (06 Nov 2005)
-
- 06 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9c.ebuild,
- +git-0.99.9d.ebuild:
- version bump, remove old version
-
-*git-0.99.9c (04 Nov 2005)
-
- 04 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9b.ebuild,
- +git-0.99.9c.ebuild:
- version bump, remove old version
-
-*git-0.99.9b (02 Nov 2005)
-
- 02 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9.ebuild,
- +git-0.99.9b.ebuild:
- version bump, removed old version
-
-*git-0.99.9 (30 Oct 2005)
-
- 30 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8f.ebuild,
- +git-0.99.9.ebuild:
- version bump. remove old version
-
-*git-0.99.8f (19 Oct 2005)
-
- 19 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8d.ebuild,
- -git-0.99.8e.ebuild, +git-0.99.8f.ebuild:
- version bump, remove old versions
-
-*git-0.99.8e (18 Oct 2005)
-
- 18 Oct 2005; Carlos Silva <r3pek@gentoo.org> +git-0.99.8e.ebuild:
- Version bump
-
-*git-0.99.8d (16 Oct 2005)
-
- 16 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8c-r1.ebuild,
- +git-0.99.8d.ebuild:
- version bump, remove old version
-
-*git-0.99.8c-r1 (14 Oct 2005)
-
- 14 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8b.ebuild,
- -git-0.99.8c.ebuild, +git-0.99.8c-r1.ebuild:
- provide a custom src_test since the default one fails. fix one pkg_postinst
- einfo. remove 0.99.8{b,c}
-
-*git-0.99.8c (11 Oct 2005)
-
- 11 Oct 2005; Carlos Silva <r3pek@gentoo.org> +git-0.99.8c.ebuild:
- New version from upstream. This version have an important fix to
- git-ls-tree. When two identical blobs or trees were contained in a tree, the
- earlier code mislabeled them in the output.
-
-*git-0.99.8b (06 Oct 2005)
-
- 06 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> +git-0.99.8b.ebuild:
- version bump. Fix git-send-email installation. Added missing dependency on
- dev-perl/Email-Valid. Dropped ~mips keyword, see bug #108215 for more
- information.
-
-*git-0.99.8a (05 Oct 2005)
-
- 05 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
- +files/git-daemon.confd, +files/git-daemon.initd, metadata.xml,
- -git-0.99.8.ebuild, +git-0.99.8a.ebuild:
- Added myself to metadata. Version bump, added init script and its conf.d
- file. Fixed USE=doc. Removed not needed deps and rephrased pkg_postinst.
- Removed old version
-
-*git-0.99.8 (03 Oct 2005)
-
- 03 Oct 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.6.ebuild,
- -git-0.99.7d.ebuild, +git-0.99.8.ebuild:
- Version bump
-
- 28 Sep 2005; Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com>
- git-0.99.7d.ebuild:
- mark ~mips
-
-*git-0.99.7d (25 Sep 2005)
-
- 25 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.7a-r1.ebuild,
- +git-0.99.7d.ebuild:
- Version bump. Applied the patches found in bug #106998
-
-*git-0.99.7a-r1 (22 Sep 2005)
-
- 22 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.7a.ebuild,
- +git-0.99.7a-r1.ebuild:
- Rev bump to fix some dependencies and added the tcltk use flag
-
-*git-0.99.7a (21 Sep 2005)
-
- 21 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.7.ebuild,
- +git-0.99.7a.ebuild:
- Version bump. Also did some cleanup on the DEPEND/RDEPEND var's and added
- the gitsendemail use flag. Fixes bug #106791, thx to Max Loparyev.
-
-*git-0.99.7 (19 Sep 2005)
-
- 19 Sep 2005; Carlos Silva <r3pek@gentoo.org> +git-0.99.7.ebuild:
- Version bump
-
- 18 Sep 2005; Markus Rothe <corsair@gentoo.org> git-0.99.6.ebuild:
- Added ~ppc64 (bug #106318)
-
- 12 Sep 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild,
- git-0.99.6.ebuild:
- Fixed homepage. Closes bug #105648
-
-*git-0.99.6 (08 Sep 2005)
-
- 08 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.5-r2.ebuild,
- +git-0.99.6.ebuild:
- Version bump. Removed version 0.99.5
-
-*git-0.99.5-r2 (04 Sep 2005)
-
- 04 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.5-r1.ebuild,
- +git-0.99.5-r2.ebuild:
- Forgot to revbump
-
- 04 Sep 2005; Carlos Silva <r3pek@gentoo.org> git-0.99.5-r1.ebuild:
- Added app-text/rcs as dep. Closes bug #104536
-
-*git-0.99.5-r1 (27 Aug 2005)
-
- 27 Aug 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.4.ebuild,
- -git-0.99.5.ebuild, +git-0.99.5-r1.ebuild:
- Removed version 0.99.4. Revbumped version 0.99.5 to add a missing dep
- (dev-util/cvsps). Closes bug #103962
-
- 26 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> git-0.99.5.ebuild:
- marked ~alpha wrt bug #101907
-
-*git-0.99.5 (25 Aug 2005)
-
- 25 Aug 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.3.ebuild,
- git-0.99.4.ebuild, +git-0.99.5.ebuild:
- Version bump
-
- 24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> git-0.7.ebuild:
- Stable on sparc
-
-*git-0.99.4 (13 Aug 2005)
-
- 13 Aug 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild,
- +git-0.99.4.ebuild:
- Marked version 0.7 stable on x86 and added version 0.99.4
-
-*git-0.99.3 (09 Aug 2005)
-
- 09 Aug 2005; Michał Januszewski <spock@gentoo.org> +git-0.99.3.ebuild:
- Version bump.
-
- 15 Jul 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild:
- Closing bug #98032. thx Carsten Lohrke
-
- 24 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> git-0.7.ebuild:
- To ~sparc
-
- 19 May 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild:
- Adding net-misc/curl as a dep. Thanks to Priit Laes in bug #93247
-
- 17 May 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild:
- Removing git-pasky references
-
- 07 May 2005; David Holm <dholm@gentoo.org> git-0.7.ebuild:
- Added to ~ppc.
-
-*git-0.7 (05 May 2005)
-
- 05 May 2005; Carlos Silva <r3pek@gentoo.org> -git-0.6.ebuild,
- +git-0.7.ebuild:
- Removing old git version (0.6) and adding the new one (0.7)
-
-*git-0.6 (26 Apr 2005)
-
- 26 Apr 2005; Carlos Silva <r3pek@gentoo.org> -git-0.04.ebuild,
- +git-0.6.ebuild:
- Bumping to 0.6
-
-*git-0.5 (21 Apr 2005)
-
- 21 Apr 2005; Carlos Silva <r3pek@gentoo.org> +git-0.5.ebuild:
- Version bump
-
- 15 Apr 2005; Carlos Silva <r3pek@gentoo.org> :
- Cleaning up the ebuild
-
-*git-0.04 (15 Apr 2005)
-
- 15 Apr 2005; Carlos Silva <r3pek@gentoo.org> +metadata.xml:
- Initial import
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 4ec4b29..99e0dcb 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,61 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX 50git-gentoo.el 472 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3 WHIRLPOOL 887682f79182f6728af3c0fd2ee0e81319d49761a987559684be5e4acae4af579a5b8d1197ddba31452cec179de3c8f5784cc85ad61f78b400e42c204c93f642
-AUX git-1.7.12-git-svn-backport.patch 37717 SHA256 5379c97de060617ca6cef65bcc4f78a986943bdc587517af27c8ae80bb7bfafd SHA512 ad716ed9c449961d7b0bfe29f3450e0a4d4fe2c7c8069916bb0a69a6ee47bab5f7c4b68496b31cd67e6472aa05723ef8f32d8d7f56cdd2f4a40190058e324a8b WHIRLPOOL 30ecbf8cd97903d7a9b5b710f53b3ef6ea3092c224ebc82682a1840d93a28e6680c318d0e69af252b4901255f8f12a992b8a18eb46a9a015fc383a7c70312e89
-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
-AUX git-1.8.2-texinfo.patch 515 SHA256 86d60eeae9a21fa64047401b80a5e082b0f306a68efab139979bc979fb31830f SHA512 9a9920f6b2d170f3ca71ae4c35cb001252e5f43e087f5b49f9aa617606fb3b7173aea5ef91c5d195b36bf1a1964e936d777797e03642a0da55a596e68c13a29c WHIRLPOOL 9e66c94c5eac4fe22f7cdd400c68893368a21550a5aadd467c53591e62bcf146d6a08db1e7a3cb8b32a45d5568c0b7a7462a0c6f8709ea35a284845a2c5e5820
-AUX git-1.8.4-optional-cvs.patch 11737 SHA256 7f8f1bd8f2953044433d90edea2bae7334e0d14ee7dc5e6e327e4caec8b0100b SHA512 2966582ccd5640c34aba156a955b458176ec2d450471279ec77200cbd1fb19f84dabc2a913fea17ae7503609074f8c80c05bb93f7244acfe296c078cf4a030ac WHIRLPOOL 07d5ab8ab60f6338ff1c9c7b8817938917ec12a5c360e595d7a40ffbbff18b439fea576c70dd4ddc7547edab23f4e86110f201c88be68e5a874d295f6051e592
-AUX git-1.8.5-optional-cvs.patch 10088 SHA256 a35732c6d3bfbe62b298a730652a85f7deac6bdd59bd842b4dddedaa6ad0f1fb SHA512 f78f82af4e51002553157e61a16fb9855743acaa9cd9b9914e047eb3ff7f7fc4aa2d89e9c7f86fb6bf9d3f5854e44519c72669c6436132c728b28a4599d184f1 WHIRLPOOL f8080b56bff0c1add20d9c3c3e2b842e351029cae02e147307260a6504de4300d01262176c03203259037e6f98ffb043e1e1b4a914b1110d666b30383ead2e24
-AUX git-daemon.confd 712 SHA256 9bf02170dcf73e930a992adf44326ed7c27159d41a503ca4d9371861ee5030c9 SHA512 bf715ce0d3cd6a5be405d7739bc06252b95f93f9874716dadf666d33063be6ab3e37ae1ee253ed291bfb4f66df268b44d9653672851e1bb40112c0aae08fc4ea WHIRLPOOL 13643f53cd2f9675867ff194d680cd8ffe91bccbd0b15ae41b45471ec7310c09af8335619ff2a1562a835d8449eb44f9a9e9453c3ba15005763497c668d59181
-AUX git-daemon.initd 738 SHA256 48e7e1228c9811079dce8fecc560000cf645de5b4bb697f8f8ad3f906906330b SHA512 2b1cff1e1bf85db1674bd130639a7557fd4bb1ee2e9b2e7d1e2dc28274b6fa6c6c150acf37d0e652173980c640cb0f7ac36332012182955ecc4d21c6258bfd4d WHIRLPOOL c47dd7d0f3b183e14f3ca4e499b1ceef0b88f11675c7f6dee225516f062f556bfd41aa7f87d6cdf490411101ae541ab5fe173069dbfab6b1473a2b3d951ce901
-AUX git-daemon.socket 116 SHA256 66a064b67e441306bf765d3d3115ac55bafa2098400af134f852d4aecf8608d7 SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701 WHIRLPOOL 1098e46b6d2be3c8d758a087408aed91e0c01625542dfc90fbff80ed8b40d2a54ea4ab45b4d003ef0b0b8ed1411e1146a58076b68096389412a61fe2d09214dd
-AUX git-daemon.xinetd 260 SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c WHIRLPOOL 155bfca2c071d5368de09412d1d937cefd3b5cd28a991b99845551738440b92791c33a67ef41be711dbf06fc4faf4a299cbaf1f410b119fe5deb5a4cd741803d
-AUX git-daemon_at.service 395 SHA256 c427e37d3e859c13f9441b20c7cb6aba7bca048cb70809ee1253726e733fac7d SHA512 4931954564ae7d2e21e49c8f251bae7c6be8a420f75e68e23214c85993dceb81b719e5fee11366b82b28ef5fa27a9ae2b2faa5c79c16d367c6d50fb03bbd0cff WHIRLPOOL a18f8fe6755c85e8d332d989637105d7842e8fc107a263dd0252e34e30dca21aaff593041bca3f0a728b995f19310d3cab8c43e2a7524ee9e612cca03c7ffccf
-DIST git-1.8.1.5.tar.gz 4306780 SHA256 f8b0be6e53e866f83cde64fa947011ebac56077bd1273c2e894038878986b955 SHA512 19ee4c76c66595f24d5093648202840f39356c111124017beeb32a4d79e8ce362d901ff4a09ad67c1392c5d1e48068a3a4634ad2865d8231e70b197a1cf0fdd3 WHIRLPOOL 559a89140b95bc413b6be5f4d09abc75a038d50381ae0fa61a5fa1c190edf92a5cf9ec2a938ba5d1ccd5563bb19883254773599749bb12488761c125b510b5e2
-DIST git-1.8.2.1.tar.gz 4400440 SHA256 ed6dbf91b56c1540627563b5e8683fe726dac881ae028f3f17650b88fcb641d7 SHA512 d75a36a91b0522ca3a5c792473e16fc98dd9de082b4c0e9a75ebc525fa334edfdcb6dbf138e1bdede711f2158f24e8a8ba8499b89f9a82be1b5e60eb4ba5d33e WHIRLPOOL 587afbadca06674b751385b6f5fcda3d74db159a03bdbb1d477d4d9d4eb792d020a6f97906d2bf7d69f2f14432aaf6634d4274aa14e377ca6c865676853fd060
DIST git-1.8.3.2.tar.gz 4474347 SHA256 2f798db86859c85608fe4120f52a1b1cb13ca9c4daa4f59eb1dc090280f46473 SHA512 6e19948821dfbf78c5b9ea95614d3c10f4625583e3c17b6c55110b74f28679e525c449179cf49c2587a86c3b7fd7b6a27589824fcea0ec6fb69ca752a6942931 WHIRLPOOL 26892e039b67b35ae9df0a124d0812b36a22f481f146561b733a758b89a00770c05902c2820f2a783bc0fac07ecb335accbc939d21481da821177e0548d6a077
-DIST git-1.8.4.5.tar.gz 4677738 SHA256 37772b18b8184bb3b746963b8e1047a1205447df68c2b25698351434f8092d90 SHA512 56060aebf013becf884e27bf2a71a140c17055e0214a6a461ad3476d1d7017f63f3e2231047040adc5c42c2a08b0e75c9ae12b50c913c6689494337f3f7ad8e2 WHIRLPOOL 4dc0e1fbb8bf1d02706ec3943f506cf4f28a5f9146797dc35ac5401db752810220e1da109e3ce0750a8b2e2d7b7340ce223fe55c0279a1fdf60c457117da64c9
-DIST git-1.8.5.1.tar.gz 4755003 SHA256 521589b48f6defa63a99241121968646ef9a7ab5919b88e08fdbaadfe071561b SHA512 5ad5630771ca66e51b384f6651e77e18c6e3c8d349ceeeabd51d6d0ea23e5d0481d8dc9dc33e2e403fe2abf777906b65566858c42fa98241919ad4f07c6b3e37 WHIRLPOOL 125264ffda81e4a6fc5d6100ad06be0ae9bab2212214b413ca8dbbb84b958a00d234d819e874a09c954cc1dbe3befc751dc51873cb6abff5f6ec72b85a491c26
DIST git-1.8.5.2.tar.gz 4755707 SHA256 e986da24893197e33d835150c456708441e4a116a726ce9312a27f6de804f7b2 SHA512 73e408dd787b73a0f3935e37540d5da32a2f8d6d84af60d3ec7e224c3a953cc62eea749c7a689f8cca3b54e633f2520ed23d910ca5932021523e1fb750bf2c0a WHIRLPOOL d6623742cce0bdcb6b5334d363b44edeb6413e45fa42cb2bce013e07796dc98bd865b0d2c2578f2bd526140dceea25b19acbe212dc6afec7903c5dd6ea794d7f
-DIST git-htmldocs-1.8.1.5.tar.gz 2060977 SHA256 108e34217b2668945ca78b36b08ceeb9fe283617fe68b8f181219076bb225de0 SHA512 0b46a95a47df4326633d10295eeb09d41cee78d9c30775f7784690715e3b5d607ff26027f4cd6036f31dfc458ba2757ceb5ed6ea675a863a5dc69d8e5a7b34f5 WHIRLPOOL d273fbee9fb0a68ef3f0d19ba2249481bd15ff69b289e046e975fccda7639102519aa79bff94f6317e6b73cc414128b8b8619fcda1a910b74770b0aba1694d26
-DIST git-htmldocs-1.8.2.1.tar.gz 2093688 SHA256 3f2482089eb345ec7d2ad61ad731c17ea87733b763585b580cf99b17194e0286 SHA512 8e7f25a0b230473f9e9290f61e9ea80a675459eea163ef76e281aa95747f5bc4df2ddb7f9bba9c2b0fb75819cd206f2415ba665bc986a628a07e8da4e5aa6efc WHIRLPOOL 574a01d1e403b25444ac88f66a939fcad1c96025a62f91550f328d400246955e61255dd403f3cf8302b961032f536e394b77228a8434c7b2065b564163f49114
DIST git-htmldocs-1.8.3.2.tar.gz 2115320 SHA256 805b7fc4399daf9258e8cc28ecc3dd043fdd7f339447f4d84674826916109246 SHA512 0890b60bfa110ca7eaf7aaddbf0aca9574f608addc384cece3c91c8c04ef6397064a0669f3d61d0a65eb120b626ccd85df26f04438ca301f349136cd55e5080a WHIRLPOOL 377c39ac7988a3c1bb6e80333c43878d38fe5eecbb75dcbcbef3c2186842fcc170a552d72be891f1479c336fdd6c5ac1ce1ca2c0adf9a8238bd057f093c3f912
-DIST git-htmldocs-1.8.4.5.tar.gz 2207155 SHA256 ecaaef864b1794301af4af17a4d378966ac1dbeee9a82f524d1ebc0b6d6da299 SHA512 1bb5d8fd2884f0bd39ff0924579a4bd16d225da10ae78cb3c535133d187b9306dce55d14a2df7fa0a40c6fa1df523eec2e118e2f5268dd624bbdb6c65fd32363 WHIRLPOOL ca5ce52d02eac3f079ab89eb5e41640c9dee724c8a3356b362eae0ba120cb9640c5f6a4576ae98fd42002f84ad066ed3e6254fdc77b95731ac1b17549b5911e5
-DIST git-htmldocs-1.8.5.1.tar.gz 2236187 SHA256 46a1eb32d110bc4a708cf7058852875e30277305ff2719ec672f7cdcd7a87075 SHA512 8d58463b5496278abed57b8e0b99d2be6e0a2ecff2ebda964f4f6e8336ebbe32e13ec0a87ec323247f90ada2383b2ced02f8204b416dc892348101662bdb9ecd WHIRLPOOL 65e38d20e8c1d6439e8126f5413334e06b25763aa36b09686ac220f043b1b6df6c8dc22c7f597d5393455ec083a578b572a7fb1627220ba678960ab10aaa848a
DIST git-htmldocs-1.8.5.2.tar.gz 2237867 SHA256 ba708ab1b5916960f61c22cf60eb6689ac62d1b6dbb6a460d98502815cdbff41 SHA512 824ab4cf879c0b3c1215f29f5dc3d18ae9bf15aad9deb7d81e81f8a57d500d304738c7e580f0fb5e3df2b6609d957b964938250a48145a3559b93ef1419eba2b WHIRLPOOL 962a2da1174ab401bdbafdca8cc9debd0fe927838b44bc8bbd0258a1da62cc32c10a6aa5a8a2bbf404fc257d0f4df981969ec3c2b9e898bcf3dc417d2f6517c6
-DIST git-manpages-1.8.1.5.tar.gz 528540 SHA256 b171761f13deb738a2464c9d3967c12539067a34d6f2bfa5739a1006786fd24a SHA512 c0106da12ae3beeba3c23e68b37113082d829fe80160c53df51aac207557a2045c662b4d01b5a1cb211e75f9f7629290b7ecf3907b3bdc828820382793414e8e WHIRLPOOL 3da3b254707c06cb069fa462561634a4f5869fadab6ab8a07301eeb0b2244f159415d409d71c5ebceb4a74ef51f645f2f4c9ca19080a84ee370b5787740d08c2
-DIST git-manpages-1.8.2.1.tar.gz 536718 SHA256 1d3bc31d10564d29d0c3a45f98f98a7d936dfcdb1692528bf2fdb2140fe89824 SHA512 a6463c8bc8a23301d89e985b88fa0073c154e126c51a1f7699cd09e79723ed463f46a9cf5dd63f9e2e46ee4111e6154ae86553bd446f5cf76db9fd4e3bff5a1f WHIRLPOOL 8aa3c57475d8cfd7c47019c4eb05c091c76fb0ec5d213942b5a16ee9f6c540111aecb6b754eb98578e9e129d4e8ba941a3bee326a2845b2a098cc30e1109d35d
DIST git-manpages-1.8.3.2.tar.gz 542769 SHA256 599bc8f6c56986a994a237cfebb53b4fab9051576775e32d0353e0455ab84115 SHA512 42fd781b924355c969ce381aae828f877059472741d7b53b0d1aad53f04c8a27b6b161b5dfc353098370ead73ccb9cdc86ac5374cf02829134f8c4d70bcbb7cf WHIRLPOOL 90226006a35b7b6e644f887981f2725238ff428f572425942701614e14fab5c8c5c602746de93a113d83d9b9c76ea1805a9c7cfa353305b0f817c33976048d77
-DIST git-manpages-1.8.4.5.tar.gz 565177 SHA256 8cf38e3a48425fe74c4a71286633ea895bd03d32481ea5112e9682a6adb3b4bf SHA512 6f9d56da7493ae50275f259ca65649a4dbada3a3d0e32e0a418ed73c2e2661c90f23cfe9a62800cbceec1db86a2bb7b93eccaaf28c282cb5046c2aea3f928774 WHIRLPOOL 1f92c6437214f9d8d998a916cf34399be4f49a5c2dd5fe930850ae3b7ef10da66594c8d4544fa313b485bdcfd9259322c5ba0b83f9403263c80d12b19ca8c5f0
-DIST git-manpages-1.8.5.1.tar.gz 569069 SHA256 1131fa830065c0224df601a055f6d9726d0f19fa87962d9db254a2d6e83d32ef SHA512 91446b550ae7971884943583c3562762bb3e338b9e65e94f0891af10488814dcf6756122d79db951a1e347acb311cd3dcf71e509c5c25927148da9a75e29a86e WHIRLPOOL 972cb803bbf6fcac3a068bd47b3dbc8a6eb26fccc18542111b6c74361fff83ecc9fcd45ab4024657cc6ebc5880b23a61d5a149d5e6d75dde0be3ed55d899bf28
DIST git-manpages-1.8.5.2.tar.gz 569581 SHA256 2aef8c084ee795e544b6fb8715cccc1109efca1ca4b8db1588a2a5186ddb10c6 SHA512 1ca37aff4d5ca6d4daa6e8f2b3114a63ebdb0bd42382e1ed1ff9d01117da2fd8bd3a662b9beab318fdffd682039589c9b5f50ced67122e96b0a0ffd213a4112a WHIRLPOOL 257bd0549fb63e5ef31f3575731a5c90eead5da556480d929877704086dc03dadd924713480d9c3f8b5890912d54dd8be48d970abb9f7e86c55d8655642fbfb5
-EBUILD git-1.8.1.5-r1.ebuild 17380 SHA256 c8f80e262d18edf7241739d726a1b8b10b1fa4fee83abc3b823492664457dec8 SHA512 29edcafcce548fb84bbc9748bfa765b9c663876536a78d320c48fe08ac26e60031a06b4b4bbee5a9c5a6d8d0754b92a8be6f21baef36bf5043d828d75fe2a7c5 WHIRLPOOL 62348b391c309f7263cd01db841e17034a0e35ed3560b9c52de70c5fbd512437ae7c2dc9a9db2ff86a86b77ebe872e7987f36cb1afaec9d4da32a9994ae31d72
-EBUILD git-1.8.1.5.ebuild 17238 SHA256 22108f9865e69ffe1e4dcd011ef5e44c19a7ab8d54f4d262da650145b1ac390d SHA512 48c693623447d8d1054a6187e5094d6d026a9dc0d7f6daeefdc1bf306a9a5b890a67ee0e92c332eaf02227aac2a72d6956962323010059dd3c314e2358aaac4b WHIRLPOOL a297ebf62c63d7d2da3d97306c2b13cd85ab4c9684b9b4e01fd28b5186ba225998bc6bcfe1123a2263801f4542c25d5d0a819a8746f846cae25c4d0582fef7dd
-EBUILD git-1.8.2.1.ebuild 17694 SHA256 e8e04cf2b65d526ae906b47f58e40960484cfc34089e8559bbdf87793a3c9451 SHA512 9b86c0fc803fc0ff4ac1f705cdc53d8ae15fe9f2ce840b3b0ef152e0175cb13e04cffaf8f6b914ca1171082f9570e074b82e6d5a8449f7b6d6e7cbf3d0922c41 WHIRLPOOL a9ab0427eeaf50f4e57c94625182daa76b61bb33550a6a32d8fb27c854d8395b3fdae9451927493a4e68ac0904857fd6492f604bae98e8ed26081b310988dbaf
-EBUILD git-1.8.3.2-r1.ebuild 17614 SHA256 0fd06a9ea0c955ab1725f2482971fed6a474c195d642e87c73a49a2f75f8f536 SHA512 84607b181d6dbafe087c380b309f80425de3905d3a34a97d5605b1bed1c59b50ffd27e0aad79410aeca66a342ed784724aa65bea91b11d169f64b098d2cf0f5a WHIRLPOOL 4d769be71a9cc83d592a6fc947a15f99018363028e50ccede7f653e54b8403b5365e32cafcd40ab0f57e21cf6dc1d58f9b5f7394113067612bb7efd3540b2512
-EBUILD git-1.8.4.5.ebuild 17847 SHA256 3b68c33ddab44a4dfe05e21607b172e1da00f9f67c5d6264725720752ba9dffa SHA512 0446ba1e7177d4daecc745d035241a5251f9229c232ff20e03d68304f8a8f5aa60e405786f4350d731a499bc8222a76017626c76eb4cee207f7a06370cba7a6c WHIRLPOOL 070e2b58bff6845e047d3ec2325fc2aa384837da2d1fffd970796fa7aa14a2884bd09901ad4cdfc0caafead3c4fc7e85d28a1f9432bcccdd339974650a79b48b
-EBUILD git-1.8.5.1.ebuild 17840 SHA256 5d6826836fd8efbf665fb1aff413a79a42004aa13a39e7869387012d945dcb07 SHA512 8594acea9e9e68fc519fb36f48747169a9b956fc95f0dcf382e4edc49f7745dcb731d9ab425b0fca56a8523f7b3d0f5bee87251bb0615318026a2056c61fe813 WHIRLPOOL 949dcf5016e6955997c6c02326c67f92120d38de7fb22359bacd04e330fdcd43737ecda5bd4605edf235c046525742ceefd4b21790615f7b0d4e72c6441d8db9
-EBUILD git-1.8.5.2.ebuild 17840 SHA256 3f823bc81f12c15312ecc249a3b45a0860fa90d780b4f2e6e8bae3c4db9cdc2e SHA512 789fcbcd05a5dee35fedabb79b1e7e316f20f45b86db201b5322641b08d98913ff507f43ddaf6d184774e4afe9e7e0086f0eace216de4ac2c13edcd47b171d01 WHIRLPOOL b42b88a9cc444215b4b316268341082e510b16cdd66068d0aaf55491f416e6fb074eb118216799fdd6669846792aac002ed5c5bebab886d43170cfb83fc8158f
-EBUILD git-9999.ebuild 17803 SHA256 beae98898e2f9554f9f3f3be3a30130c9c9efcc7da5314b8e49aec16756f8463 SHA512 d34ce325189f1d597fac71f67a59e90fa6dc9721d86c567101b64448e3a21080ccff2f38f36956b03307af1418941103567a8398dfd4aa676813b4eb24c27674 WHIRLPOOL 8e0daa447d9d3c51727a0fd43db37285969b7beff0b4a6e77ecba652c4829391527a3b28753aaf92c29d146c87c7d15e91c112cde0de61ccfe2e583ffe8781e0
-MISC ChangeLog 10664 SHA256 e9358a3b1c6fa8cd9afae1aedd99dd4f5b07be5dc08fbd6553c5ccbe93bb79e6 SHA512 8e11e667bb147587827b35c4aeb0f8c15c15335d56f6dbeb9acebe38ad36ef8ad2a2adb6f1728a72a4c1da34e1272a96ff0f0c2f8ed3273adb8970f3f8f01c69 WHIRLPOOL b974e583fcca40f5b4e9bdac256794f7222573717b403fe5e9d56cdd0f5603f2e82807fd55cb8a63d2ea6226f016ea8256c5a6a714464eb0793f16d70b7c1c94
-MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
-MISC metadata.xml 1876 SHA256 6b8a45678bfb4c0c7db85f5d6e94c4fc68ee2d8ed5ef6c83855ff3d6998b0773 SHA512 084b1be894ce30dd443cda711d120d6a436fafe59e4cd04a5879dbe88f17b9a7d5061377ed4cbd2c3cbd2f0d43ac168994e83368b3890b2135f63fa4fb935efa WHIRLPOOL 4051958b34b2c1aedc82e856de3554483eaa88ab4f5b43a9c1394aaa2bc925ca02edc13ca38c8379b947154249d4279fa227706b09776ee79a7b054f8e722d19
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSsZLFAAoJEPiazRVxLXTFMHQP/RaiJ9FbpF51tg2XwTtH6wkP
-PJJOueMKQs6A1X0RWa21GPzWFBPR0WUFFb3N84aC5RmXufbBaq6xxe1zggwScjI3
-8CPriALPBuH+K9GbOsz83Acx00Ah/ZrYLyuHC84wlPx6jjaWtYIT4PNCp+qJCCGJ
-JNFzWFeuvC6vMW6/cDZMCTp8xmL2jtr42YTDsHIqQUYLiNKkBSzWPVt93ZgVQhuU
-hvGTOWHOlIimZaloGmw6uZNQmyEDTsbH31lRWjJ24xIPL0zyHq0C12pF+s0YRR6Y
-UYqiEL8uvC1JesMSdVbgZsjRVNR1gCbEei9hDK0MsnUGDC/A8M6IYWE2eGn0RKBb
-lrzKP7znPyQQ4o0+fEAXSMh6r6xAL1JTsshflZRHa4TaoJ05/Rn2y3ja9DvoLWBf
-Yl5xAZSxBCOWf1r5dTTNhg3kZzERAUalCRF2lfkUFGw309BBe1Hxm3mvjK3zIN5D
-0dKi9kLXRjCFzuqxiPrxvXaogqf6Hu1ViiLGpbeg3GmCTU/qDob32YGjxBveCMBG
-O4qh5E88h85bhV1CFQqm0xCqhjQHZIcO2rtg1p0vQlsBO0oP5zqK+7aNc5KZLpKC
-CzoGGE0F7mi39rE3B0jvadKiwkXp7fZU+CWqFJTq33U5+N/qMTbbyRU6wNo8kNi/
-XUmmCCYFFnz6Y2KoVCZd
-=Syiu
------END PGP SIGNATURE-----
diff --git a/dev-vcs/git/files/git-1.7.12-git-svn-backport.patch b/dev-vcs/git/files/git-1.7.12-git-svn-backport.patch
deleted file mode 100644
index 0a254ec..0000000
--- a/dev-vcs/git/files/git-1.7.12-git-svn-backport.patch
+++ /dev/null
@@ -1,1288 +0,0 @@
-commit 0dfcf2dacd4be3f0c647a987b78def5136429165
-Merge: 889d358 5eaa1fd
-Author: Junio C Hamano <gitster@pobox.com>
-Date: Tue Aug 21 15:27:57 2012 -0700
-
- Merge branch 'ms/git-svn-1.7' into jch
-
- A series by Michael Schwern via Eric to update git-svn to revamp the
- way URLs are internally passed around, to make it work with SVN 1.7.
-
- Will merge to 'next' after pinging Eric to double check and then to 'master'.
-
- * ms/git-svn-1.7:
- git-svn: remove ad-hoc canonicalizations
- git-svn: canonicalize newly-minted URLs
- git-svn: introduce add_path_to_url function
- git-svn: canonicalize earlier
- git-svn: replace URL escapes with canonicalization
- git-svn: attempt to mimic SVN 1.7 URL canonicalization
- t9107: fix typo
- t9118: workaround inconsistency between SVN versions
- Git::SVN{,::Ra}: canonicalize earlier
- git-svn: path canonicalization uses SVN API
- Git::SVN::Utils: remove irrelevant comment
- git-svn: add join_paths() to safely concatenate paths
- git-svn: factor out _collapse_dotdot function
- git-svn: use SVN 1.7 to canonicalize when possible
- git-svn: move canonicalization to Git::SVN::Utils
- use Git::SVN{,::RA}->url accessor globally
- use Git::SVN->path accessor globally
- Git::SVN::Ra: use accessor for URLs
- Git::SVN: use accessor for URLs internally
- Git::SVN: use accessors internally for path
-
-diff --git a/git-svn.perl b/git-svn.perl
-index 828b8f0..0d77ffb 100755
---- a/git-svn.perl
-+++ b/git-svn.perl
-@@ -29,7 +29,16 @@ use Git::SVN::Prompt;
- use Git::SVN::Log;
- use Git::SVN::Migration;
-
--use Git::SVN::Utils qw(fatal can_compress);
-+use Git::SVN::Utils qw(
-+ fatal
-+ can_compress
-+ canonicalize_path
-+ canonicalize_url
-+ join_paths
-+ add_path_to_url
-+ join_paths
-+);
-+
- use Git qw(
- git_cmd_try
- command
-@@ -1231,7 +1240,7 @@ sub cmd_show_ignore {
- my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
- $gs ||= Git::SVN->new;
- my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
-- $gs->prop_walk($gs->{path}, $r, sub {
-+ $gs->prop_walk($gs->path, $r, sub {
- my ($gs, $path, $props) = @_;
- print STDOUT "\n# $path\n";
- my $s = $props->{'svn:ignore'} or return;
-@@ -1247,7 +1256,7 @@ sub cmd_show_externals {
- my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
- $gs ||= Git::SVN->new;
- my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
-- $gs->prop_walk($gs->{path}, $r, sub {
-+ $gs->prop_walk($gs->path, $r, sub {
- my ($gs, $path, $props) = @_;
- print STDOUT "\n# $path\n";
- my $s = $props->{'svn:externals'} or return;
-@@ -1262,7 +1271,7 @@ sub cmd_create_ignore {
- my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
- $gs ||= Git::SVN->new;
- my $r = (defined $_revision ? $_revision : $gs->ra->get_latest_revnum);
-- $gs->prop_walk($gs->{path}, $r, sub {
-+ $gs->prop_walk($gs->path, $r, sub {
- my ($gs, $path, $props) = @_;
- # $path is of the form /path/to/dir/
- $path = '.' . $path;
-@@ -1292,31 +1301,6 @@ sub cmd_mkdirs {
- $gs->mkemptydirs($_revision);
- }
-
--sub canonicalize_path {
-- my ($path) = @_;
-- my $dot_slash_added = 0;
-- if (substr($path, 0, 1) ne "/") {
-- $path = "./" . $path;
-- $dot_slash_added = 1;
-- }
-- # File::Spec->canonpath doesn't collapse x/../y into y (for a
-- # good reason), so let's do this manually.
-- $path =~ s#/+#/#g;
-- $path =~ s#/\.(?:/|$)#/#g;
-- $path =~ s#/[^/]+/\.\.##g;
-- $path =~ s#/$##g;
-- $path =~ s#^\./## if $dot_slash_added;
-- $path =~ s#^/##;
-- $path =~ s#^\.$##;
-- return $path;
--}
--
--sub canonicalize_url {
-- my ($url) = @_;
-- $url =~ s#^([^:]+://[^/]*/)(.*)$#$1 . canonicalize_path($2)#e;
-- return $url;
--}
--
- # get_svnprops(PATH)
- # ------------------
- # Helper for cmd_propget and cmd_proplist below.
-@@ -1330,7 +1314,7 @@ sub get_svnprops {
- $path = $cmd_dir_prefix . $path;
- fatal("No such file or directory: $path") unless -e $path;
- my $is_dir = -d $path ? 1 : 0;
-- $path = $gs->{path} . '/' . $path;
-+ $path = join_paths($gs->{path}, $path);
-
- # canonicalize the path (otherwise libsvn will abort or fail to
- # find the file)
-@@ -1431,8 +1415,8 @@ sub cmd_commit_diff {
- fatal("Needed URL or usable git-svn --id in ",
- "the command-line\n", $usage);
- }
-- $url = $gs->{url};
-- $svn_path = $gs->{path};
-+ $url = $gs->url;
-+ $svn_path = $gs->path;
- }
- unless (defined $_revision) {
- fatal("-r|--revision is a required argument\n", $usage);
-@@ -1466,24 +1450,6 @@ sub cmd_commit_diff {
- }
- }
-
--sub escape_uri_only {
-- my ($uri) = @_;
-- my @tmp;
-- foreach (split m{/}, $uri) {
-- s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
-- push @tmp, $_;
-- }
-- join('/', @tmp);
--}
--
--sub escape_url {
-- my ($url) = @_;
-- if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
-- my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
-- $url = "$scheme://$domain$uri";
-- }
-- $url;
--}
-
- sub cmd_info {
- my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
-@@ -1508,21 +1474,21 @@ sub cmd_info {
- # canonicalize_path() will return "" to make libsvn 1.5.x happy,
- $path = "." if $path eq "";
-
-- my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
-+ my $full_url = canonicalize_url( add_path_to_url( $url, $fullpath ) );
-
- if ($_url) {
-- print escape_url($full_url), "\n";
-+ print "$full_url\n";
- return;
- }
-
- my $result = "Path: $path\n";
- $result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
-- $result .= "URL: " . escape_url($full_url) . "\n";
-+ $result .= "URL: $full_url\n";
-
- eval {
- my $repos_root = $gs->repos_root;
- Git::SVN::remove_username($repos_root);
-- $result .= "Repository Root: " . escape_url($repos_root) . "\n";
-+ $result .= "Repository Root: " . canonicalize_url($repos_root) . "\n";
- };
- if ($@) {
- $result .= "Repository Root: (offline)\n";
-@@ -1669,7 +1635,9 @@ sub post_fetch_checkout {
-
- sub complete_svn_url {
- my ($url, $path) = @_;
-- $path =~ s#/+$##;
-+ $path = canonicalize_path($path);
-+
-+ # If the path is not a URL...
- if ($path !~ m#^[a-z\+]+://#) {
- if (!defined $url || $url !~ m#^[a-z\+]+://#) {
- fatal("E: '$path' is not a complete URL ",
-@@ -1686,7 +1654,7 @@ sub complete_url_ls_init {
- print STDERR "W: $switch not specified\n";
- return;
- }
-- $repo_path =~ s#/+$##;
-+ $repo_path = canonicalize_path($repo_path);
- if ($repo_path =~ m#^[a-z\+]+://#) {
- $ra = Git::SVN::Ra->new($repo_path);
- $repo_path = '';
-@@ -1697,18 +1665,18 @@ sub complete_url_ls_init {
- "and a separate URL is not specified");
- }
- }
-- my $url = $ra->{url};
-+ my $url = $ra->url;
- my $gs = Git::SVN->init($url, undef, undef, undef, 1);
- my $k = "svn-remote.$gs->{repo_id}.url";
- my $orig_url = eval { command_oneline(qw/config --get/, $k) };
-- if ($orig_url && ($orig_url ne $gs->{url})) {
-+ if ($orig_url && ($orig_url ne $gs->url)) {
- die "$k already set: $orig_url\n",
-- "wanted to set to: $gs->{url}\n";
-+ "wanted to set to: $gs->url\n";
- }
-- command_oneline('config', $k, $gs->{url}) unless $orig_url;
-- my $remote_path = "$gs->{path}/$repo_path";
-+ command_oneline('config', $k, $gs->url) unless $orig_url;
-+
-+ my $remote_path = join_paths( $gs->path, $repo_path );
- $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
-- $remote_path =~ s#/+#/#g;
- $remote_path =~ s#^/##g;
- $remote_path .= "/*" if $remote_path !~ /\*/;
- my ($n) = ($switch =~ /^--(\w+)/);
-diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
-index 8478d0c..acb2539 100644
---- a/perl/Git/SVN.pm
-+++ b/perl/Git/SVN.pm
-@@ -23,7 +23,14 @@ use Git qw(
- command_output_pipe
- command_close_pipe
- );
--use Git::SVN::Utils qw(fatal can_compress);
-+use Git::SVN::Utils qw(
-+ fatal
-+ can_compress
-+ join_paths
-+ canonicalize_path
-+ canonicalize_url
-+ add_path_to_url
-+);
-
- my $can_use_yaml;
- BEGIN {
-@@ -195,9 +202,9 @@ sub read_all_remotes {
- } elsif (m!^(.+)\.usesvmprops=\s*(.*)\s*$!) {
- $r->{$1}->{svm} = {};
- } elsif (m!^(.+)\.url=\s*(.*)\s*$!) {
-- $r->{$1}->{url} = $2;
-+ $r->{$1}->{url} = canonicalize_url($2);
- } elsif (m!^(.+)\.pushurl=\s*(.*)\s*$!) {
-- $r->{$1}->{pushurl} = $2;
-+ $r->{$1}->{pushurl} = canonicalize_url($2);
- } elsif (m!^(.+)\.ignore-refs=\s*(.*)\s*$!) {
- $r->{$1}->{ignore_refs_regex} = $2;
- } elsif (m!^(.+)\.(branches|tags)=$svn_refspec$!) {
-@@ -290,7 +297,7 @@ sub find_existing_remote {
-
- sub init_remote_config {
- my ($self, $url, $no_write) = @_;
-- $url =~ s!/+$!!; # strip trailing slash
-+ $url = canonicalize_url($url);
- my $r = read_all_remotes();
- my $existing = find_existing_remote($url, $r);
- if ($existing) {
-@@ -314,12 +321,10 @@ sub init_remote_config {
- print STDERR "Using higher level of URL: ",
- "$url => $min_url\n";
- }
-- my $old_path = $self->{path};
-- $self->{path} = $url;
-- $self->{path} =~ s!^\Q$min_url\E(/|$)!!;
-- if (length $old_path) {
-- $self->{path} .= "/$old_path";
-- }
-+ my $old_path = $self->path;
-+ $url =~ s!^\Q$min_url\E(/|$)!!;
-+ $url = join_paths($url, $old_path);
-+ $self->path($url);
- $url = $min_url;
- }
- }
-@@ -343,18 +348,22 @@ sub init_remote_config {
- unless ($no_write) {
- command_noisy('config',
- "svn-remote.$self->{repo_id}.url", $url);
-- $self->{path} =~ s{^/}{};
-- $self->{path} =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
-+ my $path = $self->path;
-+ $path =~ s{^/}{};
-+ $path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
-+ $self->path($path);
- command_noisy('config', '--add',
- "svn-remote.$self->{repo_id}.fetch",
-- "$self->{path}:".$self->refname);
-+ $self->path.":".$self->refname);
- }
-- $self->{url} = $url;
-+ $self->url($url);
- }
-
- sub find_by_url { # repos_root and, path are optional
- my ($class, $full_url, $repos_root, $path) = @_;
-
-+ $full_url = canonicalize_url($full_url);
-+
- return undef unless defined $full_url;
- remove_username($full_url);
- remove_username($repos_root) if defined $repos_root;
-@@ -393,6 +402,11 @@ sub find_by_url { # repos_root and, path are optional
- }
- $p =~ s#^\Q$z\E(?:/|$)#$prefix# or next;
- }
-+
-+ # remote fetch paths are not URI escaped. Decode ours
-+ # so they match
-+ $p = uri_decode($p);
-+
- foreach my $f (keys %$fetch) {
- next if $f ne $p;
- return Git::SVN->new($fetch->{$f}, $repo_id, $f);
-@@ -435,20 +449,25 @@ sub new {
- }
- }
- my $self = _new($class, $repo_id, $ref_id, $path);
-- if (!defined $self->{path} || !length $self->{path}) {
-+ if (!defined $self->path || !length $self->path) {
- my $fetch = command_oneline('config', '--get',
- "svn-remote.$repo_id.fetch",
- ":$ref_id\$") or
- die "Failed to read \"svn-remote.$repo_id.fetch\" ",
- "\":$ref_id\$\" in config\n";
-- ($self->{path}, undef) = split(/\s*:\s*/, $fetch);
-+ my($path) = split(/\s*:\s*/, $fetch);
-+ $self->path($path);
- }
-- $self->{path} =~ s{/+}{/}g;
-- $self->{path} =~ s{\A/}{};
-- $self->{path} =~ s{/\z}{};
-- $self->{url} = command_oneline('config', '--get',
-- "svn-remote.$repo_id.url") or
-+ {
-+ my $path = $self->path;
-+ $path =~ s{\A/}{};
-+ $path =~ s{/\z}{};
-+ $self->path($path);
-+ }
-+ my $url = command_oneline('config', '--get',
-+ "svn-remote.$repo_id.url") or
- die "Failed to read \"svn-remote.$repo_id.url\" in config\n";
-+ $self->url($url);
- $self->{pushurl} = eval { command_oneline('config', '--get',
- "svn-remote.$repo_id.pushurl") };
- $self->rebuild;
-@@ -552,8 +571,7 @@ sub _set_svm_vars {
- # username is of no interest
- $src =~ s{(^[a-z\+]*://)[^/@]*@}{$1};
-
-- my $replace = $ra->{url};
-- $replace .= "/$path" if length $path;
-+ my $replace = add_path_to_url($ra->url, $path);
-
- my $section = "svn-remote.$self->{repo_id}";
- tmp_config("$section.svm-source", $src);
-@@ -567,20 +585,21 @@ sub _set_svm_vars {
- }
-
- my $r = $ra->get_latest_revnum;
-- my $path = $self->{path};
-+ my $path = $self->path;
- my %tried;
- while (length $path) {
-- unless ($tried{"$self->{url}/$path"}) {
-+ my $try = add_path_to_url($self->url, $path);
-+ unless ($tried{$try}) {
- return $ra if $self->read_svm_props($ra, $path, $r);
-- $tried{"$self->{url}/$path"} = 1;
-+ $tried{$try} = 1;
- }
- $path =~ s#/?[^/]+$##;
- }
- die "Path: '$path' should be ''\n" if $path ne '';
- return $ra if $self->read_svm_props($ra, $path, $r);
-- $tried{"$self->{url}/$path"} = 1;
-+ $tried{ add_path_to_url($self->url, $path) } = 1;
-
-- if ($ra->{repos_root} eq $self->{url}) {
-+ if ($ra->{repos_root} eq $self->url) {
- die @err, (map { " $_\n" } keys %tried), "\n";
- }
-
-@@ -590,20 +609,21 @@ sub _set_svm_vars {
- $path = $ra->{svn_path};
- $ra = Git::SVN::Ra->new($ra->{repos_root});
- while (length $path) {
-- unless ($tried{"$ra->{url}/$path"}) {
-+ my $try = add_path_to_url($ra->url, $path);
-+ unless ($tried{$try}) {
- $ok = $self->read_svm_props($ra, $path, $r);
- last if $ok;
-- $tried{"$ra->{url}/$path"} = 1;
-+ $tried{$try} = 1;
- }
- $path =~ s#/?[^/]+$##;
- }
- die "Path: '$path' should be ''\n" if $path ne '';
- $ok ||= $self->read_svm_props($ra, $path, $r);
-- $tried{"$ra->{url}/$path"} = 1;
-+ $tried{ add_path_to_url($ra->url, $path) } = 1;
- if (!$ok) {
- die @err, (map { " $_\n" } keys %tried), "\n";
- }
-- Git::SVN::Ra->new($self->{url});
-+ Git::SVN::Ra->new($self->url);
- }
-
- sub svnsync {
-@@ -670,7 +690,7 @@ sub ra_uuid {
- if (!$@ && $uuid && $uuid =~ /^([a-f\d\-]{30,})$/i) {
- $self->{ra_uuid} = $uuid;
- } else {
-- die "ra_uuid called without URL\n" unless $self->{url};
-+ die "ra_uuid called without URL\n" unless $self->url;
- $self->{ra_uuid} = $self->ra->get_uuid;
- tmp_config('--add', $key, $self->{ra_uuid});
- }
-@@ -694,7 +714,7 @@ sub repos_root {
-
- sub ra {
- my ($self) = shift;
-- my $ra = Git::SVN::Ra->new($self->{url});
-+ my $ra = Git::SVN::Ra->new($self->url);
- $self->_set_repos_root($ra->{repos_root});
- if ($self->use_svm_props && !$self->{svm}) {
- if ($self->no_metadata) {
-@@ -728,7 +748,7 @@ sub prop_walk {
- $path =~ s#^/*#/#g;
- my $p = $path;
- # Strip the irrelevant part of the path.
-- $p =~ s#^/+\Q$self->{path}\E(/|$)#/#;
-+ $p =~ s#^/+\Q@{[$self->path]}\E(/|$)#/#;
- # Ensure the path is terminated by a `/'.
- $p =~ s#/*$#/#;
-
-@@ -749,7 +769,7 @@ sub prop_walk {
-
- foreach (sort keys %$dirent) {
- next if $dirent->{$_}->{kind} != $SVN::Node::dir;
-- $self->prop_walk($self->{path} . $p . $_, $rev, $sub);
-+ $self->prop_walk($self->path . $p . $_, $rev, $sub);
- }
- }
-
-@@ -919,20 +939,19 @@ sub rewrite_uuid {
-
- sub metadata_url {
- my ($self) = @_;
-- ($self->rewrite_root || $self->{url}) .
-- (length $self->{path} ? '/' . $self->{path} : '');
-+ my $url = $self->rewrite_root || $self->url;
-+ return canonicalize_url( add_path_to_url( $url, $self->path ) );
- }
-
- sub full_url {
- my ($self) = @_;
-- $self->{url} . (length $self->{path} ? '/' . $self->{path} : '');
-+ return canonicalize_url( add_path_to_url( $self->url, $self->path ) );
- }
-
- sub full_pushurl {
- my ($self) = @_;
- if ($self->{pushurl}) {
-- return $self->{pushurl} . (length $self->{path} ? '/' .
-- $self->{path} : '');
-+ return canonicalize_url( add_path_to_url( $self->{pushurl}, $self->path ) );
- } else {
- return $self->full_url;
- }
-@@ -1048,20 +1067,20 @@ sub do_git_commit {
-
- sub match_paths {
- my ($self, $paths, $r) = @_;
-- return 1 if $self->{path} eq '';
-- if (my $path = $paths->{"/$self->{path}"}) {
-+ return 1 if $self->path eq '';
-+ if (my $path = $paths->{"/".$self->path}) {
- return ($path->{action} eq 'D') ? 0 : 1;
- }
-- $self->{path_regex} ||= qr/^\/\Q$self->{path}\E\//;
-+ $self->{path_regex} ||= qr{^/\Q@{[$self->path]}\E/};
- if (grep /$self->{path_regex}/, keys %$paths) {
- return 1;
- }
- my $c = '';
-- foreach (split m#/#, $self->{path}) {
-+ foreach (split m#/#, $self->path) {
- $c .= "/$_";
- next unless ($paths->{$c} &&
- ($paths->{$c}->{action} =~ /^[AR]$/));
-- if ($self->ra->check_path($self->{path}, $r) ==
-+ if ($self->ra->check_path($self->path, $r) ==
- $SVN::Node::dir) {
- return 1;
- }
-@@ -1075,14 +1094,14 @@ sub find_parent_branch {
- unless (defined $paths) {
- my $err_handler = $SVN::Error::handler;
- $SVN::Error::handler = \&Git::SVN::Ra::skip_unknown_revs;
-- $self->ra->get_log([$self->{path}], $rev, $rev, 0, 1, 1,
-+ $self->ra->get_log([$self->path], $rev, $rev, 0, 1, 1,
- sub { $paths = $_[0] });
- $SVN::Error::handler = $err_handler;
- }
- return undef unless defined $paths;
-
- # look for a parent from another branch:
-- my @b_path_components = split m#/#, $self->{path};
-+ my @b_path_components = split m#/#, $self->path;
- my @a_path_components;
- my $i;
- while (@b_path_components) {
-@@ -1099,8 +1118,8 @@ sub find_parent_branch {
- }
- my $r = $i->{copyfrom_rev};
- my $repos_root = $self->ra->{repos_root};
-- my $url = $self->ra->{url};
-- my $new_url = $url . $branch_from;
-+ my $url = $self->ra->url;
-+ my $new_url = canonicalize_url( add_path_to_url( $url, $branch_from ) );
- print STDERR "Found possible branch point: ",
- "$new_url => ", $self->full_url, ", $r\n"
- unless $::_q > 1;
-@@ -1114,7 +1133,7 @@ sub find_parent_branch {
- ($base, $head) = parse_revision_argument(0, $r);
- } else {
- if ($r0 < $r) {
-- $gs->ra->get_log([$gs->{path}], $r0 + 1, $r, 1,
-+ $gs->ra->get_log([$gs->path], $r0 + 1, $r, 1,
- 0, 1, sub { $base = $_[1] - 1 });
- }
- }
-@@ -1136,7 +1155,7 @@ sub find_parent_branch {
- # at the moment), so we can't rely on it
- $self->{last_rev} = $r0;
- $self->{last_commit} = $parent;
-- $ed = Git::SVN::Fetcher->new($self, $gs->{path});
-+ $ed = Git::SVN::Fetcher->new($self, $gs->path);
- $gs->ra->gs_do_switch($r0, $rev, $gs,
- $self->full_url, $ed)
- or die "SVN connection failed somewhere...\n";
-@@ -1235,7 +1254,7 @@ sub mkemptydirs {
- close $fh;
- }
-
-- my $strip = qr/\A\Q$self->{path}\E(?:\/|$)/;
-+ my $strip = qr/\A\Q@{[$self->path]}\E(?:\/|$)/;
- foreach my $d (sort keys %empty_dirs) {
- $d = uri_decode($d);
- $d =~ s/$strip//;
-@@ -1429,12 +1448,11 @@ sub find_extra_svk_parents {
- for my $ticket ( @tickets ) {
- my ($uuid, $path, $rev) = split /:/, $ticket;
- if ( $uuid eq $self->ra_uuid ) {
-- my $url = $self->{url};
-- my $repos_root = $url;
-+ my $repos_root = $self->url;
- my $branch_from = $path;
- $branch_from =~ s{^/}{};
-- my $gs = $self->other_gs($repos_root."/".$branch_from,
-- $url,
-+ my $gs = $self->other_gs(add_path_to_url( $repos_root, $branch_from ),
-+ $repos_root,
- $branch_from,
- $rev,
- $self->{ref_id});
-@@ -1693,7 +1711,7 @@ sub find_extra_svn_parents {
- # are now marked as merge, we can add the tip as a parent.
- my @merges = split "\n", $mergeinfo;
- my @merge_tips;
-- my $url = $self->{url};
-+ my $url = $self->url;
- my $uuid = $self->ra_uuid;
- my %ranges;
- for my $merge ( @merges ) {
-@@ -1875,8 +1893,9 @@ sub make_log_entry {
- $email ||= "$author\@$uuid";
- $commit_email ||= "$author\@$uuid";
- } elsif ($self->use_svnsync_props) {
-- my $full_url = $self->svnsync->{url};
-- $full_url .= "/$self->{path}" if length $self->{path};
-+ my $full_url = canonicalize_url(
-+ add_path_to_url( $self->svnsync->{url}, $self->path )
-+ );
- remove_username($full_url);
- my $uuid = $self->svnsync->{uuid};
- $log_entry{metadata} = "$full_url\@$rev $uuid";
-@@ -1923,7 +1942,7 @@ sub set_tree {
- tree_b => $tree,
- editor_cb => sub {
- $self->set_tree_cb($log_entry, $tree, @_) },
-- svn_path => $self->{path} );
-+ svn_path => $self->path );
- if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) {
- print "No changes\nr$self->{last_rev} = $tree\n";
- }
-@@ -2299,10 +2318,39 @@ sub _new {
-
- $_[3] = $path = '' unless (defined $path);
- mkpath([$dir]);
-- bless {
-+ my $obj = bless {
- ref_id => $ref_id, dir => $dir, index => "$dir/index",
-- path => $path, config => "$ENV{GIT_DIR}/svn/config",
-+ config => "$ENV{GIT_DIR}/svn/config",
- map_root => "$dir/.rev_map", repo_id => $repo_id }, $class;
-+
-+ # Ensure it gets canonicalized
-+ $obj->path($path);
-+
-+ return $obj;
-+}
-+
-+sub path {
-+ my $self = shift;
-+
-+ if (@_) {
-+ my $path = shift;
-+ $self->{path} = canonicalize_path($path);
-+ return;
-+ }
-+
-+ return $self->{path};
-+}
-+
-+sub url {
-+ my $self = shift;
-+
-+ if (@_) {
-+ my $url = shift;
-+ $self->{url} = canonicalize_url($url);
-+ return;
-+ }
-+
-+ return $self->{url};
- }
-
- # for read-only access of old .rev_db formats
-diff --git a/perl/Git/SVN/Fetcher.pm b/perl/Git/SVN/Fetcher.pm
-index 76fae9b..046a7a2 100644
---- a/perl/Git/SVN/Fetcher.pm
-+++ b/perl/Git/SVN/Fetcher.pm
-@@ -83,7 +83,7 @@ sub _mark_empty_symlinks {
- chomp(my $empty_blob = `git hash-object -t blob --stdin < /dev/null`);
- my ($ls, $ctx) = command_output_pipe(qw/ls-tree -r -z/, $cmt);
- local $/ = "\0";
-- my $pfx = defined($switch_path) ? $switch_path : $git_svn->{path};
-+ my $pfx = defined($switch_path) ? $switch_path : $git_svn->path;
- $pfx .= '/' if length($pfx);
- while (<$ls>) {
- chomp;
-diff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm
-index 75d7429..30daf35 100644
---- a/perl/Git/SVN/Migration.pm
-+++ b/perl/Git/SVN/Migration.pm
-@@ -177,14 +177,14 @@ sub minimize_connections {
- my $ra = Git::SVN::Ra->new($url);
-
- # skip existing cases where we already connect to the root
-- if (($ra->{url} eq $ra->{repos_root}) ||
-+ if (($ra->url eq $ra->{repos_root}) ||
- ($ra->{repos_root} eq $repo_id)) {
-- $root_repos->{$ra->{url}} = $repo_id;
-+ $root_repos->{$ra->url} = $repo_id;
- next;
- }
-
- my $root_ra = Git::SVN::Ra->new($ra->{repos_root});
-- my $root_path = $ra->{url};
-+ my $root_path = $ra->url;
- $root_path =~ s#^\Q$ra->{repos_root}\E(/|$)##;
- foreach my $path (keys %$fetch) {
- my $ref_id = $fetch->{$path};
-diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
-index 23ff43e..90ec30b 100644
---- a/perl/Git/SVN/Ra.pm
-+++ b/perl/Git/SVN/Ra.pm
-@@ -3,6 +3,12 @@ use vars qw/@ISA $config_dir $_ignore_refs_regex $_log_window_size/;
- use strict;
- use warnings;
- use SVN::Client;
-+use Git::SVN::Utils qw(
-+ canonicalize_url
-+ canonicalize_path
-+ add_path_to_url
-+);
-+
- use SVN::Ra;
- BEGIN {
- @ISA = qw(SVN::Ra);
-@@ -62,29 +68,11 @@ sub _auth_providers () {
- \@rv;
- }
-
--sub escape_uri_only {
-- my ($uri) = @_;
-- my @tmp;
-- foreach (split m{/}, $uri) {
-- s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
-- push @tmp, $_;
-- }
-- join('/', @tmp);
--}
--
--sub escape_url {
-- my ($url) = @_;
-- if ($url =~ m#^(https?)://([^/]+)(.*)$#) {
-- my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
-- $url = "$scheme://$domain$uri";
-- }
-- $url;
--}
-
- sub new {
- my ($class, $url) = @_;
-- $url =~ s!/+$!!;
-- return $RA if ($RA && $RA->{url} eq $url);
-+ $url = canonicalize_url($url);
-+ return $RA if ($RA && $RA->url eq $url);
-
- ::_req_svn();
-
-@@ -115,17 +103,34 @@ sub new {
- $Git::SVN::Prompt::_no_auth_cache = 1;
- }
- } # no warnings 'once'
-- my $self = SVN::Ra->new(url => escape_url($url), auth => $baton,
-+
-+ my $self = SVN::Ra->new(url => $url, auth => $baton,
- config => $config,
- pool => SVN::Pool->new,
- auth_provider_callbacks => $callbacks);
-- $self->{url} = $url;
-+ $RA = bless $self, $class;
-+
-+ # Make sure its canonicalized
-+ $self->url($url);
- $self->{svn_path} = $url;
- $self->{repos_root} = $self->get_repos_root;
- $self->{svn_path} =~ s#^\Q$self->{repos_root}\E(/|$)##;
- $self->{cache} = { check_path => { r => 0, data => {} },
- get_dir => { r => 0, data => {} } };
-- $RA = bless $self, $class;
-+
-+ return $RA;
-+}
-+
-+sub url {
-+ my $self = shift;
-+
-+ if (@_) {
-+ my $url = shift;
-+ $self->{url} = canonicalize_url($url);
-+ return;
-+ }
-+
-+ return $self->{url};
- }
-
- sub check_path {
-@@ -195,6 +200,7 @@ sub get_log {
- qw/copyfrom_path copyfrom_rev action/;
- if ($s{'copyfrom_path'}) {
- $s{'copyfrom_path'} =~ s/$prefix_regex//;
-+ $s{'copyfrom_path'} = canonicalize_path($s{'copyfrom_path'});
- }
- $_[0]{$p} = \%s;
- }
-@@ -246,7 +252,7 @@ sub get_commit_editor {
- sub gs_do_update {
- my ($self, $rev_a, $rev_b, $gs, $editor) = @_;
- my $new = ($rev_a == $rev_b);
-- my $path = $gs->{path};
-+ my $path = $gs->path;
-
- if ($new && -e $gs->{index}) {
- unlink $gs->{index} or die
-@@ -282,30 +288,33 @@ sub gs_do_update {
- # svn_ra_reparent didn't work before 1.4)
- sub gs_do_switch {
- my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_;
-- my $path = $gs->{path};
-+ my $path = $gs->path;
- my $pool = SVN::Pool->new;
-
-- my $full_url = $self->{url};
-- my $old_url = $full_url;
-- $full_url .= '/' . $path if length $path;
-+ my $old_url = $self->url;
-+ my $full_url = add_path_to_url( $self->url, $path );
- my ($ra, $reparented);
-
- if ($old_url =~ m#^svn(\+ssh)?://# ||
- ($full_url =~ m#^https?://# &&
-- escape_url($full_url) ne $full_url)) {
-+ canonicalize_url($full_url) ne $full_url)) {
- $_[0] = undef;
- $self = undef;
- $RA = undef;
- $ra = Git::SVN::Ra->new($full_url);
- $ra_invalid = 1;
- } elsif ($old_url ne $full_url) {
-- SVN::_Ra::svn_ra_reparent($self->{session}, $full_url, $pool);
-- $self->{url} = $full_url;
-+ SVN::_Ra::svn_ra_reparent(
-+ $self->{session},
-+ canonicalize_url($full_url),
-+ $pool
-+ );
-+ $self->url($full_url);
- $reparented = 1;
- }
-
- $ra ||= $self;
-- $url_b = escape_url($url_b);
-+ $url_b = canonicalize_url($url_b);
- my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool);
- my @lock = (::compare_svn_version('1.2.0') >= 0) ? (undef) : ();
- $reporter->set_path('', $rev_a, 0, @lock, $pool);
-@@ -313,7 +322,7 @@ sub gs_do_switch {
-
- if ($reparented) {
- SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool);
-- $self->{url} = $old_url;
-+ $self->url($old_url);
- }
-
- $pool->clear;
-@@ -326,7 +335,7 @@ sub longest_common_path {
- my $common_max = scalar @$gsv;
-
- foreach my $gs (@$gsv) {
-- my @tmp = split m#/#, $gs->{path};
-+ my @tmp = split m#/#, $gs->path;
- my $p = '';
- foreach (@tmp) {
- $p .= length($p) ? "/$_" : $_;
-@@ -362,7 +371,7 @@ sub gs_fetch_loop_common {
- my $inc = $_log_window_size;
- my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc);
- my $longest_path = longest_common_path($gsv, $globs);
-- my $ra_url = $self->{url};
-+ my $ra_url = $self->url;
- my $find_trailing_edge;
- while (1) {
- my %revs;
-@@ -508,7 +517,7 @@ sub match_globs {
- ($self->check_path($p, $r) !=
- $SVN::Node::dir));
- next unless $p =~ /$g->{path}->{regex}/;
-- $exists->{$p} = Git::SVN->init($self->{url}, $p, undef,
-+ $exists->{$p} = Git::SVN->init($self->url, $p, undef,
- $g->{ref}->full_path($de), 1);
- }
- }
-@@ -532,7 +541,7 @@ sub match_globs {
- next if ($self->check_path($pathname, $r) !=
- $SVN::Node::dir);
- $exists->{$pathname} = Git::SVN->init(
-- $self->{url}, $pathname, undef,
-+ $self->url, $pathname, undef,
- $g->{ref}->full_path($p), 1);
- }
- my $c = '';
-@@ -548,19 +557,20 @@ sub match_globs {
-
- sub minimize_url {
- my ($self) = @_;
-- return $self->{url} if ($self->{url} eq $self->{repos_root});
-+ return $self->url if ($self->url eq $self->{repos_root});
- my $url = $self->{repos_root};
- my @components = split(m!/!, $self->{svn_path});
- my $c = '';
- do {
-- $url .= "/$c" if length $c;
-+ $url = add_path_to_url($url, $c);
- eval {
- my $ra = (ref $self)->new($url);
- my $latest = $ra->get_latest_revnum;
- $ra->get_log("", $latest, 0, 1, 0, 1, sub {});
- };
- } while ($@ && ($c = shift @components));
-- $url;
-+
-+ return canonicalize_url($url);
- }
-
- sub can_do_switch {
-@@ -568,7 +578,7 @@ sub can_do_switch {
- unless (defined $can_do_switch) {
- my $pool = SVN::Pool->new;
- my $rep = eval {
-- $self->do_switch(1, '', 0, $self->{url},
-+ $self->do_switch(1, '', 0, $self->url,
- SVN::Delta::Editor->new, $pool);
- };
- if ($@) {
-diff --git a/perl/Git/SVN/Utils.pm b/perl/Git/SVN/Utils.pm
-index 496006b..4bb4dde 100644
---- a/perl/Git/SVN/Utils.pm
-+++ b/perl/Git/SVN/Utils.pm
-@@ -3,9 +3,18 @@ package Git::SVN::Utils;
- use strict;
- use warnings;
-
-+use SVN::Core;
-+
- use base qw(Exporter);
-
--our @EXPORT_OK = qw(fatal can_compress);
-+our @EXPORT_OK = qw(
-+ fatal
-+ can_compress
-+ canonicalize_path
-+ canonicalize_url
-+ join_paths
-+ add_path_to_url
-+);
-
-
- =head1 NAME
-@@ -56,4 +65,169 @@ sub can_compress {
- }
-
-
-+=head3 canonicalize_path
-+
-+ my $canoncalized_path = canonicalize_path($path);
-+
-+Converts $path into a canonical form which is safe to pass to the SVN
-+API as a file path.
-+
-+=cut
-+
-+# Turn foo/../bar into bar
-+sub _collapse_dotdot {
-+ my $path = shift;
-+
-+ 1 while $path =~ s{/[^/]+/+\.\.}{};
-+ 1 while $path =~ s{[^/]+/+\.\./}{};
-+ 1 while $path =~ s{[^/]+/+\.\.}{};
-+
-+ return $path;
-+}
-+
-+
-+sub canonicalize_path {
-+ my $path = shift;
-+ my $rv;
-+
-+ # The 1.7 way to do it
-+ if ( defined &SVN::_Core::svn_dirent_canonicalize ) {
-+ $path = _collapse_dotdot($path);
-+ $rv = SVN::_Core::svn_dirent_canonicalize($path);
-+ }
-+ # The 1.6 way to do it
-+ # This can return undef on subversion-perl-1.4.2-2.el5 (CentOS 5.2)
-+ elsif ( defined &SVN::_Core::svn_path_canonicalize ) {
-+ $path = _collapse_dotdot($path);
-+ $rv = SVN::_Core::svn_path_canonicalize($path);
-+ }
-+
-+ return $rv if defined $rv;
-+
-+ # No SVN API canonicalization is available, or the SVN API
-+ # didn't return a successful result, do it ourselves
-+ return _canonicalize_path_ourselves($path);
-+}
-+
-+
-+sub _canonicalize_path_ourselves {
-+ my ($path) = @_;
-+ my $dot_slash_added = 0;
-+ if (substr($path, 0, 1) ne "/") {
-+ $path = "./" . $path;
-+ $dot_slash_added = 1;
-+ }
-+ $path =~ s#/+#/#g;
-+ $path =~ s#/\.(?:/|$)#/#g;
-+ $path = _collapse_dotdot($path);
-+ $path =~ s#/$##g;
-+ $path =~ s#^\./## if $dot_slash_added;
-+ $path =~ s#^/##;
-+ $path =~ s#^\.$##;
-+ return $path;
-+}
-+
-+
-+=head3 canonicalize_url
-+
-+ my $canonicalized_url = canonicalize_url($url);
-+
-+Converts $url into a canonical form which is safe to pass to the SVN
-+API as a URL.
-+
-+=cut
-+
-+sub canonicalize_url {
-+ my $url = shift;
-+
-+ # The 1.7 way to do it
-+ if ( defined &SVN::_Core::svn_uri_canonicalize ) {
-+ return SVN::_Core::svn_uri_canonicalize($url);
-+ }
-+ # There wasn't a 1.6 way to do it, so we do it ourself.
-+ else {
-+ return _canonicalize_url_ourselves($url);
-+ }
-+}
-+
-+
-+sub _canonicalize_url_path {
-+ my ($uri_path) = @_;
-+
-+ my @parts;
-+ foreach my $part (split m{/+}, $uri_path) {
-+ $part =~ s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
-+ push @parts, $part;
-+ }
-+
-+ return join('/', @parts);
-+}
-+
-+sub _canonicalize_url_ourselves {
-+ my ($url) = @_;
-+ if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
-+ my ($scheme, $domain, $uri) = ($1, $2, _canonicalize_url_path(canonicalize_path($3)));
-+ $url = "$scheme://$domain$uri";
-+ }
-+ $url;
-+}
-+
-+
-+=head3 join_paths
-+
-+ my $new_path = join_paths(@paths);
-+
-+Appends @paths together into a single path. Any empty paths are ignored.
-+
-+=cut
-+
-+sub join_paths {
-+ my @paths = @_;
-+
-+ @paths = grep { defined $_ && length $_ } @paths;
-+
-+ return '' unless @paths;
-+ return $paths[0] if @paths == 1;
-+
-+ my $new_path = shift @paths;
-+ $new_path =~ s{/+$}{};
-+
-+ my $last_path = pop @paths;
-+ $last_path =~ s{^/+}{};
-+
-+ for my $path (@paths) {
-+ $path =~ s{^/+}{};
-+ $path =~ s{/+$}{};
-+ $new_path .= "/$path";
-+ }
-+
-+ return $new_path .= "/$last_path";
-+}
-+
-+
-+=head3 add_path_to_url
-+
-+ my $new_url = add_path_to_url($url, $path);
-+
-+Appends $path onto the $url. If $path is empty, $url is returned unchanged.
-+
-+=cut
-+
-+sub add_path_to_url {
-+ my($url, $path) = @_;
-+
-+ return $url if !defined $path or !length $path;
-+
-+ # Strip trailing and leading slashes so we don't
-+ # wind up with http://x.com///path
-+ $url =~ s{/+$}{};
-+ $path =~ s{^/+}{};
-+
-+ # If a path has a % in it, URI escape it so it's not
-+ # mistaken for a URI escape later.
-+ $path =~ s{%}{%25}g;
-+
-+ return join '/', $url, $path;
-+}
-+
- 1;
-diff --git a/t/Git-SVN/Utils/add_path_to_url.t b/t/Git-SVN/Utils/add_path_to_url.t
-new file mode 100644
-index 0000000..bfbd878
---- /dev/null
-+++ b/t/Git-SVN/Utils/add_path_to_url.t
-@@ -0,0 +1,27 @@
-+#!/usr/bin/env perl
-+
-+use strict;
-+use warnings;
-+
-+use Test::More 'no_plan';
-+
-+use Git::SVN::Utils qw(
-+ add_path_to_url
-+);
-+
-+# A reference cannot be a hash key, so we use an array.
-+my @tests = (
-+ ["http://x.com", "bar"] => 'http://x.com/bar',
-+ ["http://x.com", ""] => 'http://x.com',
-+ ["http://x.com/foo/", undef] => 'http://x.com/foo/',
-+ ["http://x.com/foo/", "/bar/baz/"] => 'http://x.com/foo/bar/baz/',
-+ ["http://x.com", 'per%cent'] => 'http://x.com/per%25cent',
-+);
-+
-+while(@tests) {
-+ my($have, $want) = splice @tests, 0, 2;
-+
-+ my $args = join ", ", map { qq['$_'] } map { defined($_) ? $_ : 'undef' } @$have;
-+ my $name = "add_path_to_url($args) eq $want";
-+ is add_path_to_url(@$have), $want, $name;
-+}
-diff --git a/t/Git-SVN/Utils/canonicalize_url.t b/t/Git-SVN/Utils/canonicalize_url.t
-new file mode 100644
-index 0000000..05795ab
---- /dev/null
-+++ b/t/Git-SVN/Utils/canonicalize_url.t
-@@ -0,0 +1,26 @@
-+#!/usr/bin/env perl
-+
-+# Test our own home rolled URL canonicalizer. Test the private one
-+# directly because we can't predict what the SVN API is doing to do.
-+
-+use strict;
-+use warnings;
-+
-+use Test::More 'no_plan';
-+
-+use Git::SVN::Utils;
-+my $canonicalize_url = \&Git::SVN::Utils::_canonicalize_url_ourselves;
-+
-+my %tests = (
-+ "http://x.com" => "http://x.com",
-+ "http://x.com/" => "http://x.com",
-+ "http://x.com/foo/bar" => "http://x.com/foo/bar",
-+ "http://x.com//foo//bar//" => "http://x.com/foo/bar",
-+ "http://x.com/ /%/" => "http://x.com/%20%20/%25",
-+);
-+
-+for my $arg (keys %tests) {
-+ my $want = $tests{$arg};
-+
-+ is $canonicalize_url->($arg), $want, "canonicalize_url('$arg') => $want";
-+}
-diff --git a/t/Git-SVN/Utils/collapse_dotdot.t b/t/Git-SVN/Utils/collapse_dotdot.t
-new file mode 100644
-index 0000000..1da1cce
---- /dev/null
-+++ b/t/Git-SVN/Utils/collapse_dotdot.t
-@@ -0,0 +1,23 @@
-+#!/usr/bin/env perl
-+
-+use strict;
-+use warnings;
-+
-+use Test::More 'no_plan';
-+
-+use Git::SVN::Utils;
-+my $collapse_dotdot = \&Git::SVN::Utils::_collapse_dotdot;
-+
-+my %tests = (
-+ "foo/bar/baz" => "foo/bar/baz",
-+ ".." => "..",
-+ "foo/.." => "",
-+ "/foo/bar/../../baz" => "/baz",
-+ "deeply/.././deeply/nested" => "./deeply/nested",
-+);
-+
-+for my $arg (keys %tests) {
-+ my $want = $tests{$arg};
-+
-+ is $collapse_dotdot->($arg), $want, "_collapse_dotdot('$arg') => $want";
-+}
-diff --git a/t/Git-SVN/Utils/join_paths.t b/t/Git-SVN/Utils/join_paths.t
-new file mode 100644
-index 0000000..d4488e7
---- /dev/null
-+++ b/t/Git-SVN/Utils/join_paths.t
-@@ -0,0 +1,32 @@
-+#!/usr/bin/env perl
-+
-+use strict;
-+use warnings;
-+
-+use Test::More 'no_plan';
-+
-+use Git::SVN::Utils qw(
-+ join_paths
-+);
-+
-+# A reference cannot be a hash key, so we use an array.
-+my @tests = (
-+ [] => '',
-+ ["/x.com", "bar"] => '/x.com/bar',
-+ ["x.com", ""] => 'x.com',
-+ ["/x.com/foo/", undef, "bar"] => '/x.com/foo/bar',
-+ ["x.com/foo/", "/bar/baz/"] => 'x.com/foo/bar/baz/',
-+ ["foo", "bar"] => 'foo/bar',
-+ ["/foo/bar", "baz", "/biff"] => '/foo/bar/baz/biff',
-+ ["", undef, "."] => '.',
-+ [] => '',
-+
-+);
-+
-+while(@tests) {
-+ my($have, $want) = splice @tests, 0, 2;
-+
-+ my $args = join ", ", map { qq['$_'] } map { defined($_) ? $_ : 'undef' } @$have;
-+ my $name = "join_paths($args) eq '$want'";
-+ is join_paths(@$have), $want, $name;
-+}
-diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
-index 289fc31..ee73013 100755
---- a/t/t9107-git-svn-migrate.sh
-+++ b/t/t9107-git-svn-migrate.sh
-@@ -27,15 +27,17 @@ test_expect_success 'setup old-looking metadata' '
- head=`git rev-parse --verify refs/heads/git-svn-HEAD^0`
- test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'"
-
-+svnrepo_escaped=`echo $svnrepo | sed 's/ /%20/'`
-+
- test_expect_success 'initialize old-style (v0) git svn layout' '
- mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
- echo "$svnrepo" > "$GIT_DIR"/git-svn/info/url &&
- echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
- git svn migrate &&
-- ! test -d "$GIT_DIR"/git svn &&
-+ ! test -d "$GIT_DIR"/git-svn &&
- git rev-parse --verify refs/${remotes_git_svn}^0 &&
- git rev-parse --verify refs/remotes/svn^0 &&
-- test "$(git config --get svn-remote.svn.url)" = "$svnrepo" &&
-+ test "$(git config --get svn-remote.svn.url)" = "$svnrepo_escaped" &&
- test `git config --get svn-remote.svn.fetch` = \
- ":refs/${remotes_git_svn}"
- '
-diff --git a/t/t9118-git-svn-funky-branch-names.sh b/t/t9118-git-svn-funky-branch-names.sh
-index 63fc982..193d3ca 100755
---- a/t/t9118-git-svn-funky-branch-names.sh
-+++ b/t/t9118-git-svn-funky-branch-names.sh
-@@ -32,6 +32,11 @@ test_expect_success 'setup svnrepo' '
- start_httpd
- '
-
-+# SVN 1.7 will truncate "not-a%40{0]" to just "not-a".
-+# Look at what SVN wound up naming the branch and use that.
-+# Be sure to escape the @ if it shows up.
-+non_reflog=`svn_cmd ls "$svnrepo/pr ject/branches" | grep not-a | sed 's/\///' | sed 's/@/%40/'`
-+
- test_expect_success 'test clone with funky branch names' '
- git svn clone -s "$svnrepo/pr ject" project &&
- (
-@@ -42,7 +47,7 @@ test_expect_success 'test clone with funky branch names' '
- git rev-parse "refs/remotes/%2Eleading_dot" &&
- git rev-parse "refs/remotes/trailing_dot%2E" &&
- git rev-parse "refs/remotes/trailing_dotlock%2Elock" &&
-- git rev-parse "refs/remotes/not-a%40{0}reflog"
-+ git rev-parse "refs/remotes/$non_reflog"
- )
- '
-
diff --git a/dev-vcs/git/files/git-1.7.12-optional-cvs.patch b/dev-vcs/git/files/git-1.7.12-optional-cvs.patch
deleted file mode 100644
index bd8413d..0000000
--- a/dev-vcs/git/files/git-1.7.12-optional-cvs.patch
+++ /dev/null
@@ -1,368 +0,0 @@
-From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
-From: Robin Johnson <robbat2@gentoo.org>
-Date: Wed, 22 Aug 2012 04:25:06 +0000
-Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
- utilities
-
-Forward-ported from 1.7.10.2 to current git.git v1.7.12 tag PLUS fix-svn branch.
-
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/Makefile git-1.7.12/Makefile
---- git-1.7.12.orig/Makefile 2012-08-20 01:22:48.000000000 +0000
-+++ git-1.7.12/Makefile 2012-08-22 04:23:48.335032122 +0000
-@@ -224,6 +224,8 @@
- #
- # 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'.
-@@ -405,6 +407,7 @@
- PROGRAM_OBJS =
- PROGRAMS =
- SCRIPT_PERL =
-+SCRIPT_PERL_CVS =
- SCRIPT_PYTHON =
- SCRIPT_SH =
- SCRIPT_LIB =
-@@ -445,18 +448,19 @@
- 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-remote-testgit.py
- SCRIPT_PYTHON += git-p4.py
-
- SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
-- $(patsubst %.perl,%,$(SCRIPT_PERL)) \
-+ $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
- $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
- git-instaweb
-
-@@ -2088,8 +2092,18 @@
- $(QUIET_GEN)$(cmd_munge_script) && \
- mv $@+ $@
-
-+_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
-
-@@ -2101,7 +2115,7 @@
- perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
- $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
-
--$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE
- $(QUIET_GEN)$(RM) $@ $@+ && \
- INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
- sed -e '1{' \
-@@ -2126,14 +2140,17 @@
- 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|#!$(SHELL_PATH_SQ)|' \
- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
- unimplemented.sh >$@+ && \
- chmod +x $@+ && \
- mv $@+ $@
--endif # NO_PERL
-
- ifndef NO_PYTHON
- $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS GIT-PREFIX
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9200-git-cvsexportcommit.sh git-1.7.12/t/t9200-git-cvsexportcommit.sh
---- git-1.7.12.orig/t/t9200-git-cvsexportcommit.sh 2012-08-20 01:22:48.000000000 +0000
-+++ git-1.7.12/t/t9200-git-cvsexportcommit.sh 2012-08-22 04:19:23.650741974 +0000
-@@ -12,6 +12,11 @@
- 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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9400-git-cvsserver-server.sh git-1.7.12/t/t9400-git-cvsserver-server.sh
---- git-1.7.12.orig/t/t9400-git-cvsserver-server.sh 2012-08-20 01:22:48.000000000 +0000
-+++ git-1.7.12/t/t9400-git-cvsserver-server.sh 2012-08-22 04:19:23.650741974 +0000
-@@ -11,9 +11,15 @@
- . ./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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9401-git-cvsserver-crlf.sh git-1.7.12/t/t9401-git-cvsserver-crlf.sh
---- git-1.7.12.orig/t/t9401-git-cvsserver-crlf.sh 2012-08-20 01:22:48.000000000 +0000
-+++ git-1.7.12/t/t9401-git-cvsserver-crlf.sh 2012-08-22 04:19:23.650741974 +0000
-@@ -38,15 +38,20 @@
- fi
- }
-
--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_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9600-cvsimport.sh git-1.7.12/t/t9600-cvsimport.sh
---- git-1.7.12.orig/t/t9600-cvsimport.sh 2012-08-20 01:22:48.000000000 +0000
-+++ git-1.7.12/t/t9600-cvsimport.sh 2012-08-22 04:19:23.650741974 +0000
-@@ -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 @@
- )
- '
-
--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 @@
- )
- '
-
--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 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_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 '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 '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_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 '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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9601-cvsimport-vendor-branch.sh git-1.7.12/t/t9601-cvsimport-vendor-branch.sh
---- git-1.7.12.orig/t/t9601-cvsimport-vendor-branch.sh 2012-08-20 01:22:48.000000000 +0000
-+++ git-1.7.12/t/t9601-cvsimport-vendor-branch.sh 2012-08-22 04:19:23.650741974 +0000
-@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9602-cvsimport-branches-tags.sh git-1.7.12/t/t9602-cvsimport-branches-tags.sh
---- git-1.7.12.orig/t/t9602-cvsimport-branches-tags.sh 2012-08-20 01:22:48.000000000 +0000
-+++ git-1.7.12/t/t9602-cvsimport-branches-tags.sh 2012-08-22 04:19:23.650741974 +0000
-@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9603-cvsimport-patchsets.sh git-1.7.12/t/t9603-cvsimport-patchsets.sh
---- git-1.7.12.orig/t/t9603-cvsimport-patchsets.sh 2012-08-20 01:22:48.000000000 +0000
-+++ git-1.7.12/t/t9603-cvsimport-patchsets.sh 2012-08-22 04:19:23.650741974 +0000
-@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/test-lib.sh git-1.7.12/t/test-lib.sh
---- git-1.7.12.orig/t/test-lib.sh 2012-08-20 01:22:48.000000000 +0000
-+++ git-1.7.12/t/test-lib.sh 2012-08-22 04:19:23.650741974 +0000
-@@ -618,6 +618,7 @@
- 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
diff --git a/dev-vcs/git/files/git-1.8.2-texinfo.patch b/dev-vcs/git/files/git-1.8.2-texinfo.patch
deleted file mode 100644
index b8881d4..0000000
--- a/dev-vcs/git/files/git-1.8.2-texinfo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Strip anchors to avoid duplicate anchor names. This keeps texinfo 5-x happy.
-
-2013-04-02 Martin von Gagern
-
-References:
-* https://bugs.gentoo.org/464210
-
-Index: git-1.8.1.5/Documentation/cat-texi.perl
-===================================================================
---- git-1.8.1.5.orig/Documentation/cat-texi.perl
-+++ git-1.8.1.5/Documentation/cat-texi.perl
-@@ -12,6 +12,7 @@ while (<STDIN>) {
- push @menu, $1;
- }
- s/\(\@pxref{\[(URLS|REMOTES)\]}\)//;
-+ s/\@anchor\{[^{}]*\}//g;
- print TMP;
- }
- close TMP;
diff --git a/dev-vcs/git/files/git-1.8.4-optional-cvs.patch b/dev-vcs/git/files/git-1.8.4-optional-cvs.patch
deleted file mode 100644
index e9ea9d6..0000000
--- a/dev-vcs/git/files/git-1.8.4-optional-cvs.patch
+++ /dev/null
@@ -1,370 +0,0 @@
-From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
-From: Robin Johnson <robbat2@gentoo.org>
-Date: Wed, 22 Aug 2012 04:25:06 +0000
-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
-
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/Makefile git-1.8.4/Makefile
---- git-1.8.4.orig/Makefile 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.4/Makefile 2013-03-19 16:58:52.922806111 -0700
-@@ -266,6 +266,8 @@
- #
- # 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'.
-@@ -440,6 +442,7 @@
- PROGRAM_OBJS =
- PROGRAMS =
- SCRIPT_PERL =
-+SCRIPT_PERL_CVS =
- SCRIPT_PYTHON =
- SCRIPT_SH =
- SCRIPT_LIB =
-@@ -481,13 +484,14 @@
- 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-remote-testpy.py
- SCRIPT_PYTHON += git-p4.py
-
-@@ -496,7 +500,7 @@
-
- # 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))
-@@ -1786,8 +1790,18 @@
- $(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(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
-
-@@ -1799,7 +1813,7 @@
- perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
- $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
-
--$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE
- $(QUIET_GEN)$(RM) $@ $@+ && \
- INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
- sed -e '1{' \
-@@ -1824,14 +1838,17 @@
- 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|#!$(SHELL_PATH_SQ)|' \
- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
- unimplemented.sh >$@+ && \
- chmod +x $@+ && \
- mv $@+ $@
--endif # NO_PERL
-
- ifndef NO_PYTHON
- $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
---- git-1.8.4.orig/t/t9200-git-cvsexportcommit.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.4/t/t9200-git-cvsexportcommit.sh 2013-03-19 16:56:29.124993905 -0700
-@@ -12,6 +12,11 @@
- 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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9400-git-cvsserver-server.sh git-1.8.4/t/t9400-git-cvsserver-server.sh
---- git-1.8.4.orig/t/t9400-git-cvsserver-server.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.4/t/t9400-git-cvsserver-server.sh 2013-03-19 16:56:29.124993905 -0700
-@@ -11,9 +11,15 @@
- . ./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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9401-git-cvsserver-crlf.sh git-1.8.4/t/t9401-git-cvsserver-crlf.sh
---- git-1.8.4.orig/t/t9401-git-cvsserver-crlf.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.4/t/t9401-git-cvsserver-crlf.sh 2013-03-19 16:56:29.125993925 -0700
-@@ -57,15 +57,20 @@
- 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_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9600-cvsimport.sh git-1.8.4/t/t9600-cvsimport.sh
---- git-1.8.4.orig/t/t9600-cvsimport.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.4/t/t9600-cvsimport.sh 2013-03-19 16:56:29.125993925 -0700
-@@ -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 @@
- )
- '
-
--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 @@
- )
- '
-
--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 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_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 '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 '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_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 '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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9601-cvsimport-vendor-branch.sh git-1.8.4/t/t9601-cvsimport-vendor-branch.sh
---- git-1.8.4.orig/t/t9601-cvsimport-vendor-branch.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.4/t/t9601-cvsimport-vendor-branch.sh 2013-03-19 16:56:29.125993925 -0700
-@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9602-cvsimport-branches-tags.sh git-1.8.4/t/t9602-cvsimport-branches-tags.sh
---- git-1.8.4.orig/t/t9602-cvsimport-branches-tags.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.4/t/t9602-cvsimport-branches-tags.sh 2013-03-19 16:56:29.126993944 -0700
-@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9603-cvsimport-patchsets.sh git-1.8.4/t/t9603-cvsimport-patchsets.sh
---- git-1.8.4.orig/t/t9603-cvsimport-patchsets.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.4/t/t9603-cvsimport-patchsets.sh 2013-03-19 16:56:29.126993944 -0700
-@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/test-lib.sh git-1.8.4/t/test-lib.sh
---- git-1.8.4.orig/t/test-lib.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.4/t/test-lib.sh 2013-03-19 16:56:29.126993944 -0700
-@@ -686,6 +686,7 @@
- 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
diff --git a/dev-vcs/git/git-1.8.1.5-r1.ebuild b/dev-vcs/git/git-1.8.1.5-r1.ebuild
deleted file mode 100644
index bf82e95..0000000
--- a/dev-vcs/git/git-1.8.1.5-r1.ebuild
+++ /dev/null
@@ -1,600 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5-r1.ebuild,v 1.7 2013/12/11 10:27:22 polynomial-c Exp $
-
-EAPI=4
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_DEPEND="python? 2"
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
- SRC_URI_GOOG="http://git-core.googlecode.com/files"
- SRC_URI_KORG="mirror://kernel/software/scm/git"
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- doc? (
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- )"
- KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- dev-libs/openssl
- sys-libs/zlib
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl[-build(-)] )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
-
-RDEPEND="${CDEPEND}
- gpg? ( app-crypt/gnupg )
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- python? ( gtk?
- (
- >=dev-python/pygtk-2.8
- dev-python/pygtksourceview:2
- ) )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- app-text/xmlto
- )
- test? (
- app-crypt/gnupg
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- cgi? ( perl )
- cvs? ( perl )
- subversion? ( perl )
- webdav? ( curl )
-"
-
-pkg_setup() {
- if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
- if use python ; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- myopts="${myopts} NO_CURL=YesPlease"
- fi
-
- # broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
-
- # can't define this to null, since the entire makefile depends on it
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
- use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
- use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
- use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
- use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
- use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
- use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
-# fi
- if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
- fi
- if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
- fi
- if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
- fi
-
- has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- else
- git-2_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern,
- # funded as a bounty by the Gentoo Foundation. Merged upstream in 1.8.0.
- #epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
-
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch
-
- sed -i \
- -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
- -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
- -e 's:^\(CC = \).*$:\1$(OPTCC):' \
- -e 's:^\(AR = \).*$:\1$(OPTAR):' \
- -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
- -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
- Makefile || die "sed failed"
-
- # Never install the private copy of Error.pm (bug #296310)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # Fix git-subtree missing DESTDIR
- sed -i \
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
- contrib/subtree/Makefile
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- PYTHON_PATH=""
- use python && PYTHON_PATH="$(PYTHON -a)"
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${PYTHON_PATH}" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- "$@"
- # This is the fix for bug #326625, but it also causes breakage, see bug
- # #352693.
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- if use perl ; then
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
- git_emake perl/perl.mak || die "emake perl/perl.mak failed"
- fi
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el \
- || die "emacs modules failed"
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- if [[ ${CHOST} == *-darwin* ]]; then
- cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
- git_emake || die "emake credential-osxkeychain"
- fi
-
- cd "${S}"/Documentation
- if [[ ${PV} == *9999 ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- git_emake || die "emake svn-fe failed"
- if use doc ; then
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
- fi
- cd "${S}"
- fi
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- git_emake || die "emake git-credential-gnome-keyring failed"
- fi
-
- cd "${S}"/contrib/subtree
- git_emake
- use doc && git_emake doc
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain
- fi
-
- # Depending on the tarball and manual rebuild of the documentation, the
- # manpages may exist in either OR both of these directories.
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
- use doc && dodir /usr/share/doc/${PF}/html
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- newbashcomp contrib/completion/git-completion.bash ${PN}
- newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc} || die
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
- # don't add automatically to the load-path, so the sitefile
- # can do a conditional loading
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
- fi
-
- if use python && use gtk ; then
- dobin "${S}"/contrib/gitview/gitview
- python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- #dobin contrib/fast-import/git-p4 # Moved upstream
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream
- newbin contrib/fast-import/import-tars.perl import-tars
- newbin contrib/git-resurrect.sh git-resurrect
-
- # git-subtree
- cd "${S}"/contrib/subtree
- git_emake install || die "Failed to emake install git-subtree"
- if use doc ; then
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
- fi
- newdoc README README.git-subtree
- dodoc git-subtree.txt
- cd "${S}"
-
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
- # diff-highlight
- dobin contrib/diff-highlight/diff-highlight
- newdoc contrib/diff-highlight/README README.diff-highlight
-
- # git-jump
- dobin contrib/git-jump/git-jump
- newdoc contrib/git-jump/README git-jump.txt
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- dobin git-credential-gnome-keyring
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- dobin svn-fe
- dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
- cd "${S}"
- fi
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # credential/gnome-keyring TODO
- # diff-highlight - done above
- # diffall - done above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # git-jump - done above
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # persistent-https - TODO
- # mw-to-git - TODO
- # subtree - build seperately
- # svnimport - use git-svn
- # thunderbird-patch-inline - fixes thunderbird
- for i in \
- blameview buildsystems ciabot continuous convert-objects fast-import \
- hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
- ; do
- cp -rf \
- "${S}"/contrib/${i} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${ED}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- if use !prefix ; then
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
- systemd_dounit "${FILESDIR}/git-daemon.socket"
- fi
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh \
- t9604-cvsimport-timestamps.sh"
- local tests_perl="t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t0070-fundamental.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
- # t9100 still fails with symlinks in SVN 1.7
- local test_svn="t9100-git-svn-basic.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- built_with_use dev-vcs/cvs server && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- einfo "Disabling tests that fail with SVN 1.7"
- disabled="${disabled} ${test_svn}"
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first, must always run
- cd "${S}/t"
- nonfatal git_emake clean
-
- # Now run the tests, keep going if we hit an error, and don't terminate on
- # failure
- cd "${S}"
- einfo "Start test run"
- #MAKEOPTS=-j1
- nonfatal git_emake --keep-going test
- rc=$?
-
- # Display nice results, now print the results
- cd "${S}/t"
- nonfatal git_emake aggregate-results
-
- # And bail if there was a problem
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use python && python_mod_optimize git_remote_helpers
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
- einfo "Note that the prompt bash code is now in the seperate script"
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use python && python_mod_cleanup git_remote_helpers
-}
diff --git a/dev-vcs/git/git-1.8.1.5.ebuild b/dev-vcs/git/git-1.8.1.5.ebuild
deleted file mode 100644
index d2c9592..0000000
--- a/dev-vcs/git/git-1.8.1.5.ebuild
+++ /dev/null
@@ -1,598 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5.ebuild,v 1.14 2013/12/11 10:27:22 polynomial-c Exp $
-
-EAPI=4
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_DEPEND="python? 2"
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
- SRC_URI_GOOG="http://git-core.googlecode.com/files"
- SRC_URI_KORG="mirror://kernel/software/scm/git"
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- doc? (
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- )"
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- dev-libs/openssl
- sys-libs/zlib
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl[-build(-)] )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
-
-RDEPEND="${CDEPEND}
- gpg? ( app-crypt/gnupg )
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- python? ( gtk?
- (
- >=dev-python/pygtk-2.8
- dev-python/pygtksourceview:2
- ) )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- app-text/xmlto
- )
- test? (
- app-crypt/gnupg
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- cgi? ( perl )
- cvs? ( perl )
- subversion? ( perl )
- webdav? ( curl )
-"
-
-pkg_setup() {
- if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
- if use python ; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- myopts="${myopts} NO_CURL=YesPlease"
- fi
-
- # broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
-
- # can't define this to null, since the entire makefile depends on it
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
- use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
- use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
- use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
- use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
- use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
- use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
-# fi
- if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
- fi
- if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
- fi
- if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
- fi
-
- has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- else
- git-2_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern,
- # funded as a bounty by the Gentoo Foundation. Merged upstream in 1.8.0.
- #epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
-
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch
-
- sed -i \
- -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
- -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
- -e 's:^\(CC = \).*$:\1$(OPTCC):' \
- -e 's:^\(AR = \).*$:\1$(OPTAR):' \
- -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
- -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
- Makefile || die "sed failed"
-
- # Never install the private copy of Error.pm (bug #296310)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # Fix git-subtree missing DESTDIR
- sed -i \
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
- contrib/subtree/Makefile
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- PYTHON_PATH=""
- use python && PYTHON_PATH="$(PYTHON -a)"
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${PYTHON_PATH}" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- "$@"
- # This is the fix for bug #326625, but it also causes breakage, see bug
- # #352693.
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- if use perl ; then
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
- git_emake perl/perl.mak || die "emake perl/perl.mak failed"
- fi
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el \
- || die "emacs modules failed"
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- if [[ ${CHOST} == *-darwin* ]]; then
- cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
- git_emake || die "emake credential-osxkeychain"
- fi
-
- cd "${S}"/Documentation
- if [[ ${PV} == *9999 ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- git_emake || die "emake svn-fe failed"
- if use doc ; then
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
- fi
- cd "${S}"
- fi
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- git_emake || die "emake git-credential-gnome-keyring failed"
- fi
-
- cd "${S}"/contrib/subtree
- git_emake
- use doc && git_emake doc
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain
- fi
-
- # Depending on the tarball and manual rebuild of the documentation, the
- # manpages may exist in either OR both of these directories.
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
- use doc && dodir /usr/share/doc/${PF}/html
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- newbashcomp contrib/completion/git-completion.bash ${PN}
- newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc} || die
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
- # don't add automatically to the load-path, so the sitefile
- # can do a conditional loading
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
- fi
-
- if use python && use gtk ; then
- dobin "${S}"/contrib/gitview/gitview
- python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- #dobin contrib/fast-import/git-p4 # Moved upstream
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream
- newbin contrib/fast-import/import-tars.perl import-tars
- newbin contrib/git-resurrect.sh git-resurrect
-
- # git-subtree
- cd "${S}"/contrib/subtree
- git_emake install || die "Failed to emake install git-subtree"
- if use doc ; then
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
- fi
- newdoc README README.git-subtree
- dodoc git-subtree.txt
- cd "${S}"
-
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
- # diff-highlight
- dobin contrib/diff-highlight/diff-highlight
- newdoc contrib/diff-highlight/README README.diff-highlight
-
- # git-jump
- dobin contrib/git-jump/git-jump
- newdoc contrib/git-jump/README git-jump.txt
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- dobin git-credential-gnome-keyring
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- dobin svn-fe
- dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
- cd "${S}"
- fi
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # credential/gnome-keyring TODO
- # diff-highlight - done above
- # diffall - done above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # git-jump - done above
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # persistent-https - TODO
- # mw-to-git - TODO
- # subtree - build seperately
- # svnimport - use git-svn
- # thunderbird-patch-inline - fixes thunderbird
- for i in \
- blameview buildsystems ciabot continuous convert-objects fast-import \
- hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
- ; do
- cp -rf \
- "${S}"/contrib/${i} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${ED}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- if use !prefix ; then
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
- fi
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh \
- t9604-cvsimport-timestamps.sh"
- local tests_perl="t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t0070-fundamental.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
- # t9100 still fails with symlinks in SVN 1.7
- local test_svn="t9100-git-svn-basic.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- built_with_use dev-vcs/cvs server && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- einfo "Disabling tests that fail with SVN 1.7"
- disabled="${disabled} ${test_svn}"
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first, must always run
- cd "${S}/t"
- nonfatal git_emake clean
-
- # Now run the tests, keep going if we hit an error, and don't terminate on
- # failure
- cd "${S}"
- einfo "Start test run"
- #MAKEOPTS=-j1
- nonfatal git_emake --keep-going test
- rc=$?
-
- # Display nice results, now print the results
- cd "${S}/t"
- nonfatal git_emake aggregate-results
-
- # And bail if there was a problem
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use python && python_mod_optimize git_remote_helpers
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
- einfo "Note that the prompt bash code is now in the seperate script"
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use python && python_mod_cleanup git_remote_helpers
-}
diff --git a/dev-vcs/git/git-1.8.2.1.ebuild b/dev-vcs/git/git-1.8.2.1.ebuild
deleted file mode 100644
index 532b1b9..0000000
--- a/dev-vcs/git/git-1.8.2.1.ebuild
+++ /dev/null
@@ -1,610 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.2.1.ebuild,v 1.6 2013/12/11 10:27:22 polynomial-c Exp $
-
-EAPI=4
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_DEPEND="python? 2"
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
- SRC_URI_GOOG="http://git-core.googlecode.com/files"
- SRC_URI_KORG="mirror://kernel/software/scm/git"
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- doc? (
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- )"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- dev-libs/openssl
- sys-libs/zlib
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl[-build(-)] )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
-
-RDEPEND="${CDEPEND}
- gpg? ( app-crypt/gnupg )
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- python? ( gtk?
- (
- >=dev-python/pygtk-2.8
- dev-python/pygtksourceview:2
- ) )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- app-text/xmlto
- )
- test? (
- app-crypt/gnupg
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- cgi? ( perl )
- cvs? ( perl )
- subversion? ( perl )
- webdav? ( curl )
-"
-
-pkg_setup() {
- if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
- if use python ; then
- python_set_active_version 2
- python_pkg_setup
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- myopts="${myopts} NO_CURL=YesPlease"
- fi
-
- # broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
-
- # For svn-fe
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
- # can't define this to null, since the entire makefile depends on it
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
- use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
- use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
- use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes" \
- && extlibs="${extlibs} -lpcre"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
- use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
- use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
- use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
-# fi
- if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
- fi
- if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
- fi
- if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
- fi
-
- has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
- export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- else
- git-2_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern,
- # funded as a bounty by the Gentoo Foundation. Merged upstream in 1.8.0.
- #epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
-
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.8.2-optional-cvs.patch
-
- # bug #464210 - texinfo anchors
- epatch "${FILESDIR}"/git-1.8.2-texinfo.patch
-
- sed -i \
- -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
- -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
- -e 's:^\(CC = \).*$:\1$(OPTCC):' \
- -e 's:^\(AR = \).*$:\1$(OPTAR):' \
- -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
- -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
- Makefile contrib/svn-fe/Makefile || die "sed failed"
-
- # Never install the private copy of Error.pm (bug #296310)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # Fix git-subtree missing DESTDIR
- sed -i \
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
- contrib/subtree/Makefile
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- PYTHON_PATH=""
- use python && PYTHON_PATH="$(PYTHON -a)"
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${PYTHON_PATH}" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- V=1 \
- "$@"
- # This is the fix for bug #326625, but it also causes breakage, see bug
- # #352693.
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- if use perl ; then
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
- git_emake perl/perl.mak || die "emake perl/perl.mak failed"
- fi
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el \
- || die "emacs modules failed"
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- if [[ ${CHOST} == *-darwin* ]]; then
- cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
- git_emake || die "emake credential-osxkeychain"
- fi
-
- cd "${S}"/Documentation
- if [[ ${PV} == *9999 ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
- if use doc ; then
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
- fi
- cd "${S}"
- fi
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- git_emake || die "emake git-credential-gnome-keyring failed"
- fi
-
- cd "${S}"/contrib/subtree
- git_emake
- use doc && git_emake doc
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain
- fi
-
- # Depending on the tarball and manual rebuild of the documentation, the
- # manpages may exist in either OR both of these directories.
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
- use doc && dodir /usr/share/doc/${PF}/html
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- newbashcomp contrib/completion/git-completion.bash ${PN}
- newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc} || die
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
- # don't add automatically to the load-path, so the sitefile
- # can do a conditional loading
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
- fi
-
- if use python && use gtk ; then
- dobin "${S}"/contrib/gitview/gitview
- python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- #dobin contrib/fast-import/git-p4 # Moved upstream
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream
- newbin contrib/fast-import/import-tars.perl import-tars
- newbin contrib/git-resurrect.sh git-resurrect
-
- # git-subtree
- cd "${S}"/contrib/subtree
- git_emake install || die "Failed to emake install git-subtree"
- if use doc ; then
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
- fi
- newdoc README README.git-subtree
- dodoc git-subtree.txt
- cd "${S}"
-
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
- # diff-highlight
- dobin contrib/diff-highlight/diff-highlight
- newdoc contrib/diff-highlight/README README.diff-highlight
-
- # git-jump
- dobin contrib/git-jump/git-jump
- newdoc contrib/git-jump/README git-jump.txt
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- dobin git-credential-gnome-keyring
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- dobin svn-fe
- dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
- cd "${S}"
- fi
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # credential/gnome-keyring TODO
- # diff-highlight - done above
- # diffall - done above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # git-jump - done above
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # persistent-https - TODO
- # mw-to-git - TODO
- # subtree - build seperately
- # svnimport - use git-svn
- # thunderbird-patch-inline - fixes thunderbird
- for i in \
- blameview buildsystems ciabot continuous convert-objects fast-import \
- hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
- ; do
- cp -rf \
- "${S}"/contrib/${i} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${ED}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- if use !prefix ; then
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
- systemd_dounit "${FILESDIR}/git-daemon.socket"
- fi
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9402-git-cvsserver-refs.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh \
- t9604-cvsimport-timestamps.sh"
- local tests_perl="t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t0070-fundamental.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
- # t9100 still fails with symlinks in SVN 1.7
- local test_svn="t9100-git-svn-basic.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- built_with_use dev-vcs/cvs server && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- einfo "Disabling tests that fail with SVN 1.7"
- disabled="${disabled} ${test_svn}"
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first, must always run
- cd "${S}/t"
- nonfatal git_emake clean
-
- # Now run the tests, keep going if we hit an error, and don't terminate on
- # failure
- cd "${S}"
- einfo "Start test run"
- #MAKEOPTS=-j1
- nonfatal git_emake --keep-going test
- rc=$?
-
- # Display nice results, now print the results
- cd "${S}/t"
- nonfatal git_emake aggregate-results
-
- # And bail if there was a problem
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use python && python_mod_optimize git_remote_helpers
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
- einfo "Note that the prompt bash code is now in the seperate script"
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use python && python_mod_cleanup git_remote_helpers
-}
diff --git a/dev-vcs/git/git-1.8.4.5.ebuild b/dev-vcs/git/git-1.8.4.5.ebuild
deleted file mode 100644
index 7d63244..0000000
--- a/dev-vcs/git/git-1.8.4.5.ebuild
+++ /dev/null
@@ -1,619 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.4.5.ebuild,v 1.2 2013/12/11 10:27:22 polynomial-c Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_{6,7} )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
- SRC_URI_GOOG="http://git-core.googlecode.com/files"
- SRC_URI_KORG="mirror://kernel/software/scm/git"
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- doc? (
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- )"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- dev-libs/openssl
- sys-libs/zlib
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl[-build(-)] )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
-
-RDEPEND="${CDEPEND}
- gpg? ( app-crypt/gnupg )
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- python? ( gtk?
- (
- >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
- >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
- )
- ${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- app-text/xmlto
- )
- test? (
- app-crypt/gnupg
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- cgi? ( perl )
- cvs? ( perl )
- subversion? ( perl )
- webdav? ( curl )
- gtk? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
- if use subversion && has_version "dev-vcs/subversion[dso]"; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
- if use python ; then
- python-single-r1_pkg_setup
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- myopts="${myopts} NO_CURL=YesPlease"
- fi
-
- # broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
-
- # For svn-fe
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
- # can't define this to null, since the entire makefile depends on it
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
- use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
- use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
- use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes" \
- && extlibs="${extlibs} -lpcre"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
- use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
- use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
- || myopts="${myopts} NO_PTHREADS=YesPlease"
- use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
-# fi
- if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
- fi
- if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
- fi
- if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
- fi
-
- has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
- export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- else
- git-2_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.8.4-optional-cvs.patch
-
- sed -i \
- -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
- -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
- -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
- -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
- -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- Makefile contrib/svn-fe/Makefile || die "sed failed"
-
- # Never install the private copy of Error.pm (bug #296310)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # Fix git-subtree missing DESTDIR
- sed -i \
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
- contrib/subtree/Makefile
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- PYTHON_PATH=""
- use python && PYTHON_PATH="${PYTHON}"
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${PYTHON_PATH}" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- V=1 \
- "$@"
- # This is the fix for bug #326625, but it also causes breakage, see bug
- # #352693.
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- if use perl ; then
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
- git_emake perl/perl.mak || die "emake perl/perl.mak failed"
- fi
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- if [[ ${CHOST} == *-darwin* ]]; then
- cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
- git_emake || die "emake credential-osxkeychain"
- fi
-
- cd "${S}"/Documentation
- if [[ ${PV} == *9999 ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
- if use doc ; then
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
- fi
- cd "${S}"
- fi
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- git_emake || die "emake git-credential-gnome-keyring failed"
- fi
-
- cd "${S}"/contrib/subtree
- git_emake
- use doc && git_emake doc
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain
- fi
-
- # Depending on the tarball and manual rebuild of the documentation, the
- # manpages may exist in either OR both of these directories.
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
- use doc && dodir /usr/share/doc/${PF}/html
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- newbashcomp contrib/completion/git-completion.bash ${PN}
- newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc}
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
- # don't add automatically to the load-path, so the sitefile
- # can do a conditional loading
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
- fi
-
- if use python && use gtk ; then
- python_doscript "${S}"/contrib/gitview/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- #dobin contrib/fast-import/git-p4 # Moved upstream
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream
- newbin contrib/fast-import/import-tars.perl import-tars
- exeinto /usr/libexec/git-core/
- newexe contrib/git-resurrect.sh git-resurrect
-
- # git-subtree
- cd "${S}"/contrib/subtree
- git_emake install || die "Failed to emake install git-subtree"
- if use doc ; then
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
- fi
- newdoc README README.git-subtree
- dodoc git-subtree.txt
- cd "${S}"
-
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
- # diff-highlight
- dobin contrib/diff-highlight/diff-highlight
- newdoc contrib/diff-highlight/README README.diff-highlight
-
- # git-jump
- exeinto /usr/libexec/git-core/
- doexe contrib/git-jump/git-jump
- newdoc contrib/git-jump/README git-jump.txt
-
- # git-contacts
- exeinto /usr/libexec/git-core/
- doexe contrib/contacts/git-contacts
- dodoc contrib/contacts/git-contacts.txt
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- dobin git-credential-gnome-keyring
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- dobin svn-fe
- dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
- cd "${S}"
- fi
-
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # credential/gnome-keyring TODO
- # diff-highlight - done above
- # diffall - done above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # git-jump - done above
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # persistent-https - TODO
- # mw-to-git - TODO
- # subtree - build seperately
- # svnimport - use git-svn
- # thunderbird-patch-inline - fixes thunderbird
- for i in \
- buildsystems ciabot convert-objects fast-import \
- hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
- ; do
- cp -rf \
- "${S}"/contrib/${i} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${ED}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- if use !prefix ; then
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
- systemd_dounit "${FILESDIR}/git-daemon.socket"
- fi
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9402-git-cvsserver-refs.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh \
- t9604-cvsimport-timestamps.sh"
- local tests_perl="t3701-add-interactive.sh \
- t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh \
- t7106-reset-unborn-branch.sh \
- t7501-commit.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t0070-fundamental.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
- # t9100 still fails with symlinks in SVN 1.7
- local test_svn="t9100-git-svn-basic.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- has_version "dev-vcs/cvs[server]" && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- einfo "Disabling tests that fail with SVN 1.7"
- disabled="${disabled} ${test_svn}"
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first, must always run
- cd "${S}/t"
- nonfatal git_emake clean
-
- # Now run the tests, keep going if we hit an error, and don't terminate on
- # failure
- cd "${S}"
- einfo "Start test run"
- #MAKEOPTS=-j1
- nonfatal git_emake --keep-going test
- rc=$?
-
- # Display nice results, now print the results
- cd "${S}/t"
- nonfatal git_emake aggregate-results
-
- # And bail if there was a problem
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
- einfo "Note that the prompt bash code is now in the seperate script"
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-1.8.5.1.ebuild b/dev-vcs/git/git-1.8.5.1.ebuild
deleted file mode 100644
index 9262d6c..0000000
--- a/dev-vcs/git/git-1.8.5.1.ebuild
+++ /dev/null
@@ -1,619 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.1.ebuild,v 1.2 2013/12/11 10:27:22 polynomial-c Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_{6,7} )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
- SRC_URI_GOOG="http://git-core.googlecode.com/files"
- SRC_URI_KORG="mirror://kernel/software/scm/git"
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- doc? (
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- )"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- dev-libs/openssl
- sys-libs/zlib
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl[-build(-)] )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
-
-RDEPEND="${CDEPEND}
- gpg? ( app-crypt/gnupg )
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- python? ( gtk?
- (
- >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
- >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
- )
- ${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- app-text/xmlto
- )
- test? (
- app-crypt/gnupg
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- cgi? ( perl )
- cvs? ( perl )
- subversion? ( perl )
- webdav? ( curl )
- gtk? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
- if use subversion && has_version "dev-vcs/subversion[dso]"; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
- if use python ; then
- python-single-r1_pkg_setup
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- myopts="${myopts} NO_CURL=YesPlease"
- fi
-
- # broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
-
- # For svn-fe
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
- # can't define this to null, since the entire makefile depends on it
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
- use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
- use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
- use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes" \
- && extlibs="${extlibs} -lpcre"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
- use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
- use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
- || myopts="${myopts} NO_PTHREADS=YesPlease"
- use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
-# fi
- if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
- fi
- if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
- fi
- if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
- fi
-
- has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
- export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- else
- git-2_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch
-
- sed -i \
- -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
- -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
- -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
- -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
- -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- Makefile contrib/svn-fe/Makefile || die "sed failed"
-
- # Never install the private copy of Error.pm (bug #296310)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # Fix git-subtree missing DESTDIR
- sed -i \
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
- contrib/subtree/Makefile
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- PYTHON_PATH=""
- use python && PYTHON_PATH="${PYTHON}"
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${PYTHON_PATH}" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- V=1 \
- "$@"
- # This is the fix for bug #326625, but it also causes breakage, see bug
- # #352693.
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- if use perl ; then
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
- git_emake perl/perl.mak || die "emake perl/perl.mak failed"
- fi
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- if [[ ${CHOST} == *-darwin* ]]; then
- cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
- git_emake || die "emake credential-osxkeychain"
- fi
-
- cd "${S}"/Documentation
- if [[ ${PV} == *9999 ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
- if use doc ; then
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
- fi
- cd "${S}"
- fi
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- git_emake || die "emake git-credential-gnome-keyring failed"
- fi
-
- cd "${S}"/contrib/subtree
- git_emake
- use doc && git_emake doc
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain
- fi
-
- # Depending on the tarball and manual rebuild of the documentation, the
- # manpages may exist in either OR both of these directories.
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
- use doc && dodir /usr/share/doc/${PF}/html
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- newbashcomp contrib/completion/git-completion.bash ${PN}
- newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc}
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
- # don't add automatically to the load-path, so the sitefile
- # can do a conditional loading
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
- fi
-
- if use python && use gtk ; then
- python_doscript "${S}"/contrib/gitview/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- #dobin contrib/fast-import/git-p4 # Moved upstream
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream
- newbin contrib/fast-import/import-tars.perl import-tars
- exeinto /usr/libexec/git-core/
- newexe contrib/git-resurrect.sh git-resurrect
-
- # git-subtree
- cd "${S}"/contrib/subtree
- git_emake install || die "Failed to emake install git-subtree"
- if use doc ; then
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
- fi
- newdoc README README.git-subtree
- dodoc git-subtree.txt
- cd "${S}"
-
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
- # diff-highlight
- dobin contrib/diff-highlight/diff-highlight
- newdoc contrib/diff-highlight/README README.diff-highlight
-
- # git-jump
- exeinto /usr/libexec/git-core/
- doexe contrib/git-jump/git-jump
- newdoc contrib/git-jump/README git-jump.txt
-
- # git-contacts
- exeinto /usr/libexec/git-core/
- doexe contrib/contacts/git-contacts
- dodoc contrib/contacts/git-contacts.txt
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- dobin git-credential-gnome-keyring
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- dobin svn-fe
- dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
- cd "${S}"
- fi
-
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # credential/gnome-keyring TODO
- # diff-highlight - done above
- # diffall - done above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # git-jump - done above
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # persistent-https - TODO
- # mw-to-git - TODO
- # subtree - build seperately
- # svnimport - use git-svn
- # thunderbird-patch-inline - fixes thunderbird
- for i in \
- buildsystems convert-objects fast-import \
- hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
- ; do
- cp -rf \
- "${S}"/contrib/${i} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${ED}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- if use !prefix ; then
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
- systemd_dounit "${FILESDIR}/git-daemon.socket"
- fi
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9402-git-cvsserver-refs.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh \
- t9604-cvsimport-timestamps.sh"
- local tests_perl="t3701-add-interactive.sh \
- t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh \
- t7106-reset-unborn-branch.sh \
- t7501-commit.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t0070-fundamental.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
- # t9100 still fails with symlinks in SVN 1.7
- local test_svn="t9100-git-svn-basic.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- has_version "dev-vcs/cvs[server]" && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- einfo "Disabling tests that fail with SVN 1.7"
- disabled="${disabled} ${test_svn}"
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first, must always run
- cd "${S}/t"
- nonfatal git_emake clean
-
- # Now run the tests, keep going if we hit an error, and don't terminate on
- # failure
- cd "${S}"
- einfo "Start test run"
- #MAKEOPTS=-j1
- nonfatal git_emake --keep-going test
- rc=$?
-
- # Display nice results, now print the results
- cd "${S}/t"
- nonfatal git_emake aggregate-results
-
- # And bail if there was a problem
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
- einfo "Note that the prompt bash code is now in the seperate script"
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: dev-vcs/git/, dev-vcs/git/files/
@ 2014-01-04 20:28 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2014-01-04 20:28 UTC (permalink / raw
To: gentoo-commits
commit: 3b315e812ab4bf80acb45086577e8b2d3a9c1abd
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 4 20:29:01 2014 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 4 20:29:01 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=3b315e81
[dev-vcs/git] add mediawiki supprt, seems to work but perl files are in wrong dir still
Package-Manager: portage-2.2.7
---
dev-vcs/git/Manifest | 3 -
dev-vcs/git/files/git-1.8.2-optional-cvs.patch | 369 ---------------
dev-vcs/git/files/git-1.8.5-mw-destdir.patch | 37 ++
dev-vcs/git/git-1.8.3.2-r1.ebuild | 614 -------------------------
dev-vcs/git/git-1.8.5.2.ebuild | 19 +-
dev-vcs/git/metadata.xml | 1 +
6 files changed, 55 insertions(+), 988 deletions(-)
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 99e0dcb..b8dc6e1 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,6 +1,3 @@
-DIST git-1.8.3.2.tar.gz 4474347 SHA256 2f798db86859c85608fe4120f52a1b1cb13ca9c4daa4f59eb1dc090280f46473 SHA512 6e19948821dfbf78c5b9ea95614d3c10f4625583e3c17b6c55110b74f28679e525c449179cf49c2587a86c3b7fd7b6a27589824fcea0ec6fb69ca752a6942931 WHIRLPOOL 26892e039b67b35ae9df0a124d0812b36a22f481f146561b733a758b89a00770c05902c2820f2a783bc0fac07ecb335accbc939d21481da821177e0548d6a077
DIST git-1.8.5.2.tar.gz 4755707 SHA256 e986da24893197e33d835150c456708441e4a116a726ce9312a27f6de804f7b2 SHA512 73e408dd787b73a0f3935e37540d5da32a2f8d6d84af60d3ec7e224c3a953cc62eea749c7a689f8cca3b54e633f2520ed23d910ca5932021523e1fb750bf2c0a WHIRLPOOL d6623742cce0bdcb6b5334d363b44edeb6413e45fa42cb2bce013e07796dc98bd865b0d2c2578f2bd526140dceea25b19acbe212dc6afec7903c5dd6ea794d7f
-DIST git-htmldocs-1.8.3.2.tar.gz 2115320 SHA256 805b7fc4399daf9258e8cc28ecc3dd043fdd7f339447f4d84674826916109246 SHA512 0890b60bfa110ca7eaf7aaddbf0aca9574f608addc384cece3c91c8c04ef6397064a0669f3d61d0a65eb120b626ccd85df26f04438ca301f349136cd55e5080a WHIRLPOOL 377c39ac7988a3c1bb6e80333c43878d38fe5eecbb75dcbcbef3c2186842fcc170a552d72be891f1479c336fdd6c5ac1ce1ca2c0adf9a8238bd057f093c3f912
DIST git-htmldocs-1.8.5.2.tar.gz 2237867 SHA256 ba708ab1b5916960f61c22cf60eb6689ac62d1b6dbb6a460d98502815cdbff41 SHA512 824ab4cf879c0b3c1215f29f5dc3d18ae9bf15aad9deb7d81e81f8a57d500d304738c7e580f0fb5e3df2b6609d957b964938250a48145a3559b93ef1419eba2b WHIRLPOOL 962a2da1174ab401bdbafdca8cc9debd0fe927838b44bc8bbd0258a1da62cc32c10a6aa5a8a2bbf404fc257d0f4df981969ec3c2b9e898bcf3dc417d2f6517c6
-DIST git-manpages-1.8.3.2.tar.gz 542769 SHA256 599bc8f6c56986a994a237cfebb53b4fab9051576775e32d0353e0455ab84115 SHA512 42fd781b924355c969ce381aae828f877059472741d7b53b0d1aad53f04c8a27b6b161b5dfc353098370ead73ccb9cdc86ac5374cf02829134f8c4d70bcbb7cf WHIRLPOOL 90226006a35b7b6e644f887981f2725238ff428f572425942701614e14fab5c8c5c602746de93a113d83d9b9c76ea1805a9c7cfa353305b0f817c33976048d77
DIST git-manpages-1.8.5.2.tar.gz 569581 SHA256 2aef8c084ee795e544b6fb8715cccc1109efca1ca4b8db1588a2a5186ddb10c6 SHA512 1ca37aff4d5ca6d4daa6e8f2b3114a63ebdb0bd42382e1ed1ff9d01117da2fd8bd3a662b9beab318fdffd682039589c9b5f50ced67122e96b0a0ffd213a4112a WHIRLPOOL 257bd0549fb63e5ef31f3575731a5c90eead5da556480d929877704086dc03dadd924713480d9c3f8b5890912d54dd8be48d970abb9f7e86c55d8655642fbfb5
diff --git a/dev-vcs/git/files/git-1.8.2-optional-cvs.patch b/dev-vcs/git/files/git-1.8.2-optional-cvs.patch
deleted file mode 100644
index 4fa0b3e..0000000
--- a/dev-vcs/git/files/git-1.8.2-optional-cvs.patch
+++ /dev/null
@@ -1,369 +0,0 @@
-From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
-From: Robin Johnson <robbat2@gentoo.org>
-Date: Wed, 22 Aug 2012 04:25:06 +0000
-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.2
-
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/Makefile git-1.8.2/Makefile
---- git-1.8.2.orig/Makefile 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.2/Makefile 2013-03-19 16:58:52.922806111 -0700
-@@ -259,6 +259,8 @@
- #
- # 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'.
-@@ -431,6 +433,7 @@
- PROGRAM_OBJS =
- PROGRAMS =
- SCRIPT_PERL =
-+SCRIPT_PERL_CVS =
- SCRIPT_PYTHON =
- SCRIPT_SH =
- SCRIPT_LIB =
-@@ -471,19 +474,20 @@
- 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-remote-testpy.py
- SCRIPT_PYTHON += git-p4.py
-
- # 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))
-
- # Individual rules to allow e.g.
-@@ -1745,8 +1749,18 @@
- $(QUIET_GEN)$(cmd_munge_script) && \
- mv $@+ $@
-
-+_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
-
-@@ -1758,7 +1772,7 @@
- perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
- $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
-
--$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE
- $(QUIET_GEN)$(RM) $@ $@+ && \
- INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
- sed -e '1{' \
-@@ -1783,14 +1797,17 @@
- 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|#!$(SHELL_PATH_SQ)|' \
- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
- unimplemented.sh >$@+ && \
- chmod +x $@+ && \
- mv $@+ $@
--endif # NO_PERL
-
- ifndef NO_PYTHON
- $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9200-git-cvsexportcommit.sh git-1.8.2/t/t9200-git-cvsexportcommit.sh
---- git-1.8.2.orig/t/t9200-git-cvsexportcommit.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.2/t/t9200-git-cvsexportcommit.sh 2013-03-19 16:56:29.124993905 -0700
-@@ -12,6 +12,11 @@
- 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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9400-git-cvsserver-server.sh git-1.8.2/t/t9400-git-cvsserver-server.sh
---- git-1.8.2.orig/t/t9400-git-cvsserver-server.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.2/t/t9400-git-cvsserver-server.sh 2013-03-19 16:56:29.124993905 -0700
-@@ -11,9 +11,15 @@
- . ./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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9401-git-cvsserver-crlf.sh git-1.8.2/t/t9401-git-cvsserver-crlf.sh
---- git-1.8.2.orig/t/t9401-git-cvsserver-crlf.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.2/t/t9401-git-cvsserver-crlf.sh 2013-03-19 16:56:29.125993925 -0700
-@@ -57,15 +57,20 @@
- 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_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
-diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9600-cvsimport.sh git-1.8.2/t/t9600-cvsimport.sh
---- git-1.8.2.orig/t/t9600-cvsimport.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.2/t/t9600-cvsimport.sh 2013-03-19 16:56:29.125993925 -0700
-@@ -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 @@
- )
- '
-
--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 @@
- )
- '
-
--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 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_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 '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 '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_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 '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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9601-cvsimport-vendor-branch.sh git-1.8.2/t/t9601-cvsimport-vendor-branch.sh
---- git-1.8.2.orig/t/t9601-cvsimport-vendor-branch.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.2/t/t9601-cvsimport-vendor-branch.sh 2013-03-19 16:56:29.125993925 -0700
-@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9602-cvsimport-branches-tags.sh git-1.8.2/t/t9602-cvsimport-branches-tags.sh
---- git-1.8.2.orig/t/t9602-cvsimport-branches-tags.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.2/t/t9602-cvsimport-branches-tags.sh 2013-03-19 16:56:29.126993944 -0700
-@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9603-cvsimport-patchsets.sh git-1.8.2/t/t9603-cvsimport-patchsets.sh
---- git-1.8.2.orig/t/t9603-cvsimport-patchsets.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.2/t/t9603-cvsimport-patchsets.sh 2013-03-19 16:56:29.126993944 -0700
-@@ -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 -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/test-lib.sh git-1.8.2/t/test-lib.sh
---- git-1.8.2.orig/t/test-lib.sh 2013-03-13 12:15:22.000000000 -0700
-+++ git-1.8.2/t/test-lib.sh 2013-03-19 16:56:29.126993944 -0700
-@@ -686,6 +686,7 @@
- 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
diff --git a/dev-vcs/git/files/git-1.8.5-mw-destdir.patch b/dev-vcs/git/files/git-1.8.5-mw-destdir.patch
new file mode 100644
index 0000000..ea4f175
--- /dev/null
+++ b/dev-vcs/git/files/git-1.8.5-mw-destdir.patch
@@ -0,0 +1,37 @@
+diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
+index f206f96..a4b6f7a 100644
+--- a/contrib/mw-to-git/Makefile
++++ b/contrib/mw-to-git/Makefile
+@@ -18,9 +18,13 @@ SCRIPT_PERL+=git-mw.perl
+ GIT_ROOT_DIR=../..
+ HERE=contrib/mw-to-git/
+
++INSTALL = install
++
+ SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
+ INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
+ -s --no-print-directory instlibdir)
++DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
++INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
+
+ all: build
+
+@@ -30,7 +34,9 @@ test: all
+ check: perlcritic test
+
+ install_pm:
+- install $(GIT_MEDIAWIKI_PM) $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
++ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/Git'
++ $(INSTALL) -m 644 $(GIT_MEDIAWIKI_PM) \
++ '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/$(GIT_MEDIAWIKI_PM)'
+
+ build:
+ $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
+@@ -43,7 +49,6 @@ install: install_pm
+ clean:
+ $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
+ clean-perl-script
+- rm $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
+
+ perlcritic:
+ perlcritic -5 $(SCRIPT_PERL)
diff --git a/dev-vcs/git/git-1.8.3.2-r1.ebuild b/dev-vcs/git/git-1.8.3.2-r1.ebuild
deleted file mode 100644
index 818b022..0000000
--- a/dev-vcs/git/git-1.8.3.2-r1.ebuild
+++ /dev/null
@@ -1,614 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.3.2-r1.ebuild,v 1.10 2013/12/11 10:39:17 pinkbyte Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_{6,7} )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
- SRC_URI_GOOG="http://git-core.googlecode.com/files"
- SRC_URI_KORG="mirror://kernel/software/scm/git"
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- doc? (
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- )"
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- dev-libs/openssl
- sys-libs/zlib
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl[-build(-)] )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
-
-RDEPEND="${CDEPEND}
- gpg? ( app-crypt/gnupg )
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- python? ( gtk?
- (
- >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
- >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
- )
- ${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- app-text/xmlto
- )
- test? (
- app-crypt/gnupg
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- cgi? ( perl )
- cvs? ( perl )
- subversion? ( perl )
- webdav? ( curl )
- gtk? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
- if use subversion && has_version "dev-vcs/subversion[dso]"; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
- if use python ; then
- python-single-r1_pkg_setup
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- myopts="${myopts} NO_CURL=YesPlease"
- fi
-
- # broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
-
- # For svn-fe
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
- # can't define this to null, since the entire makefile depends on it
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
- use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
- use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
- use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes" \
- && extlibs="${extlibs} -lpcre"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
- use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
- use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
- || myopts="${myopts} NO_PTHREADS=YesPlease"
- use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
-# fi
- if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
- fi
- if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
- fi
- if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
- fi
-
- has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
- export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- else
- git-2_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.8.2-optional-cvs.patch
-
- sed -i \
- -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
- -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
- -e 's:^\(CC = \).*$:\1$(OPTCC):' \
- -e 's:^\(AR = \).*$:\1$(OPTAR):' \
- -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
- -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
- Makefile contrib/svn-fe/Makefile || die "sed failed"
-
- # Never install the private copy of Error.pm (bug #296310)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # Fix git-subtree missing DESTDIR
- sed -i \
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
- contrib/subtree/Makefile
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- PYTHON_PATH=""
- use python && PYTHON_PATH="${PYTHON}"
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${PYTHON_PATH}" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- V=1 \
- "$@"
- # This is the fix for bug #326625, but it also causes breakage, see bug
- # #352693.
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- if use perl ; then
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
- git_emake perl/perl.mak || die "emake perl/perl.mak failed"
- fi
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- if [[ ${CHOST} == *-darwin* ]]; then
- cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
- git_emake || die "emake credential-osxkeychain"
- fi
-
- cd "${S}"/Documentation
- if [[ ${PV} == *9999 ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
- if use doc ; then
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
- fi
- cd "${S}"
- fi
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- git_emake || die "emake git-credential-gnome-keyring failed"
- fi
-
- cd "${S}"/contrib/subtree
- git_emake
- use doc && git_emake doc
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain
- fi
-
- # Depending on the tarball and manual rebuild of the documentation, the
- # manpages may exist in either OR both of these directories.
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
- use doc && dodir /usr/share/doc/${PF}/html
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- newbashcomp contrib/completion/git-completion.bash ${PN}
- newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc}
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
- # don't add automatically to the load-path, so the sitefile
- # can do a conditional loading
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
- fi
-
- if use python && use gtk ; then
- python_doscript "${S}"/contrib/gitview/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- #dobin contrib/fast-import/git-p4 # Moved upstream
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream
- newbin contrib/fast-import/import-tars.perl import-tars
- exeinto /usr/libexec/git-core/
- newexe contrib/git-resurrect.sh git-resurrect
-
- # git-subtree
- cd "${S}"/contrib/subtree
- git_emake install || die "Failed to emake install git-subtree"
- if use doc ; then
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
- fi
- newdoc README README.git-subtree
- dodoc git-subtree.txt
- cd "${S}"
-
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
- # diff-highlight
- dobin contrib/diff-highlight/diff-highlight
- newdoc contrib/diff-highlight/README README.diff-highlight
-
- # git-jump
- exeinto /usr/libexec/git-core/
- doexe contrib/git-jump/git-jump
- newdoc contrib/git-jump/README git-jump.txt
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- dobin git-credential-gnome-keyring
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- dobin svn-fe
- dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
- cd "${S}"
- fi
-
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # credential/gnome-keyring TODO
- # diff-highlight - done above
- # diffall - done above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # git-jump - done above
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # persistent-https - TODO
- # mw-to-git - TODO
- # subtree - build seperately
- # svnimport - use git-svn
- # thunderbird-patch-inline - fixes thunderbird
- for i in \
- blameview buildsystems ciabot continuous convert-objects fast-import \
- hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
- ; do
- cp -rf \
- "${S}"/contrib/${i} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${ED}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- if use !prefix ; then
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
- systemd_dounit "${FILESDIR}/git-daemon.socket"
- fi
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9402-git-cvsserver-refs.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh \
- t9604-cvsimport-timestamps.sh"
- local tests_perl="t3701-add-interactive.sh \
- t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh \
- t7106-reset-unborn-branch.sh \
- t7501-commit.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t0070-fundamental.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
- # t9100 still fails with symlinks in SVN 1.7
- local test_svn="t9100-git-svn-basic.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- has_version "dev-vcs/cvs[server]" && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- einfo "Disabling tests that fail with SVN 1.7"
- disabled="${disabled} ${test_svn}"
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first, must always run
- cd "${S}/t"
- nonfatal git_emake clean
-
- # Now run the tests, keep going if we hit an error, and don't terminate on
- # failure
- cd "${S}"
- einfo "Start test run"
- #MAKEOPTS=-j1
- nonfatal git_emake --keep-going test
- rc=$?
-
- # Display nice results, now print the results
- cd "${S}/t"
- nonfatal git_emake aggregate-results
-
- # And bail if there was a problem
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
- einfo "Note that the prompt bash code is now in the seperate script"
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-1.8.5.2.ebuild b/dev-vcs/git/git-1.8.5.2.ebuild
index 048f393..0c54ae5 100644
--- a/dev-vcs/git/git-1.8.5.2.ebuild
+++ b/dev-vcs/git/git-1.8.5.2.ebuild
@@ -40,14 +40,14 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
# Common to both DEPEND and RDEPEND
CDEPEND="
dev-libs/openssl
sys-libs/zlib
pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl[-build(-)] )
+ perl? ( dev-lang/perl:=[-build(-)] )
tk? ( dev-lang/tk )
curl? (
net-misc/curl
@@ -100,6 +100,7 @@ S="${WORKDIR}/${MY_P}"
REQUIRED_USE="
cgi? ( perl )
cvs? ( perl )
+ mediawiki? ( perl )
subversion? ( perl )
webdav? ( curl )
gtk? ( python )
@@ -222,6 +223,9 @@ src_prepare() {
# bug #350330 - automagic CVS when we don't want it is bad.
epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch
+ # honor and correctly quote DISTDIR (from git master)
+ epatch "${FILESDIR}"/git-1.8.5-mw-destdir.patch
+
sed -i \
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
@@ -329,6 +333,11 @@ src_compile() {
cd "${S}"/contrib/subtree
git_emake
use doc && git_emake doc
+
+ if use mediawiki ; then
+ cd "${S}"/contrib/mw-to-git
+ git_emake
+ fi
}
src_install() {
@@ -390,6 +399,12 @@ src_install() {
dodoc git-subtree.txt
cd "${S}"
+ if use mediawiki ; then
+ cd "${S}"/contrib/mw-to-git
+ git_emake install
+ cd "${S}"
+ fi
+
# git-diffall
dobin contrib/diffall/git-diffall
newdoc contrib/diffall/README git-diffall.txt
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml
index 106f3a8..6f4d4ee 100644
--- a/dev-vcs/git/metadata.xml
+++ b/dev-vcs/git/metadata.xml
@@ -33,6 +33,7 @@
<flag name="gpg">Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime!</flag>
<flag name="gtk">Include the gitview contrib tool</flag>
<flag name="highlight">GitWeb support for app-text/highlight</flag>
+ <flag name="mediawiki">Support pulling and pushing from MediaWiki</flag>
<flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag>
<flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag>
<flag name="webdav">Adds support for push'ing to HTTP/HTTPS repositories via DAV</flag>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: dev-vcs/git/, dev-vcs/git/files/
@ 2014-01-04 21:20 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2014-01-04 21:20 UTC (permalink / raw
To: gentoo-commits
commit: a6594332f39a00e43ebb6b5b81c1c2e1eeb8e8a6
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 4 21:20:57 2014 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 4 21:20:57 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=a6594332
[dev-vcs/git] hacked support for vendor_dir
Package-Manager: portage-2.2.7
---
dev-vcs/git/files/git-1.8.5-mw-vendor.patch | 39 +++++++++++++++++++++++++++++
dev-vcs/git/git-1.8.5.2.ebuild | 6 ++++-
2 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/dev-vcs/git/files/git-1.8.5-mw-vendor.patch b/dev-vcs/git/files/git-1.8.5-mw-vendor.patch
new file mode 100644
index 0000000..54302ef
--- /dev/null
+++ b/dev-vcs/git/files/git-1.8.5-mw-vendor.patch
@@ -0,0 +1,39 @@
+diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
+index a4b6f7a..d83df2c 100644
+--- a/contrib/mw-to-git/Makefile
++++ b/contrib/mw-to-git/Makefile
+@@ -22,7 +22,7 @@ INSTALL = install
+
+ SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
+ INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
+- -s --no-print-directory instlibdir)
++ -s --no-print-directory instvendorlibdir)
+ DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
+ INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
+
+diff --git a/perl/Makefile b/perl/Makefile
+index 15d96fc..91348c6 100644
+--- a/perl/Makefile
++++ b/perl/Makefile
+@@ -12,7 +12,7 @@ ifndef V
+ QUIET = @
+ endif
+
+-all install instlibdir: $(makfile)
++all install instlibdir instvendorlibdir: $(makfile)
+ $(QUIET)$(MAKE) -f $(makfile) $@
+
+ clean:
+diff --git a/perl/Makefile.PL b/perl/Makefile.PL
+index 3f29ba9..c0b3508 100644
+--- a/perl/Makefile.PL
++++ b/perl/Makefile.PL
+@@ -17,6 +17,8 @@ sub MY::postamble {
+ return <<'MAKE_FRAG';
+ instlibdir:
+ @echo '$(INSTALLSITELIB)'
++instvendorlibdir:
++ @echo '$(INSTALLVENDORLIB)'
+
+ ifneq (,$(DESTDIR))
+ ifeq (0,$(shell expr '$(MM_VERSION)' '>' 6.10))
diff --git a/dev-vcs/git/git-1.8.5.2.ebuild b/dev-vcs/git/git-1.8.5.2.ebuild
index 0c54ae5..9232939 100644
--- a/dev-vcs/git/git-1.8.5.2.ebuild
+++ b/dev-vcs/git/git-1.8.5.2.ebuild
@@ -223,9 +223,13 @@ src_prepare() {
# bug #350330 - automagic CVS when we don't want it is bad.
epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch
- # honor and correctly quote DISTDIR (from git master)
+ # honor and correctly quote DISTDIR (from upstream git master)
epatch "${FILESDIR}"/git-1.8.5-mw-destdir.patch
+ # install mediawiki perl modules also in vendor_dir
+ # hack, needs better upstream solution
+ epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
sed -i \
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: dev-vcs/git/, dev-vcs/git/files/
@ 2014-01-05 0:44 Andreas Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Hüttel @ 2014-01-05 0:44 UTC (permalink / raw
To: gentoo-commits
commit: d410f234f58b7f1b9f106904fc8b3f5322b01633
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 5 00:45:30 2014 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jan 5 00:45:30 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=d410f234
[dev-vcs/git] moved to main tree
---
dev-vcs/git/Manifest | 3 -
dev-vcs/git/files/50git-gentoo.el | 13 -
dev-vcs/git/files/git-1.8.5-mw-destdir.patch | 37 --
dev-vcs/git/files/git-1.8.5-mw-vendor.patch | 39 --
dev-vcs/git/files/git-1.8.5-optional-cvs.patch | 362 --------------
dev-vcs/git/files/git-daemon.confd | 19 -
dev-vcs/git/files/git-daemon.initd | 30 --
dev-vcs/git/files/git-daemon.socket | 9 -
dev-vcs/git/files/git-daemon.xinetd | 13 -
dev-vcs/git/files/git-daemon_at.service | 13 -
dev-vcs/git/git-1.8.5.2-r1.ebuild | 639 -------------------------
dev-vcs/git/git-9999.ebuild | 618 ------------------------
dev-vcs/git/metadata.xml | 41 --
13 files changed, 1836 deletions(-)
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
deleted file mode 100644
index b8dc6e1..0000000
--- a/dev-vcs/git/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST git-1.8.5.2.tar.gz 4755707 SHA256 e986da24893197e33d835150c456708441e4a116a726ce9312a27f6de804f7b2 SHA512 73e408dd787b73a0f3935e37540d5da32a2f8d6d84af60d3ec7e224c3a953cc62eea749c7a689f8cca3b54e633f2520ed23d910ca5932021523e1fb750bf2c0a WHIRLPOOL d6623742cce0bdcb6b5334d363b44edeb6413e45fa42cb2bce013e07796dc98bd865b0d2c2578f2bd526140dceea25b19acbe212dc6afec7903c5dd6ea794d7f
-DIST git-htmldocs-1.8.5.2.tar.gz 2237867 SHA256 ba708ab1b5916960f61c22cf60eb6689ac62d1b6dbb6a460d98502815cdbff41 SHA512 824ab4cf879c0b3c1215f29f5dc3d18ae9bf15aad9deb7d81e81f8a57d500d304738c7e580f0fb5e3df2b6609d957b964938250a48145a3559b93ef1419eba2b WHIRLPOOL 962a2da1174ab401bdbafdca8cc9debd0fe927838b44bc8bbd0258a1da62cc32c10a6aa5a8a2bbf404fc257d0f4df981969ec3c2b9e898bcf3dc417d2f6517c6
-DIST git-manpages-1.8.5.2.tar.gz 569581 SHA256 2aef8c084ee795e544b6fb8715cccc1109efca1ca4b8db1588a2a5186ddb10c6 SHA512 1ca37aff4d5ca6d4daa6e8f2b3114a63ebdb0bd42382e1ed1ff9d01117da2fd8bd3a662b9beab318fdffd682039589c9b5f50ced67122e96b0a0ffd213a4112a WHIRLPOOL 257bd0549fb63e5ef31f3575731a5c90eead5da556480d929877704086dc03dadd924713480d9c3f8b5890912d54dd8be48d970abb9f7e86c55d8655642fbfb5
diff --git a/dev-vcs/git/files/50git-gentoo.el b/dev-vcs/git/files/50git-gentoo.el
deleted file mode 100644
index 1646a39..0000000
--- a/dev-vcs/git/files/50git-gentoo.el
+++ /dev/null
@@ -1,13 +0,0 @@
-
-;;; dev-vcs/git site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'git-status "git" "Entry point into git-status mode." t)
-;;(autoload 'git-blame-mode "git-blame"
-;; "Minor mode for incremental blame for Git." t)
-
-;; GNU Emacs >=22.2 already includes vc-git.el.
-;; Enable the following only if Emacs has no GIT support.
-(unless (fboundp 'vc-git-registered)
- (add-to-list 'load-path "@SITELISP@/compat")
- (add-to-list 'vc-handled-backends 'GIT))
diff --git a/dev-vcs/git/files/git-1.8.5-mw-destdir.patch b/dev-vcs/git/files/git-1.8.5-mw-destdir.patch
deleted file mode 100644
index ea4f175..0000000
--- a/dev-vcs/git/files/git-1.8.5-mw-destdir.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
-index f206f96..a4b6f7a 100644
---- a/contrib/mw-to-git/Makefile
-+++ b/contrib/mw-to-git/Makefile
-@@ -18,9 +18,13 @@ SCRIPT_PERL+=git-mw.perl
- GIT_ROOT_DIR=../..
- HERE=contrib/mw-to-git/
-
-+INSTALL = install
-+
- SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
- INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
- -s --no-print-directory instlibdir)
-+DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
-+INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
-
- all: build
-
-@@ -30,7 +34,9 @@ test: all
- check: perlcritic test
-
- install_pm:
-- install $(GIT_MEDIAWIKI_PM) $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
-+ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/Git'
-+ $(INSTALL) -m 644 $(GIT_MEDIAWIKI_PM) \
-+ '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/$(GIT_MEDIAWIKI_PM)'
-
- build:
- $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
-@@ -43,7 +49,6 @@ install: install_pm
- clean:
- $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
- clean-perl-script
-- rm $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM)
-
- perlcritic:
- perlcritic -5 $(SCRIPT_PERL)
diff --git a/dev-vcs/git/files/git-1.8.5-mw-vendor.patch b/dev-vcs/git/files/git-1.8.5-mw-vendor.patch
deleted file mode 100644
index 54302ef..0000000
--- a/dev-vcs/git/files/git-1.8.5-mw-vendor.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
-index a4b6f7a..d83df2c 100644
---- a/contrib/mw-to-git/Makefile
-+++ b/contrib/mw-to-git/Makefile
-@@ -22,7 +22,7 @@ INSTALL = install
-
- SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
- INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
-- -s --no-print-directory instlibdir)
-+ -s --no-print-directory instvendorlibdir)
- DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
- INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
-
-diff --git a/perl/Makefile b/perl/Makefile
-index 15d96fc..91348c6 100644
---- a/perl/Makefile
-+++ b/perl/Makefile
-@@ -12,7 +12,7 @@ ifndef V
- QUIET = @
- endif
-
--all install instlibdir: $(makfile)
-+all install instlibdir instvendorlibdir: $(makfile)
- $(QUIET)$(MAKE) -f $(makfile) $@
-
- clean:
-diff --git a/perl/Makefile.PL b/perl/Makefile.PL
-index 3f29ba9..c0b3508 100644
---- a/perl/Makefile.PL
-+++ b/perl/Makefile.PL
-@@ -17,6 +17,8 @@ sub MY::postamble {
- return <<'MAKE_FRAG';
- instlibdir:
- @echo '$(INSTALLSITELIB)'
-+instvendorlibdir:
-+ @echo '$(INSTALLVENDORLIB)'
-
- ifneq (,$(DESTDIR))
- ifeq (0,$(shell expr '$(MM_VERSION)' '>' 6.10))
diff --git a/dev-vcs/git/files/git-1.8.5-optional-cvs.patch b/dev-vcs/git/files/git-1.8.5-optional-cvs.patch
deleted file mode 100644
index aef03d8..0000000
--- a/dev-vcs/git/files/git-1.8.5-optional-cvs.patch
+++ /dev/null
@@ -1,362 +0,0 @@
-From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
-From: Robin Johnson <robbat2@gentoo.org>
-Date: Wed, 22 Aug 2012 04:25:06 +0000
-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
-
---- git-1.8.5.1/Makefile
-+++ git-1.8.5.1/Makefile
-@@ -263,6 +263,8 @@
- #
- # 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'.
-@@ -437,6 +439,7 @@
- PROGRAM_OBJS =
- PROGRAMS =
- SCRIPT_PERL =
-+SCRIPT_PERL_CVS =
- SCRIPT_PYTHON =
- SCRIPT_SH =
- SCRIPT_LIB =
-@@ -477,20 +480,21 @@
- 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
-
- 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))
-@@ -1779,8 +1783,18 @@
- $(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(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
-
-@@ -1792,7 +1806,7 @@
- perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
- $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
-
--$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
-+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE
- $(QUIET_GEN)$(RM) $@ $@+ && \
- INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
- sed -e '1{' \
-@@ -1817,14 +1831,17 @@
- 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|#!$(SHELL_PATH_SQ)|' \
- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
- unimplemented.sh >$@+ && \
- chmod +x $@+ && \
- mv $@+ $@
--endif # NO_PERL
-
- ifndef NO_PYTHON
- $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
---- git-1.8.5.1/t/t9200-git-cvsexportcommit.sh
-+++ git-1.8.5.1/t/t9200-git-cvsexportcommit.sh
-@@ -12,6 +12,11 @@
- 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
---- git-1.8.5.1/t/t9400-git-cvsserver-server.sh
-+++ git-1.8.5.1/t/t9400-git-cvsserver-server.sh
-@@ -11,9 +11,15 @@
- . ./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
---- git-1.8.5.1/t/t9401-git-cvsserver-crlf.sh
-+++ git-1.8.5.1/t/t9401-git-cvsserver-crlf.sh
-@@ -57,15 +57,20 @@
- 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 || {
---- git-1.8.5.1/t/t9600-cvsimport.sh
-+++ git-1.8.5.1/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 @@
- )
- '
-
--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 @@
- )
- '
-
--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 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_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 '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 '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_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 '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
---- git-1.8.5.1/t/t9601-cvsimport-vendor-branch.sh
-+++ git-1.8.5.1/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' '
---- git-1.8.5.1/t/t9602-cvsimport-branches-tags.sh
-+++ git-1.8.5.1/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' '
---- git-1.8.5.1/t/t9603-cvsimport-patchsets.sh
-+++ git-1.8.5.1/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' '
---- git-1.8.5.1/t/test-lib.sh
-+++ git-1.8.5.1/t/test-lib.sh
-@@ -772,6 +772,7 @@
- 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
diff --git a/dev-vcs/git/files/git-daemon.confd b/dev-vcs/git/files/git-daemon.confd
deleted file mode 100644
index db77de5..0000000
--- a/dev-vcs/git/files/git-daemon.confd
+++ /dev/null
@@ -1,19 +0,0 @@
-# conf.d file for git-daemon
-#
-# Please check man 1 git-daemon for more information about the options
-# git-daemon accepts. You MUST edit this to include your repositories you wish
-# to serve.
-#
-# Some of the meaningful options are:
-# --syslog --- Enables syslog logging
-# --verbose --- Enables verbose logging
-# --export-all --- Exports all repositories
-# --port=XXXX --- Starts in port XXXX instead of 9418
-#
-GITDAEMON_OPTS="--syslog --base-path=/var/git"
-
-# To run an anonymous git safely, the following user should be able to only
-# read your Git repositories. It should not able able to write to anywhere on
-# your system, esp. not the repositories.
-GIT_USER="nobody"
-GIT_GROUP="nobody"
diff --git a/dev-vcs/git/files/git-daemon.initd b/dev-vcs/git/files/git-daemon.initd
deleted file mode 100644
index c6ee19f..0000000
--- a/dev-vcs/git/files/git-daemon.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon.initd,v 1.1 2010/03/17 15:13:27 sping Exp $
-
-PIDFILE=/var/run/git-daemon.pid
-
-depend() {
- need net
- use logger
-}
-
-start() {
- [ -e /lib/librc.so ] || BL1_COMPAT="--name git-daemon"
- ebegin "Starting git-daemon"
- start-stop-daemon --start --quiet --background \
- --pidfile ${PIDFILE} ${BL1_COMPAT} \
- --exec /usr/bin/git -- daemon \
- --pid-file=${PIDFILE} \
- --user=${GIT_USER} --group=${GIT_GROUP} \
- ${GITDAEMON_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping git-daemon"
- start-stop-daemon --stop --quiet \
- --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/dev-vcs/git/files/git-daemon.socket b/dev-vcs/git/files/git-daemon.socket
deleted file mode 100644
index 3dec01d..0000000
--- a/dev-vcs/git/files/git-daemon.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Git Activation Socket
-
-[Socket]
-ListenStream=9418
-Accept=true
-
-[Install]
-WantedBy=sockets.target
diff --git a/dev-vcs/git/files/git-daemon.xinetd b/dev-vcs/git/files/git-daemon.xinetd
deleted file mode 100644
index 02c938d..0000000
--- a/dev-vcs/git/files/git-daemon.xinetd
+++ /dev/null
@@ -1,13 +0,0 @@
-service git-daemon
-{
- disable = yes
- socket_type = stream
- wait = no
- user = nobody
- type = UNLISTED
- protocol = tcp
- log_on_failure += USERID
- port = 9418
- server = /usr/bin/git
- server_args = daemon --inetd --syslog --export-all --base-path=/var/git
-}
diff --git a/dev-vcs/git/files/git-daemon_at.service b/dev-vcs/git/files/git-daemon_at.service
deleted file mode 100644
index 2a080d4..0000000
--- a/dev-vcs/git/files/git-daemon_at.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Git Repositories Server Daemon
-Documentation=man:git-daemon(1)
-
-[Service]
-User=nobody
-Group=nobody
-EnvironmentFile=/etc/conf.d/git-daemon
-# Ignore non-zero exit status, access error makes git-daemon return them
-ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose $GITDAEMON_OPTS
-StandardInput=socket
-StandardOutput=inherit
-StandardError=journal
diff --git a/dev-vcs/git/git-1.8.5.2-r1.ebuild b/dev-vcs/git/git-1.8.5.2-r1.ebuild
deleted file mode 100644
index 7605b79..0000000
--- a/dev-vcs/git/git-1.8.5.2-r1.ebuild
+++ /dev/null
@@ -1,639 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.2.ebuild,v 1.1 2013/12/18 12:19:16 polynomial-c Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_{6,7} )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
- SRC_URI_GOOG="http://git-core.googlecode.com/files"
- SRC_URI_KORG="mirror://kernel/software/scm/git"
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- doc? (
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- )"
- KEYWORDS="~amd64 ~x86"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- dev-libs/openssl
- sys-libs/zlib
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl:=[-build(-)] )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
-
-RDEPEND="${CDEPEND}
- gpg? ( app-crypt/gnupg )
- mediawiki? ( dev-perl/MediaWiki-API )
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- python? ( gtk?
- (
- >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
- >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
- )
- ${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- app-text/xmlto
- )
- test? (
- app-crypt/gnupg
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- cgi? ( perl )
- cvs? ( perl )
- mediawiki? ( perl )
- subversion? ( perl )
- webdav? ( curl )
- gtk? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
- if use subversion && has_version "dev-vcs/subversion[dso]"; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
- if use python ; then
- python-single-r1_pkg_setup
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- myopts="${myopts} NO_CURL=YesPlease"
- fi
-
- # broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
-
- # For svn-fe
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
- # can't define this to null, since the entire makefile depends on it
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
- use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
- use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
- use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes" \
- && extlibs="${extlibs} -lpcre"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
- use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
- use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
- || myopts="${myopts} NO_PTHREADS=YesPlease"
- use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
-# fi
- if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
- fi
- if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
- fi
- if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
- fi
-
- has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
- export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- else
- git-2_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch
-
- # honor and correctly quote DISTDIR (from upstream git master)
- epatch "${FILESDIR}"/git-1.8.5-mw-destdir.patch
-
- # install mediawiki perl modules also in vendor_dir
- # hack, needs better upstream solution
- epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
- sed -i \
- -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
- -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
- -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
- -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
- -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- Makefile contrib/svn-fe/Makefile || die "sed failed"
-
- # Never install the private copy of Error.pm (bug #296310)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # Fix git-subtree missing DESTDIR
- sed -i \
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
- contrib/subtree/Makefile
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- PYTHON_PATH=""
- use python && PYTHON_PATH="${PYTHON}"
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${PYTHON_PATH}" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- V=1 \
- "$@"
- # This is the fix for bug #326625, but it also causes breakage, see bug
- # #352693.
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- if use perl ; then
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
- git_emake perl/perl.mak || die "emake perl/perl.mak failed"
- fi
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- if [[ ${CHOST} == *-darwin* ]]; then
- cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
- git_emake || die "emake credential-osxkeychain"
- fi
-
- cd "${S}"/Documentation
- if [[ ${PV} == *9999 ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
- if use doc ; then
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
- fi
- cd "${S}"
- fi
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- git_emake || die "emake git-credential-gnome-keyring failed"
- fi
-
- cd "${S}"/contrib/subtree
- git_emake
- use doc && git_emake doc
-
- if use mediawiki ; then
- cd "${S}"/contrib/mw-to-git
- git_emake
- fi
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain
- fi
-
- # Depending on the tarball and manual rebuild of the documentation, the
- # manpages may exist in either OR both of these directories.
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
- use doc && dodir /usr/share/doc/${PF}/html
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- newbashcomp contrib/completion/git-completion.bash ${PN}
- newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc}
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
- # don't add automatically to the load-path, so the sitefile
- # can do a conditional loading
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
- fi
-
- if use python && use gtk ; then
- python_doscript "${S}"/contrib/gitview/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- #dobin contrib/fast-import/git-p4 # Moved upstream
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream
- newbin contrib/fast-import/import-tars.perl import-tars
- exeinto /usr/libexec/git-core/
- newexe contrib/git-resurrect.sh git-resurrect
-
- # git-subtree
- cd "${S}"/contrib/subtree
- git_emake install || die "Failed to emake install git-subtree"
- if use doc ; then
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
- fi
- newdoc README README.git-subtree
- dodoc git-subtree.txt
- cd "${S}"
-
- if use mediawiki ; then
- cd "${S}"/contrib/mw-to-git
- git_emake install
- cd "${S}"
- fi
-
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
- # diff-highlight
- dobin contrib/diff-highlight/diff-highlight
- newdoc contrib/diff-highlight/README README.diff-highlight
-
- # git-jump
- exeinto /usr/libexec/git-core/
- doexe contrib/git-jump/git-jump
- newdoc contrib/git-jump/README git-jump.txt
-
- # git-contacts
- exeinto /usr/libexec/git-core/
- doexe contrib/contacts/git-contacts
- dodoc contrib/contacts/git-contacts.txt
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- dobin git-credential-gnome-keyring
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- dobin svn-fe
- dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
- cd "${S}"
- fi
-
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # credential/gnome-keyring TODO
- # diff-highlight - done above
- # diffall - done above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # git-jump - done above
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # persistent-https - TODO
- # mw-to-git - TODO
- # subtree - build seperately
- # svnimport - use git-svn
- # thunderbird-patch-inline - fixes thunderbird
- for i in \
- buildsystems convert-objects fast-import \
- hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
- ; do
- cp -rf \
- "${S}"/contrib/${i} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${ED}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- if use !prefix ; then
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
- systemd_dounit "${FILESDIR}/git-daemon.socket"
- fi
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9402-git-cvsserver-refs.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh \
- t9604-cvsimport-timestamps.sh"
- local tests_perl="t3701-add-interactive.sh \
- t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh \
- t7106-reset-unborn-branch.sh \
- t7501-commit.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t0070-fundamental.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
- # t9100 still fails with symlinks in SVN 1.7
- local test_svn="t9100-git-svn-basic.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- has_version "dev-vcs/cvs[server]" && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- einfo "Disabling tests that fail with SVN 1.7"
- disabled="${disabled} ${test_svn}"
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first, must always run
- cd "${S}/t"
- nonfatal git_emake clean
-
- # Now run the tests, keep going if we hit an error, and don't terminate on
- # failure
- cd "${S}"
- einfo "Start test run"
- #MAKEOPTS=-j1
- nonfatal git_emake --keep-going test
- rc=$?
-
- # Display nice results, now print the results
- cd "${S}/t"
- nonfatal git_emake aggregate-results
-
- # And bail if there was a problem
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
- einfo "Note that the prompt bash code is now in the seperate script"
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
deleted file mode 100644
index 4d4ee50..0000000
--- a/dev-vcs/git/git-9999.ebuild
+++ /dev/null
@@ -1,618 +0,0 @@
-# Copyright 1999-2013 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.50 2013/12/11 10:27:22 polynomial-c Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_{6,7} )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="gz"
- SRC_URI_GOOG="http://git-core.googlecode.com/files"
- SRC_URI_KORG="mirror://kernel/software/scm/git"
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- doc? (
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- )"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
- SRC_URI=""
- KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- dev-libs/openssl
- sys-libs/zlib
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl[-build(-)] )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/gnome-keyring )"
-
-RDEPEND="${CDEPEND}
- gpg? ( app-crypt/gnupg )
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
- cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- python? ( gtk?
- (
- >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
- >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
- )
- ${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- app-arch/cpio
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- app-text/xmlto
- )
- test? (
- app-crypt/gnupg
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- cgi? ( perl )
- cvs? ( perl )
- subversion? ( perl )
- webdav? ( curl )
- gtk? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
- if use subversion && has_version "dev-vcs/subversion[dso]"; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
- if use python ; then
- python-single-r1_pkg_setup
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts="${myopts} BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts="${myopts} PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
- else
- myopts="${myopts} NO_CURL=YesPlease"
- fi
-
- # broken assumptions, because of broken build system ...
- myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts="${myopts} INSTALL=install TAR=tar"
- myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
- myopts="${myopts} SANE_TOOL_PATH="
- myopts="${myopts} OLD_ICONV="
- myopts="${myopts} NO_EXTERNAL_GREP="
-
- # For svn-fe
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
- # can't define this to null, since the entire makefile depends on it
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
- use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
- use nls \
- || myopts="${myopts} NO_GETTEXT=YesPlease"
- use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use pcre \
- && myopts="${myopts} USE_LIBPCRE=yes" \
- && extlibs="${extlibs} -lpcre"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor" \
- || myopts="${myopts} NO_PERL=YesPlease"
- use python \
- || myopts="${myopts} NO_PYTHON=YesPlease"
- use subversion \
- || myopts="${myopts} NO_SVN_TESTS=YesPlease"
- use threads \
- && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
- || myopts="${myopts} NO_PTHREADS=YesPlease"
- use cvs \
- || myopts="${myopts} NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts="${myopts} NO_MMAP=YesPlease"
-# myopts="${myopts} NO_IPV6=YesPlease"
-# myopts="${myopts} NO_STRLCPY=YesPlease"
-# myopts="${myopts} NO_MEMMEM=YesPlease"
-# myopts="${myopts} NO_MKDTEMP=YesPlease"
-# myopts="${myopts} NO_MKSTEMPS=YesPlease"
-# fi
- if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts="${myopts} NO_NSEC=YesPlease"
- fi
- if [[ ${CHOST} == *-*-aix* ]]; then
- myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
- fi
- if [[ ${CHOST} == *-solaris* ]]; then
- myopts="${myopts} NEEDS_LIBICONV=YesPlease"
- fi
-
- has_version '>=app-text/asciidoc-8.0' \
- && myopts="${myopts} ASCIIDOC8=YesPlease"
- myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts="${myopts} NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
- export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- else
- git-2_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch
-
- sed -i \
- -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
- -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
- -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
- -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
- -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- Makefile contrib/svn-fe/Makefile || die "sed failed"
-
- # Never install the private copy of Error.pm (bug #296310)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # Fix git-subtree missing DESTDIR
- sed -i \
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
- contrib/subtree/Makefile
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- PYTHON_PATH=""
- use python && PYTHON_PATH="${PYTHON}"
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${PYTHON_PATH}" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- V=1 \
- "$@"
- # This is the fix for bug #326625, but it also causes breakage, see bug
- # #352693.
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- if use perl ; then
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
- git_emake perl/perl.mak || die "emake perl/perl.mak failed"
- fi
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb/gitweb.cgi \
- || die "emake gitweb/gitweb.cgi failed"
- fi
-
- if [[ ${CHOST} == *-darwin* ]]; then
- cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
- git_emake || die "emake credential-osxkeychain"
- fi
-
- cd "${S}"/Documentation
- if [[ ${PV} == *9999 ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
- if use doc ; then
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
- fi
- cd "${S}"
- fi
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- git_emake || die "emake git-credential-gnome-keyring failed"
- fi
-
- cd "${S}"/contrib/subtree
- git_emake
- use doc && git_emake doc
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain
- fi
-
- # Depending on the tarball and manual rebuild of the documentation, the
- # manpages may exist in either OR both of these directories.
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
- dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
- use doc && dodir /usr/share/doc/${PF}/html
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- use doc && dohtml -p ${d} Documentation${d}*.html
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- newbashcomp contrib/completion/git-completion.bash ${PN}
- newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc}
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
- # don't add automatically to the load-path, so the sitefile
- # can do a conditional loading
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
- fi
-
- if use python && use gtk ; then
- python_doscript "${S}"/contrib/gitview/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- #dobin contrib/fast-import/git-p4 # Moved upstream
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream
- newbin contrib/fast-import/import-tars.perl import-tars
- exeinto /usr/libexec/git-core/
- newexe contrib/git-resurrect.sh git-resurrect
-
- # git-subtree
- cd "${S}"/contrib/subtree
- git_emake install || die "Failed to emake install git-subtree"
- if use doc ; then
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
- fi
- newdoc README README.git-subtree
- dodoc git-subtree.txt
- cd "${S}"
-
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
- # diff-highlight
- dobin contrib/diff-highlight/diff-highlight
- newdoc contrib/diff-highlight/README README.diff-highlight
-
- # git-jump
- exeinto /usr/libexec/git-core/
- doexe contrib/git-jump/git-jump
- newdoc contrib/git-jump/README git-jump.txt
-
- # git-contacts
- exeinto /usr/libexec/git-core/
- doexe contrib/contacts/git-contacts
- dodoc contrib/contacts/git-contacts.txt
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- dobin git-credential-gnome-keyring
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- dobin svn-fe
- dodoc svn-fe.txt
- use doc && doman svn-fe.1 && dohtml svn-fe.html
- cd "${S}"
- fi
-
- # remote-helpers
- if use python ; then
- python_scriptinto /usr/libexec/git-core/
- python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
- python_optimize
- fi
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # credential/gnome-keyring TODO
- # diff-highlight - done above
- # diffall - done above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # git-jump - done above
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # persistent-https - TODO
- # mw-to-git - TODO
- # subtree - build seperately
- # svnimport - use git-svn
- # thunderbird-patch-inline - fixes thunderbird
- for i in \
- buildsystems convert-objects fast-import \
- hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
- ; do
- cp -rf \
- "${S}"/contrib/${i} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${ED}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- if use !prefix ; then
- newinitd "${FILESDIR}"/git-daemon.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
- systemd_dounit "${FILESDIR}/git-daemon.socket"
- fi
-
- fixlocalpod
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh \
- t9604-cvsimport-timestamps.sh"
- local tests_perl="t3701-add-interactive.sh \
- t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh \
- t7106-reset-unborn-branch.sh \
- t7501-commit.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t0070-fundamental.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
- # t9100 still fails with symlinks in SVN 1.7
- local test_svn="t9100-git-svn-basic.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- has_version "dev-vcs/cvs[server]" && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- einfo "Disabling tests that fail with SVN 1.7"
- disabled="${disabled} ${test_svn}"
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first, must always run
- cd "${S}/t"
- nonfatal git_emake clean
-
- # Now run the tests, keep going if we hit an error, and don't terminate on
- # failure
- cd "${S}"
- einfo "Start test run"
- #MAKEOPTS=-j1
- nonfatal git_emake --keep-going test
- rc=$?
-
- # Display nice results, now print the results
- cd "${S}/t"
- nonfatal git_emake aggregate-results
-
- # And bail if there was a problem
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
- einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt"
- einfo "Note that the prompt bash code is now in the seperate script"
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache )"
- echo
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml
deleted file mode 100644
index 6f4d4ee..0000000
--- a/dev-vcs/git/metadata.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>robbat2@gentoo.org</email>
- <name>Robin H. Johnson</name>
- </maintainer>
- <maintainer>
- <email>prometheanfire@gentoo.org</email>
- </maintainer>
- <maintainer>
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
- <longdescription lang="en">
- Git - Fast Version Control System. Official titled
- "GIT - the stupid content tracker".
-
- Git is a popular version control system designed to handle very large
- projects with speed and efficiency; it is used mainly for various open
- source projects, most notably the Linux kernel.
-
- Git falls in the category of distributed source code management tools,
- similar to e.g. GNU Arch or Monotone (or BitKeeper in the proprietary
- world). Every Git working directory is a full-fledged repository with full
- revision tracking capabilities, not dependent on network access or a central
- server.
- </longdescription>
- <use>
- <flag name="blksha1">Use the new optimized SHA1 implementation</flag>
- <flag name="cgi">Install gitweb too</flag>
- <flag name="curl">Support fetching and pushing (requires webdav too) over http:// and https:// protocols</flag>
- <flag name="gpg">Pull in gnupg for signing -- without gnupg, attempts at signing will fail at runtime!</flag>
- <flag name="gtk">Include the gitview contrib tool</flag>
- <flag name="highlight">GitWeb support for app-text/highlight</flag>
- <flag name="mediawiki">Support pulling and pushing from MediaWiki</flag>
- <flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag>
- <flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag>
- <flag name="webdav">Adds support for push'ing to HTTP/HTTPS repositories via DAV</flag>
- </use>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-01-05 0:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-05 0:44 [gentoo-commits] dev/dilfridge:master commit in: dev-vcs/git/, dev-vcs/git/files/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2014-01-04 21:20 Andreas Hüttel
2014-01-04 20:28 Andreas Hüttel
2014-01-04 19:55 Andreas Hüttel
2014-01-04 19:55 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox