dev-util/git: Remove (renamed to dev-vcs/git)
authorSebastian Pipping <sping@gentoo.org>
Wed, 17 Mar 2010 17:40:13 +0000 (17:40 +0000)
committerSebastian Pipping <sping@gentoo.org>
Wed, 17 Mar 2010 17:40:13 +0000 (17:40 +0000)
40 files changed:
dev-util/git/ChangeLog [deleted file]
dev-util/git/Manifest [deleted file]
dev-util/git/files/50git-gentoo.el [deleted file]
dev-util/git/files/git-1.6.6-always-install-js.patch [deleted file]
dev-util/git/files/git-1.7.0-always-install-js.patch [deleted file]
dev-util/git/files/git-daemon.confd [deleted file]
dev-util/git/files/git-daemon.initd [deleted file]
dev-util/git/files/git-daemon.xinetd [deleted file]
dev-util/git/git-1.6.3.1.ebuild [deleted file]
dev-util/git/git-1.6.3.3.ebuild [deleted file]
dev-util/git/git-1.6.3.4.ebuild [deleted file]
dev-util/git/git-1.6.4.1.ebuild [deleted file]
dev-util/git/git-1.6.4.2.ebuild [deleted file]
dev-util/git/git-1.6.4.3.ebuild [deleted file]
dev-util/git/git-1.6.4.4.ebuild [deleted file]
dev-util/git/git-1.6.4.ebuild [deleted file]
dev-util/git/git-1.6.5.1-r1.ebuild [deleted file]
dev-util/git/git-1.6.5.1.ebuild [deleted file]
dev-util/git/git-1.6.5.2.ebuild [deleted file]
dev-util/git/git-1.6.5.3.ebuild [deleted file]
dev-util/git/git-1.6.5.4.ebuild [deleted file]
dev-util/git/git-1.6.5.5.ebuild [deleted file]
dev-util/git/git-1.6.5.6.ebuild [deleted file]
dev-util/git/git-1.6.5.7.ebuild [deleted file]
dev-util/git/git-1.6.5.8.ebuild [deleted file]
dev-util/git/git-1.6.5.ebuild [deleted file]
dev-util/git/git-1.6.5_rc1.ebuild [deleted file]
dev-util/git/git-1.6.5_rc2.ebuild [deleted file]
dev-util/git/git-1.6.6-r1.ebuild [deleted file]
dev-util/git/git-1.6.6-r2.ebuild [deleted file]
dev-util/git/git-1.6.6.1.ebuild [deleted file]
dev-util/git/git-1.6.6.2.ebuild [deleted file]
dev-util/git/git-1.6.6.ebuild [deleted file]
dev-util/git/git-1.6.6_rc3.ebuild [deleted file]
dev-util/git/git-1.6.6_rc4.ebuild [deleted file]
dev-util/git/git-1.7.0.2.ebuild [deleted file]
dev-util/git/git-1.7.0.ebuild [deleted file]
dev-util/git/git-9999.ebuild [deleted file]
dev-util/git/metadata.xml [deleted file]
dev-util/kdevelop/Manifest

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
deleted file mode 100644 (file)
index fd194c4..0000000
+++ /dev/null
@@ -1,1842 +0,0 @@
-# ChangeLog for dev-util/git
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.398 2010/03/07 23:21:25 robbat2 Exp $
-
-*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-util/git/Manifest b/dev-util/git/Manifest
deleted file mode 100644 (file)
index 0c18430..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-AUX 50git-gentoo.el 473 RMD160 3ae4696cc90d35bf2a1dca17cfe2fda78c0025e4 SHA1 7b67b759e6c3fc27552b211a6a48f3e4e2018c24 SHA256 c32f14d036e5ccb5c4583621dc10903346ab810ee838457e2de6e53d883348c0
-AUX git-1.6.6-always-install-js.patch 1300 RMD160 7a288526624acb0748e4c917a56d662439cc28db SHA1 8bac9d1ecafd14f0dc7cf3564a9b6c53e32726b1 SHA256 019e5dbf6d0c3e57056b038db2ac1d7e501258e02ae5dacb6360a1e639ed4b67
-AUX git-1.7.0-always-install-js.patch 1304 RMD160 e4d110d7bd86a50f928cdf5fa1e3513aebbb0dab SHA1 9324fe19cb85709b2a198ba853866a99d6088f64 SHA256 5cb12dd43e114d07ea4ab6cd04f386cdc0c6e9a998529943be2da3308e1d1509
-AUX git-daemon.confd 700 RMD160 2dea5af0c6b3aa5304aa5417bb40099bd4cdb45b SHA1 0b7c3078c4d284eb2572a5fb7c1efff5a4837f6e SHA256 9ca387e81ca875d4e543fa64398620451ff74273fa06b122a6af47db1fee1630
-AUX git-daemon.initd 741 RMD160 83ab8615b51c521ac0b961b42de7a7955f81147f SHA1 1dacace343cb952cab793cf46be110969473f84b SHA256 16a684cc66377e2840d09dd8cc39ed4cb13ce4807e22039f8bc176dff030ddec
-AUX git-daemon.xinetd 260 RMD160 5bfeca2541488bb955ca349474c1fa3e80913aef SHA1 88d6fc44644c88ed6f2ce54a936f41dc15d2268e SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67
-DIST git-1.6.3.1.tar.bz2 2056716 RMD160 711afae08753095c612670590d808de38de6d03c SHA1 1b6f6da17663b1031c723e516789aa9310f3ac71 SHA256 2ef617165f9af704b4948d0bd72a3055ade47eb8a5cf7a6caae8be0960646453
-DIST git-1.6.3.3.tar.bz2 2061691 RMD160 802ab3a44c27084ed199c77d0f8710da7a5793ec SHA1 200b49304696357ccf7a4837307348d681b7e04d SHA256 f94bc0d1fc861a12c7fb821b27a4e6a80901e84432cdb7894cb7a437d4c939ad
-DIST git-1.6.3.4.tar.bz2 2062592 RMD160 e6d77dc918664274fb495efdea709592edd2b7d0 SHA1 76d148e1b7137e9c8ce29bdaf2ba7de0f1a9a616 SHA256 a84ca6033674e185653eb72876767e9cb384f008cfb845f477d61a900d888eef
-DIST git-1.6.4.1.tar.bz2 2170221 RMD160 5579bb95aa5c09163a026b3c9dd3f13b9042f7f2 SHA1 1b1378d2a457d9bbccca92d7adb78a4afa5157c5 SHA256 cb38005bfea43dd647e371ff4ea9ceae43335bb8aec3358ecb789327ffad7f36
-DIST git-1.6.4.2.tar.bz2 2173527 RMD160 aa34a890652e7795bd50eb8c577f5baf1718bf74 SHA1 75f8cda28a981f80c96710c18525f7adc42a8bc8 SHA256 ad8f8fcff37db52031ab9b190fab6a910c59d83ca7322d3f92a8aeabf6029135
-DIST git-1.6.4.3.tar.bz2 2172892 RMD160 4cb8708336e4e7cdf855ade5621a99ae7363fd30 SHA1 961ae8028609dfa95daf80fe33d24cf342f03454 SHA256 36db53f6d8d656c94fbfacc555e8d550a2381414585e6f7f6da0662dc717c138
-DIST git-1.6.4.4.tar.bz2 2174826 RMD160 8bad28bf8aedc6d5a9dcae39736c1ceeabbbe992 SHA1 da66a6323cc0842b19e3dbc5bb8ee5a59975037f SHA256 fc7e4d6c4172c62c93d5e974019f7193b03c8bc0a1c6f3a9fcc1d0928b808d7a
-DIST git-1.6.4.tar.bz2 2166226 RMD160 fc4dca08c69d23f3211306593ee689e4bb52303c SHA1 e6dd6b1fe937aa14866ce7d8672a50fb1956c41b SHA256 31d1346211df985288a21426bc3e820be817ead589ae32c7e545854480bc8185
-DIST git-1.6.5.1.tar.bz2 2243592 RMD160 471d05a0534948b15ea9d329a8b9ea53e9537bba SHA1 c955aa579be9bf5991adf465e6e4a2d6ba173fc1 SHA256 d78e2c6a55a250f8b57660a2a569df14dc24c9bb338bd2c1e50f3bee227ad9fd
-DIST git-1.6.5.2.tar.bz2 2244529 RMD160 b47eff794d5953263ce9d053c41e227035a96e5d SHA1 d31d3054a595e811069b86ceeac56760cae4a835 SHA256 a7050b45a4c5a2b40db83dc67dc3ff4b422ef1864df72316b3221ead2eefb5c1
-DIST git-1.6.5.3.tar.bz2 2247507 RMD160 270a4b70ca4ad8709dc0a3b653324c9cfadbb12c SHA1 f3b6e26e8fbf1c13a623cd80a663cae502f0cd8b SHA256 3822c8350be782f28a7a60138ec65a6f04f259940f84f7062e508d9f9d64eefa
-DIST git-1.6.5.4.tar.bz2 2248240 RMD160 dd32eab5d5acfc47e7c73df01043fba19ee956fc SHA1 615c2dee5ff56267450769c8b28cb602ebff5bb2 SHA256 e5548c4a4ddefbdb3e4a846061861c51b2498f7453606e03fa67f6ae1dc1dace
-DIST git-1.6.5.5.tar.bz2 2251115 RMD160 8b40fa2fd69367b36644dd931ffe983305a2c3ed SHA1 3480315deed7ab8b495032a7a06257491f520f53 SHA256 4d1aaf16b4c37c8412cceab09b009bfc0f8d7b9f30a809b82027ab7fa66fdbb3
-DIST git-1.6.5.6.tar.bz2 2250242 RMD160 85af6820d9173fe5a7481fdcdae460bbab1494d3 SHA1 1f09b5170fe906eafe0471dcb9ec9088bddd7653 SHA256 8e6261fc2fe162b0f1f5f0ad7aa42f8922491b9a1c43b3a1e9e6a7d049f2f106
-DIST git-1.6.5.7.tar.bz2 2250714 RMD160 83865a2ebef8fcc227fe18e621c1bb5bed03c0c9 SHA1 05f2dd3004d4e881d2ccbf528497204726fc6e9f SHA256 9477787040588167722679072567990d0982055afa832fe72b8cdc47b52e4346
-DIST git-1.6.5.8.tar.bz2 2251068 RMD160 50892e72ff4c04a9590266fe167d2b0dbffc4214 SHA1 e031ec8f07a40e256abf5f9ae70e98858e23bb7b SHA256 71e77b1d655645998c8efa5b62fca46e7d74dcfbccf704570e390dc4960baafc
-DIST git-1.6.5.rc1.tar.bz2 2225429 RMD160 80cda7add591c17ea6dab30818dbfc05486a7042 SHA1 6d8494a03c50358568992330015d479d396d72cf SHA256 46d22872f2fe1a9ee1af20f696d004d2f2f996212fee53d520435d5f199ef526
-DIST git-1.6.5.rc2.tar.bz2 2241993 RMD160 46b28f510de12fc3b88b57b1733e083c8e34d3fa SHA1 329d272d87afd5c4ec60ced27b4383e1e7e654f8 SHA256 5cca711f12ccb0d0535c5a2028fc796b188cb735dfbdf5f0a9610a20f0bd4034
-DIST git-1.6.5.tar.bz2 2243169 RMD160 70671e2b98d45dc0858691b3d163fb948fb7dfe6 SHA1 8047b6ea66bd0651c4f103febcba8eedfc034677 SHA256 377962fe1176a36030ca450d801fe745adc88a69bbba69d76d48e141d0147f92
-DIST git-1.6.6.1.tar.bz2 2331778 RMD160 50c38a5790367ed66eacd1741b651d7fddaa1a2d SHA1 6941f1b675ea2047286437c834e6272175102c19 SHA256 79c3049913a11b966b92406ec3ef6c7c5eb680cfa2a8b0c1abb167b1bfaf9769
-DIST git-1.6.6.2.tar.bz2 2336377 RMD160 661e1c2b1f91c5ab62f8107a975534c87d89dc7d SHA1 fb4e44ef73791f16a14c1f7bdb3b1215e25e05ae SHA256 4b81aba89336e0639ad28985e605a563a30bfbf8492e52b220952adf708f8a07
-DIST git-1.6.6.rc3.tar.bz2 2325545 RMD160 ca5a780f70175469ed21fad5a91753e677ffd37f SHA1 10c50d29fbf63e6959d81ae27bf89b95b78eaaf8 SHA256 6f237057745a61de2050a7775f6c2d7b16534e7c4a2d46c282167826609b6967
-DIST git-1.6.6.rc4.tar.bz2 2326566 RMD160 820e8b592ea09b84c4a3ffce5c867a87f53f532c SHA1 b13d9dff668ecd86d3aa14129e5ac4cdc31fb38d SHA256 8a79ad53bba052ef4822132a01cdb21c32ec1a9409da47f9d5dbbb78dcd032d8
-DIST git-1.6.6.tar.bz2 2328343 RMD160 59d96548ef54f117892d6c602973bd0decf155b4 SHA1 21d83108c618d0f90a166b7ce403c9d1166a0d95 SHA256 c3f7a384f7f8618ec1c2a732c8c0a94accf00214602beea34fbb39566041c19c
-DIST git-1.7.0.2.tar.bz2 2435028 RMD160 744531d370eefebe8c55d0160ba4ab32c390a2d6 SHA1 82ec53af5950b3c70f8e3c54b347ac476e3c1d51 SHA256 5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f
-DIST git-1.7.0.tar.bz2 2430104 RMD160 5f37b556845dba23cc3e604e9b503b4ef0a9d3f7 SHA1 c0b536735a7f593877d61f5a8af72bdad0193d97 SHA256 a61e863944381c4f8231841f678f41f56b634bebca486a61005b35e5bcbb7c79
-DIST git-htmldocs-1.6.3.1.tar.bz2 741913 RMD160 279b298feed72e0c0712c54061f5cbed3b9eb279 SHA1 4a6e77f7171b16878aa71765a3f947432e669214 SHA256 6376efa888075de5b319c1ebade8516b2fb0edea675cc7172dcbf139324800a1
-DIST git-htmldocs-1.6.3.3.tar.bz2 742321 RMD160 0ea1318aa4a1259bb00c45b03a84cd09f07114f4 SHA1 f6d5bec24edfd27bf91f0f0cc13cfcfd7ecd045f SHA256 b387dbbe281adbfe6aafb949b94970f753f2658220e998a8dd5258b8980443d4
-DIST git-htmldocs-1.6.3.4.tar.bz2 743064 RMD160 758777b01f19553e69630dfd6583fdc2c91a9463 SHA1 b36232082254515484e952caad75b8de8bb825b0 SHA256 af5cf3b339c447c1221ca5bf75f1707ad713f8b463ba8e9d71abc5aa3a1a1d6b
-DIST git-htmldocs-1.6.4.1.tar.bz2 756031 RMD160 68d1360e6ca943c0a77920aaeb1df64c267b4f8c SHA1 834a5d119426b72c510a8a45ed98d283a8876be1 SHA256 595f080a21b47e083f4009938c1fbe66903da749689dfc9f1ac0fd90970cec47
-DIST git-htmldocs-1.6.4.2.tar.bz2 757661 RMD160 f8ae01c621e3d75e589540ad6591978327d7ff65 SHA1 80b38911b877193e66bff900a330934bcff97a74 SHA256 4c41f1e1777c05a1a45e51ef1c9b76a9f4ce580543a24a8cb631edd1094b662b
-DIST git-htmldocs-1.6.4.3.tar.bz2 755709 RMD160 2eb320622866de390caa1185eeea115a0a47112f SHA1 d05931858698f9429c6db5ad770dc8704949698a SHA256 01acea1702875e86214ff2fdd4a5257965a40b5ae666f7a54fa3ad347609d86a
-DIST git-htmldocs-1.6.4.4.tar.bz2 756995 RMD160 a6d376213cfd442c046e8cce22c496e18c267ce9 SHA1 63a4e5d23f58bb76bba4630d176eca827f5273c0 SHA256 9adedf1d90fd2d9485a00d75c8c63bd6174c54faf1b99cedc5d8230a8f73d8c2
-DIST git-htmldocs-1.6.4.tar.bz2 753185 RMD160 dfb3edc5b5be7d7931721e7837e5d72a9a38a6cd SHA1 cf162b278a39fbe78c90f015ba3749d99b8ab7db SHA256 70a83b82d1900e4ca80608388a87b3aa9e066f9a29cef487db1c29de645e06b9
-DIST git-htmldocs-1.6.5.1.tar.bz2 775874 RMD160 2327c9da7e11068a415764921d10189506b959d1 SHA1 34ff79cb18f48aa062996e82d3fa2e3547b096c4 SHA256 cef6b4ca58512854628f9b07dc1c3c21c4f6c4e90ee3f4902b34f9b3d2105703
-DIST git-htmldocs-1.6.5.2.tar.bz2 775932 RMD160 66ecbc9def453db546c2d34d19b348740cfa3c29 SHA1 8c315490882641d0b001bb06822c232cb0f1d397 SHA256 693293e66111765af5b49ca80ac26b5a53d4831ab4853250affcd87324a89882
-DIST git-htmldocs-1.6.5.3.tar.bz2 778449 RMD160 481c4f42f089614aebff03defa303c9b7c0d900f SHA1 68efc2f409c8df8a2438cd300c0099c3b6cefff0 SHA256 0ffd4f13e34b0c96b0660af45012a8f02ac59300840b5736ff9f612172f42401
-DIST git-htmldocs-1.6.5.4.tar.bz2 780469 RMD160 c280b4d139dd237dbdad10d393ba62e8bbce1b4d SHA1 cc671ddae12d6069ad2ba61c756b1a4f6cf38115 SHA256 57f1f671ab39c80768cb1c2bd9780fa30f7d8b6f4a55d83bb6fa9fdd58f64630
-DIST git-htmldocs-1.6.5.5.tar.bz2 784103 RMD160 858953350d038fa871b340ef14887478171b5cd2 SHA1 e4ee4723010ead023b5db22d6d2a1a56d16a0864 SHA256 9c664e86f802ac78635d1c416d64e9f01862c4089692d928ebef4bee4c18662c
-DIST git-htmldocs-1.6.5.6.tar.bz2 783935 RMD160 1bd69da1ed5f7d32d358631700da2715a31e33c6 SHA1 a7642cd63ce5bbb8340095d65d57342c311c7a2f SHA256 c968f60dba6517d2f741cad26dcc52f8e3cf4bb264e115e5aa4b775a9881d93a
-DIST git-htmldocs-1.6.5.7.tar.bz2 784296 RMD160 412de996916034c5d5c59eaffb45b542f708381b SHA1 343791188b6332f17978ffc0fb5c1549ac38231d SHA256 b51790452d0c016e8cf93d43c5113b0565397eb03943d8b18bf420fe5977ed8b
-DIST git-htmldocs-1.6.5.8.tar.bz2 785781 RMD160 b43c68620f629154ff9207e80cdd5d9b6c5a35ac SHA1 708ed85fc819d35f8f237299d468c2123148c4ed SHA256 dcd919d44f4f1d30069a47e2f5e2d009a32afb61c500c0ad40748d09c4315eea
-DIST git-htmldocs-1.6.5.rc1.tar.bz2 774249 RMD160 f9c319d80e0eba8bc4f2fc70123089ac6e515698 SHA1 a766e7807eb67ba49de09e2e6388b49f2e921ed2 SHA256 40df0c92a83214797c38fefab0895204d6e33e6c38948d85b0bcbd4ca770e2d0
-DIST git-htmldocs-1.6.5.rc2.tar.bz2 775350 RMD160 95c41c3688e63a688ac7620e94e776438c8117c0 SHA1 4382f3ab4a92eab4aa9df5e24490bc34613c1ac6 SHA256 f6419fb705145bff92fb2a9242dfa5f4f375d9726c390e5f5faf896bdb96aa1e
-DIST git-htmldocs-1.6.5.tar.bz2 776027 RMD160 1d066dea548373ef61eaed281aae5597b487c56e SHA1 f80ebd5d54b934fa6bab99a306fba1c8d33351ca SHA256 4a92484dc73b7cd1e29ee763ad06af902e13b4de16ef8f82cdf6b7c588c46b02
-DIST git-htmldocs-1.6.6.1.tar.bz2 848476 RMD160 892d02428f72e2d133c2b3f10c0d870701439b6c SHA1 e4bdd13fca2aa47d70c4c0645d0aae9b1c16c72f SHA256 06378bbad53b04eb22c0c62400f0bc723d692611c126228b914a8888c8a63e54
-DIST git-htmldocs-1.6.6.2.tar.bz2 848818 RMD160 a824bc07dad28c669668d8ab4a7f1a627a9eed00 SHA1 7e7ba54fad3722c005d2da008d1405d3f42dd52b SHA256 f1341b4f78591996be0f2c79943652d6527f50b456c0064271a070bd463a949c
-DIST git-htmldocs-1.6.6.rc3.tar.bz2 846535 RMD160 a8a8e3dc712cd59e6712821d58b9d852ad9d9c39 SHA1 04c17f269524fa19415886283faac1b81840c202 SHA256 4f6ddc4a329a150a9525e61d948339fbd67ac8f5f2ac017a40b52164cee739b6
-DIST git-htmldocs-1.6.6.rc4.tar.bz2 847454 RMD160 4a14752e3fced6e389387a66c5927b35664aae7c SHA1 c2b8e44bdc4de0a7e064da9303e05f0963fae46b SHA256 17721212bff450f795c359fddf58e45924be6db0f7f48edc494cfe63ad9c7ee3
-DIST git-htmldocs-1.6.6.tar.bz2 847046 RMD160 4f21ac2d123579970c3f46d9b87aae96c319e230 SHA1 8313c14989d63317d0d6866a0aad68db5abb194b SHA256 35ed4ffef3231e0641ee6042952ffb55e108af098bd32296b04a570b17a157df
-DIST git-htmldocs-1.7.0.2.tar.bz2 862039 RMD160 58e08ff5a35e52bead306125dccee3ae9e55f734 SHA1 31cf53f1e339fca694c1b217ea37994b7c92d27b SHA256 092fa05b4fa2eff464057477652059c1b36968345fabaf46622e9c52c46089d5
-DIST git-htmldocs-1.7.0.tar.bz2 861086 RMD160 06be1a51168f4b4e522d06ed0edc3437658bd519 SHA1 efc0f2b5d663e72c8e543f3ea7fd47b98e58b029 SHA256 8338f71c9ee019ee591805a2804e7ed59de0b03538bffeb6a504088a63779241
-DIST git-manpages-1.6.3.1.tar.bz2 244098 RMD160 7de9ac0607365c2fed0eae6c67fdd0f826d044f8 SHA1 e4dd5f5a08d5a9b09cfcd2ba62f3ce7f77479afc SHA256 00ec75ef5d71e933ca173aa96cf254943f7750d536146433c0566ade984744fe
-DIST git-manpages-1.6.3.3.tar.bz2 243822 RMD160 57ffb06cdb1d0daf59aeeed2408860cfb2208e35 SHA1 0153298e215ac6beb3c6073aa1c8bd0de9a1da3b SHA256 a05a18f448a327137e1d6b04175caaabcc9c88f8327290b8f82b69119db39330
-DIST git-manpages-1.6.3.4.tar.bz2 243454 RMD160 48b11821afcd34e383d5bca119e70a271a72ab4a SHA1 eb2884190214351f9cff962d90d28b8adb607372 SHA256 71c77710f884ea9aad510ab98da5e89a1983b845cfbd63b50133b82664742603
-DIST git-manpages-1.6.4.1.tar.bz2 248277 RMD160 be218ce5b78efb755c2cadc660821a3fe89acf48 SHA1 fdab7acc88d11510f9e44f44e101f3aa43920d8e SHA256 e6889443f362ca73ce0885d12de5763d1c632d656225f61b9750b2ec5ba2d1dc
-DIST git-manpages-1.6.4.2.tar.bz2 248508 RMD160 80aac9a3bef03ca9973ab3e7dd03cd02f95998ae SHA1 b9454a5776cf677aac9bad83f5fe9fb14e048132 SHA256 230c2c89e6d249abef8c83a37e664954abca9eac9aed97485f000f8926a78376
-DIST git-manpages-1.6.4.3.tar.bz2 248228 RMD160 27699b3d7a5e2088099c7695e3f4d1214c6f5ed8 SHA1 3186ed5a5e14496842c8389b4a3704c57a7e9569 SHA256 99489e55548dd1898d866bdc90dc94942396eebf42dde0d446f1eb7195c83d29
-DIST git-manpages-1.6.4.4.tar.bz2 248348 RMD160 fd1a267973373bc625336abe2b50545e12cc6fa4 SHA1 39b76f19751995ba3f093cac0b47900e22a5dbd2 SHA256 a2b2fb1aabdbb3e1e8ae9472523b9fef23c3e8a992bb8f68f17ad832a6e59c98
-DIST git-manpages-1.6.4.tar.bz2 246610 RMD160 0b008edd9b120a82973a7caed380e2a13f4af478 SHA1 34c8afef3e03283585edb1093b517f697f18a47b SHA256 b7ed025920594dff4ab9dc959bbefd99fa4ce3ebadef81fc92aad4d66065b7d5
-DIST git-manpages-1.6.5.1.tar.bz2 252259 RMD160 a276db7b9799c233d1ea50e9116fd864b221e18f SHA1 e0dc828f2ec4a4ab47ee7f56ba305843e4f7fa8b SHA256 6d5eda88b136129ca5fee6703a3d000245f38870d4b0292d252bfea786c3f5a3
-DIST git-manpages-1.6.5.2.tar.bz2 256189 RMD160 112429c85cee71b36c12fb0f50b8170a8098c3ae SHA1 9af56df0a9479bc0d761c4b9e9817fb82eeaf73f SHA256 893c1abc6729d19aef26e3e1ffff7323fc1bb6e290974c932e8ab51197fdd921
-DIST git-manpages-1.6.5.3.tar.bz2 256865 RMD160 1fb0b8703ff8d5fc7ca03529faf0492c0bdc2b43 SHA1 733c7ce1a36338dff82dad23c3e68c5a2684fec5 SHA256 0ace2ac5b3be31f919f594a3c56fbd567fbc90ac7d1db72b17335495ca29759b
-DIST git-manpages-1.6.5.4.tar.bz2 256887 RMD160 5c02008781e413f452ee604f669485a7eb07622c SHA1 a619584436f18cf9ce7927461a687bc1f5136e8d SHA256 3047eb40c5239b7c6d67628db60446e50027e7282eee6db400996081ca244ec7
-DIST git-manpages-1.6.5.5.tar.bz2 257668 RMD160 02a103c9fcab9406a3311f731f5f10b966c112b3 SHA1 f8b0cec115108714944da4c5e8005912b86f85b5 SHA256 1462c3c71985d760679bfd27219c03572c92d3149aaef8cae802fe6217d05c73
-DIST git-manpages-1.6.5.6.tar.bz2 257256 RMD160 b33f010f2426430f433b48dcd592ee406724c243 SHA1 b97e529538a2a28345e567d46d64538f99906b84 SHA256 344b4e85afc4a07595c745adda3b3fe9ef7a4c6780ed1cb9d2a4350b8d2063a2
-DIST git-manpages-1.6.5.7.tar.bz2 257450 RMD160 8c08af43cd3cfa58a1bafb60e07b77b99e8782d8 SHA1 bb383dd768ece1cc602c2ba7dcf623fe8bba2a44 SHA256 009f272fbd7be89b93a197fc947abb8d83ef702bb664373fe715bcefcd2102d2
-DIST git-manpages-1.6.5.8.tar.bz2 257494 RMD160 00aa690c3e6e7c6fb9a105515cbd9152293e25ff SHA1 42fe981efb679636b47a193b86f99810326e60b5 SHA256 a0b43a6483d6d5441bb42bed298e3c2ecd194dd983045c0feba523552418fb08
-DIST git-manpages-1.6.5.rc1.tar.bz2 252098 RMD160 6e7b2b6c78c494c2c4e6ba5fff1c6af26dbd588e SHA1 ca612c39d80b4e7b6629c15f99923a1a35ed99c0 SHA256 bb8e6b08ae70449aca656e81afd12946889757c5bfa8cfc989d6919cf5ce4b17
-DIST git-manpages-1.6.5.rc2.tar.bz2 252286 RMD160 40bd2ff2578c7d60189ab51a0337ddd1412e4bbe SHA1 3099ec224be319b6f7ea7e930fdfeaa4e6284acd SHA256 18fa31c7b206906cce614cf49aa93a9a38fab88f33b79d9b963833112629f72e
-DIST git-manpages-1.6.5.tar.bz2 252127 RMD160 d35622533558bbaea8a762e5940471b365c9d31a SHA1 ebc5d4edf9bb1541774b9224dd0609a22ba64862 SHA256 4fb88e4217a82594581a8cae148766fea77a2d9778141fde8bc17517e90a5ca4
-DIST git-manpages-1.6.6.1.tar.bz2 264778 RMD160 a25109904f9813d43907dad261c516eeae0fba47 SHA1 7447d89130e6506a8f0dc3dc198aa4a5a86a93fd SHA256 8282a948e8d06d75cad38e91ef6ca99871f44021c5e2ddd1c50327259a808236
-DIST git-manpages-1.6.6.2.tar.bz2 264990 RMD160 300d2a874cf1605c0bf4ec0db69b00036228a086 SHA1 febd928a22cecc249e0019feab38c26f56800292 SHA256 961bb2412f685b562ed122e9f180d2154ddc214d9d0481835785e84f4baa24eb
-DIST git-manpages-1.6.6.rc3.tar.bz2 264396 RMD160 987619b81ffbca2a7024961242653c5d54968149 SHA1 dfe1312fe7a294b609c855c5256e7409c58fece0 SHA256 9de35dd5e5a2bbfb8af933cd03358b7d9ab9e65a32134c5aa97429600715e25b
-DIST git-manpages-1.6.6.rc4.tar.bz2 264432 RMD160 14a8631bf6f91083822020f4fd44cfa6a88c1f48 SHA1 3b3c7c7a6e811e6f89b0162c5e847928c6466b81 SHA256 be91019bd480e7109b454e824608ef44b93732edc66374613ea245111d985168
-DIST git-manpages-1.6.6.tar.bz2 264409 RMD160 86fda1c25e75fbce40719f5c26b61727394f6f84 SHA1 1621c502908d6cbd640a81a7c96dc22a30a68a60 SHA256 d1f5ec7e4094bc1ee9b6326e93c7354962c0da29ae801793c48a044e2846e862
-DIST git-manpages-1.7.0.2.tar.bz2 272164 RMD160 585ac5b6dd785c6556e53c2ddd848f3fbd6b9dca SHA1 0e5c1f446038e36cb086a8f34ce53bf978fdd62f SHA256 3a65a0a4c5cc34f357fcc6a2ec48f430c13a6a89524b4af89bd5b163563db3ab
-DIST git-manpages-1.7.0.tar.bz2 272259 RMD160 520953c815c821f5350e6bb96f605c2830678ce0 SHA1 8d8b149df1a3146c76a41f50c14302e0424a29af SHA256 62f629db43b2b2f5b871977a300cba43c25f67c7a03decad4d364c021b7573b6
-EBUILD git-1.6.3.1.ebuild 9808 RMD160 547b2191eb86130314ef482ced8b9bf30bedf547 SHA1 bea16aa8acb4df95b56694094ad79c74e86f5c9d SHA256 60a1f34e6736823a03ba179414545de8eb3a4e51d6ca4b1a9fb98b28410fc417
-EBUILD git-1.6.3.3.ebuild 9798 RMD160 1189f089b84d3425866aa8168dbe94c80155d68b SHA1 a8c000b062a9471e436abe3f3160cb426b6f98e6 SHA256 5f263a9ae34f32a7a8f8147e9f179ccdb1e84264ed97832cffb4e39c46c2cf20
-EBUILD git-1.6.3.4.ebuild 9808 RMD160 605e94c928960242325800d2dc390de0f059462c SHA1 9c3d7585e0c41cacdbca0f2b0ce5009c1277a74e SHA256 06aca6df19b7531174d7e824217024c34dccc84f9d444974e39dc2bae729c9cc
-EBUILD git-1.6.4.1.ebuild 9808 RMD160 c0499e54256009992654e7765717b03961d97448 SHA1 50587cd5208639e1709837e410db4058d1715f24 SHA256 90a1f33f2ebaec3cb1aaca8783c45278d146b3880f125bd23e89bfd3699e23f2
-EBUILD git-1.6.4.2.ebuild 9808 RMD160 f45f955b314898fe6a8ca405ec48d2ed20fb7026 SHA1 9937a02b3abc9e43c4605d1e8c9b128c04a2e606 SHA256 193c3af3a48ce6cfbe1658f68558938ffe9c53a5cef2da868e728e3379c452a6
-EBUILD git-1.6.4.3.ebuild 9808 RMD160 e75dbdb9d800b7d6c48978e82ed3954165a112d9 SHA1 a6c7c0a7fb959d78de0d141e00dd550578c114ef SHA256 3443becb314088cf0e676f27bcec80343157512351a489ce2cba848dcc5266c7
-EBUILD git-1.6.4.4.ebuild 9936 RMD160 e4022ad6ffa6ca6431d6cd9ed8cb86be0d2009b5 SHA1 2dab87680a87a79aa1ea76ec2aaadbf735519222 SHA256 9e04b4e51f54807681c51a4b1b4049e225a2b12de2758a1d65f2fafd73d66b06
-EBUILD git-1.6.4.ebuild 9806 RMD160 0e2be37c2f56eedf0ebad8e2e62b53f411e0c1c4 SHA1 f52461b10797dabb1e9c5a6d3733a1fc7d3a2a78 SHA256 7104fdc0570fc1aaa6bb1f20e56a7fb15918ff8a7062592dee9ab2080b7dd10a
-EBUILD git-1.6.5.1-r1.ebuild 10455 RMD160 15607e9941346e51c80fba9804c09a2b66b2aaa5 SHA1 d521a1ddd79a44e764681d0edb7e325f9f05569d SHA256 9942474c95252746aaa312b11bc853c163f82d40c565a4ababbc17df5f886a6e
-EBUILD git-1.6.5.1.ebuild 10153 RMD160 b03e6a70366c9a2d7b1e3f69c85b486563f3391c SHA1 464e053a401af3a0daad507a34ae1fa034cc95e3 SHA256 ccfdf1028ca9c5bb17f5d6f49f9b1e1658bcbd559b773517ebac6784aaf9bb71
-EBUILD git-1.6.5.2.ebuild 10440 RMD160 371e044c71f2488d5ccbc0a8a404b2b11edd02f9 SHA1 c9857f14fd733b2f3b7b667badb88fb2c1f89b12 SHA256 b5e265024e67eab80b113fbdd97065b03e59473175e6278d486a7ff5394644a5
-EBUILD git-1.6.5.3.ebuild 10822 RMD160 b082868e0f5952e98a6e11b5965fc122949e54ce SHA1 76438a893776efbd08ab5fe213c7ec0679a7a974 SHA256 b19f80883e072ea99b45cd9870fdf38fd84d2186fb0163d3bfecbc03648df4b2
-EBUILD git-1.6.5.4.ebuild 10822 RMD160 c51e347831e2a61b070e16cae510bb7847c630db SHA1 e761fc3954deca821a3f7a9c77b81386b17bd11f SHA256 1bad49c126d9d32aa2c9df3d2daf476e5ce71113ab3a67240675fe5e12670fda
-EBUILD git-1.6.5.5.ebuild 10822 RMD160 0fd9110b3e5b4446c068a7295c30e1ba2c0e5456 SHA1 c5d84135dbaf3df269a164c1986702094426867a SHA256 c2fe54a0d7e62d719967eeda44208a10671b143a9d5afdf6a8aa00f4f3cfe545
-EBUILD git-1.6.5.6.ebuild 10822 RMD160 ac8cbeffc207f2ed885eb21fcc520c966c6b8ae5 SHA1 764b96810add1220e27ef70c4410748f3d395c13 SHA256 bec8150df142594d448ca2cced58e8d82c2ab2c7afeab7c361f465ec92ff1a83
-EBUILD git-1.6.5.7.ebuild 10946 RMD160 e38e103a60eba0267de125b4215c6c2755715e92 SHA1 fec1903ca1f8cc6cbed66e133981b4c0bffa1f4c SHA256 5301dcc096452a642c14b554d171d01bcb84e49f8bfa05d9d713d67bbe14efc1
-EBUILD git-1.6.5.8.ebuild 10951 RMD160 c8e597d6d4ca88b99839db7f787de75066cccdea SHA1 cefa492903724fcdd0ac616d34879fe43dd9e052 SHA256 680a79acf7f9d6d21ce9f5b894bc7786447f9ac55f1a74d3e717d23c717e18e6
-EBUILD git-1.6.5.ebuild 10151 RMD160 b604e61e1c293f315fb3c65cf68fbc00f1f16b76 SHA1 2af4747aa0fafd4cf26f0c30d7957cef53cd0b59 SHA256 70dbe58f206110ad781858e54f80c4f3b094fe28524430e16f3754be276c9e1e
-EBUILD git-1.6.5_rc1.ebuild 9810 RMD160 23db321ce87550053fdd25faf3dee43b051a9bdc SHA1 d984a36291740c627761a9b6f9e601b70f038f1f SHA256 0661b98bb406fd7ea7a46b4c9094bbd6ad0220feaddf8406950e0f53b251bee3
-EBUILD git-1.6.5_rc2.ebuild 9825 RMD160 7f95a77f7711d8432e3b489e7802e2b1190ac2cd SHA1 d47951f7fa820446551dea608471f2388d77b7df SHA256 eec4c8f43b9bb211580e01e36cae0732e55fb6742d9068bea9c4a16344ccac0e
-EBUILD git-1.6.6-r1.ebuild 11125 RMD160 52882c3f30ab63578caf10e8f2e8288c94905082 SHA1 cfa1461379d3f82ef22623ba47cb8264d14f21e7 SHA256 9569e8c8490bb74430169be0842be91c880793dd9f4e3d5e4f77c292797060bf
-EBUILD git-1.6.6-r2.ebuild 11130 RMD160 93f4e79cf93185064a266b9ca52cb56c7eb9818d SHA1 f1ce076cc53a5c74d6af189fd3750d6c6e5b6259 SHA256 cde2853503277f18eef83250bc9042fa884b134b3026a615724695e99da86025
-EBUILD git-1.6.6.1.ebuild 11129 RMD160 22db3dc7f6582db9f3d06ac85f9d563df32e8671 SHA1 8f3d58359746b2e08dfc41b8374c2c1b7feac4cc SHA256 19e770df7ee4b3c8556f7457db30d0db19f9ca7adbee9cd35f3a7c23d6a48196
-EBUILD git-1.6.6.2.ebuild 11129 RMD160 25fc00a6472644c14554e3861612b45e7143b11d SHA1 6e1389baa25c06559c2d95d6f3dcbb15d4a99873 SHA256 abb457fd6f481ff824ab9bda926ae91a94e1e51aae6a112bd3fb50dc6831c883
-EBUILD git-1.6.6.ebuild 10944 RMD160 5fbeb97e618d70fd89d769625b3f326e4807a663 SHA1 92d66eb3692532b79ad27823cbad7de83088d7c7 SHA256 8ef6535cf8d2016e2e4797071d11f9878b877c711d4e2a45efe95b06ae624772
-EBUILD git-1.6.6_rc3.ebuild 10948 RMD160 d26ee1d80db76370257ef1a9dc98d147dac8998e SHA1 fa5850d6fd8b645e766cea7f7db0f13c01727fd5 SHA256 39316fe2f1e1b6dcf36ee3cb67f1c949ee2cb86d83fe3ec20bc2337b9c42a223
-EBUILD git-1.6.6_rc4.ebuild 10948 RMD160 a8a6e815a9bad3b2b0bd585a03249ba5ebaac3ab SHA1 31f2c22aed19ae373096deceee109e8812a5b1d4 SHA256 02dba7f8470d2bfef0116c8b8266de9200693745bf396bdf2e93036f0a2fb540
-EBUILD git-1.7.0.2.ebuild 11129 RMD160 1d610500fd2fd16faba78dc92d0744b3f8e22577 SHA1 9af93b0e277e9bf37b8b2a257e01661933a1efc7 SHA256 ff182b1b7a9929e4e19d77575e277610e4927126d705fef68e4ae73358b4c5f9
-EBUILD git-1.7.0.ebuild 11127 RMD160 5e8e9601335a362ac385ffd89ef5a1cb1efca20a SHA1 5e59b94b4b060a584b054197f3d6f586f62b8962 SHA256 c8086a4bf6f8bc07c0f181acd385c355ff1d94aa9ea2c051fc44226509f1db04
-EBUILD git-9999.ebuild 11125 RMD160 5d3b06f8121eb9536dd3608cec07a2574c9d99bd SHA1 4fb83874949913d462b5a41e3327ad251c997fbf SHA256 e406472b2db22f8ffa2d2ac790a07b372a55c156c33c8a697839c2bdb34f2991
-MISC ChangeLog 61581 RMD160 c837d69adfdc8ca201a398e62f6948e5aac3daf2 SHA1 531242ee48870a3888832d835a678824370fd806 SHA256 d790e5ef3eeff5484fd49853aea84cea9b728aee77a59606791ad6f26d9be431
-MISC metadata.xml 1610 RMD160 6b03b898986d26bba7ff441dc1c8c9ec04a9a2b9 SHA1 a0a0d304138c648729d225954de89c1aac359008 SHA256 d070dc8e46e0fd44676d0491353f95385e65c1ffcd1313193dc59d495245c007
diff --git a/dev-util/git/files/50git-gentoo.el b/dev-util/git/files/50git-gentoo.el
deleted file mode 100644 (file)
index 42edd77..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-
-;;; dev-util/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-util/git/files/git-1.6.6-always-install-js.patch b/dev-util/git/files/git-1.6.6-always-install-js.patch
deleted file mode 100644 (file)
index f4a3825..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-JS install cleanup fixes
-
-- Always install the JS for GitWeb, even if it is not being minified.
-- Also ensure the minified JS is built before instaweb as it is referenced in
-  the sed expression.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar git-1.6.6.orig/Makefile git-1.6.6/Makefile
---- git-1.6.6.orig/Makefile    2009-12-24 00:00:22.000000000 +0000
-+++ git-1.6.6/Makefile 2009-12-25 23:47:57.089719735 +0000
-@@ -1509,13 +1509,8 @@
-       chmod +x $@+ && \
-       mv $@+ $@
- 
--ifdef JSMIN
--OTHER_PROGRAMS += gitweb/gitweb.cgi   gitweb/gitweb.min.js
--gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.min.js
--else
--OTHER_PROGRAMS += gitweb/gitweb.cgi
--gitweb/gitweb.cgi: gitweb/gitweb.perl
--endif
-+OTHER_PROGRAMS += gitweb/gitweb.cgi   gitweb/$(GITWEB_JS)
-+gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/$(GITWEB_JS)
-       $(QUIET_GEN)$(RM) $@ $@+ && \
-       sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
-           -e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
-@@ -1541,7 +1536,7 @@
-       chmod +x $@+ && \
-       mv $@+ $@
- 
--git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js
-+git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/$(GITWEB_JS)
-       $(QUIET_GEN)$(RM) $@ $@+ && \
-       sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-           -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
diff --git a/dev-util/git/files/git-1.7.0-always-install-js.patch b/dev-util/git/files/git-1.7.0-always-install-js.patch
deleted file mode 100644 (file)
index 56f455e..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-JS install cleanup fixes
-
-- Always install the JS for GitWeb, even if it is not being minified.
-- Also ensure the minified JS is built before instaweb as it is referenced in
-  the sed expression.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.0.orig/Makefile git-1.7.0/Makefile
---- git-1.7.0.orig/Makefile    2010-02-13 00:44:43.000000000 +0000
-+++ git-1.7.0/Makefile 2010-02-13 18:11:52.923807675 +0000
-@@ -1500,13 +1500,8 @@
- gitweb:
-       $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
- 
--ifdef JSMIN
--OTHER_PROGRAMS += gitweb/gitweb.cgi   gitweb/gitweb.min.js
--gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.min.js
--else
--OTHER_PROGRAMS += gitweb/gitweb.cgi
--gitweb/gitweb.cgi: gitweb/gitweb.perl
--endif
-+OTHER_PROGRAMS += gitweb/gitweb.cgi   gitweb/$(GITWEB_JS)
-+gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/$(GITWEB_JS)
-       $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)
- 
- ifdef JSMIN
-@@ -1515,7 +1510,7 @@
- endif # JSMIN
- 
- 
--git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js
-+git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/$(GITWEB_JS)
-       $(QUIET_GEN)$(RM) $@ $@+ && \
-       sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-           -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
diff --git a/dev-util/git/files/git-daemon.confd b/dev-util/git/files/git-daemon.confd
deleted file mode 100644 (file)
index 75b4216..0000000
+++ /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 /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-util/git/files/git-daemon.initd b/dev-util/git/files/git-daemon.initd
deleted file mode 100644 (file)
index 726fca5..0000000
+++ /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-util/git/files/git-daemon.initd,v 1.6 2008/11/27 20:33:34 robbat2 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-util/git/files/git-daemon.xinetd b/dev-util/git/files/git-daemon.xinetd
deleted file mode 100644 (file)
index 02c938d..0000000
+++ /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-util/git/git-1.6.3.1.ebuild b/dev-util/git/git-1.6.3.1.ebuild
deleted file mode 100644 (file)
index 23959b4..0000000
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.1.ebuild,v 1.7 2009/11/16 20:57:10 darkside Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       dev-libs/openssl
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-DEPEND="${CDEPEND}"
-
-# These are needed to build the docs
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/asciidoc
-                       app-text/xmlto
-                       app-text/docbook2X
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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 mozsha1 ; then
-               myopts="${myopts} MOZILLA_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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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 [[ "$PV" == "9999" ]] && use doc; then
-               cd Documentation
-               git_emake man info html \
-                       || die "emake man html info failed"
-       fi
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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 /
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.3.3.ebuild b/dev-util/git/git-1.6.3.3.ebuild
deleted file mode 100644 (file)
index cf8743b..0000000
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.3.ebuild,v 1.13 2009/11/16 20:57:10 darkside Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       dev-libs/openssl
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-DEPEND="${CDEPEND}"
-
-# These are needed to build the docs
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/asciidoc
-                       app-text/xmlto
-                       app-text/docbook2X
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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 mozsha1 ; then
-               myopts="${myopts} MOZILLA_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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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 [[ "$PV" == "9999" ]] && use doc; then
-               cd Documentation
-               git_emake man info html \
-                       || die "emake man html info failed"
-       fi
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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 /
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.3.4.ebuild b/dev-util/git/git-1.6.3.4.ebuild
deleted file mode 100644 (file)
index 84580c8..0000000
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3.4.ebuild,v 1.7 2009/11/16 20:57:10 darkside Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       dev-libs/openssl
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-DEPEND="${CDEPEND}"
-
-# These are needed to build the docs
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/asciidoc
-                       app-text/xmlto
-                       app-text/docbook2X
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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 mozsha1 ; then
-               myopts="${myopts} MOZILLA_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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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 [[ "$PV" == "9999" ]] && use doc; then
-               cd Documentation
-               git_emake man info html \
-                       || die "emake man html info failed"
-       fi
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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 /
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.4.1.ebuild b/dev-util/git/git-1.6.4.1.ebuild
deleted file mode 100644 (file)
index 00c64f1..0000000
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.1.ebuild,v 1.7 2009/11/16 20:57:10 darkside Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       dev-libs/openssl
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-DEPEND="${CDEPEND}"
-
-# These are needed to build the docs
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/asciidoc
-                       app-text/xmlto
-                       app-text/docbook2X
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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 mozsha1 ; then
-               myopts="${myopts} MOZILLA_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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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 [[ "$PV" == "9999" ]] && use doc; then
-               cd Documentation
-               git_emake man info html \
-                       || die "emake man html info failed"
-       fi
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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 /
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.4.2.ebuild b/dev-util/git/git-1.6.4.2.ebuild
deleted file mode 100644 (file)
index c263396..0000000
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.2.ebuild,v 1.7 2009/11/16 20:57:10 darkside Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       dev-libs/openssl
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-DEPEND="${CDEPEND}"
-
-# These are needed to build the docs
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/asciidoc
-                       app-text/xmlto
-                       app-text/docbook2X
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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 mozsha1 ; then
-               myopts="${myopts} MOZILLA_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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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 [[ "$PV" == "9999" ]] && use doc; then
-               cd Documentation
-               git_emake man info html \
-                       || die "emake man html info failed"
-       fi
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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 /
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.4.3.ebuild b/dev-util/git/git-1.6.4.3.ebuild
deleted file mode 100644 (file)
index 0ab99b9..0000000
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.3.ebuild,v 1.7 2009/11/16 20:57:10 darkside Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       dev-libs/openssl
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-DEPEND="${CDEPEND}"
-
-# These are needed to build the docs
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/asciidoc
-                       app-text/xmlto
-                       app-text/docbook2X
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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 mozsha1 ; then
-               myopts="${myopts} MOZILLA_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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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 [[ "$PV" == "9999" ]] && use doc; then
-               cd Documentation
-               git_emake man info html \
-                       || die "emake man html info failed"
-       fi
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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 /
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.4.4.ebuild b/dev-util/git/git-1.6.4.4.ebuild
deleted file mode 100644 (file)
index 99facd3..0000000
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.4.ebuild,v 1.11 2009/11/16 20:57:10 darkside Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       dev-libs/openssl
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-DEPEND="${CDEPEND}"
-
-# These are needed to build the docs
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/asciidoc
-                       app-text/xmlto
-                       app-text/docbook2X
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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 mozsha1 ; then
-               myopts="${myopts} MOZILLA_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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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 [[ "$PV" == "9999" ]] && use doc; then
-               cd Documentation
-               git_emake man info html \
-                       || die "emake man html info failed"
-       fi
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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 /
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               # Bug #288575 - t3700 is not suitable for root perm
-               # Bug #288575 - t7300 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh
-               t3700-add.sh t7300-clean.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.4.ebuild b/dev-util/git/git-1.6.4.ebuild
deleted file mode 100644 (file)
index 219fb97..0000000
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.4.ebuild,v 1.7 2009/11/16 20:57:10 darkside Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       dev-libs/openssl
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-DEPEND="${CDEPEND}"
-
-# These are needed to build the docs
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/asciidoc
-                       app-text/xmlto
-                       app-text/docbook2X
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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 mozsha1 ; then
-               myopts="${myopts} MOZILLA_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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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 [[ "$PV" == "9999" ]] && use doc; then
-               cd Documentation
-               git_emake man info html \
-                       || die "emake man html info failed"
-       fi
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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 /
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.5.1-r1.ebuild b/dev-util/git/git-1.6.5.1-r1.ebuild
deleted file mode 100644 (file)
index beeb2bb..0000000
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5.1-r1.ebuild,v 1.6 2010/01/02 15:16:11 ranger Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS="~ppc64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-       doc?    (
-               app-text/asciidoc
-               app-text/docbook2X
-               sys-apps/texinfo
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       has_version '>=app-text/asciidoc-8.0' \
-               && myopts="${myopts} ASCIIDOC8=YesPlease"
-       myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.5.1.ebuild b/dev-util/git/git-1.6.5.1.ebuild
deleted file mode 100644 (file)
index ec8c240..0000000
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5.1.ebuild,v 1.3 2009/11/16 20:57:10 darkside Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-DEPEND="${CDEPEND}"
-
-# These are needed to build the docs
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/asciidoc
-                       app-text/xmlto
-                       app-text/docbook2X
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       has_version '>=app-text/asciidoc-8.0' \
-               && myopts="${myopts} ASCIIDOC8=YesPlease"
-       myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-       fi
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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 :-(
-       [[ "$PV" == "9999" ]] && use doc && doinfo Documentation/{git,gitman}.info
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.5.2.ebuild b/dev-util/git/git-1.6.5.2.ebuild
deleted file mode 100644 (file)
index af5579a..0000000
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5.2.ebuild,v 1.4 2009/11/18 17:31:09 armin76 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-       doc?    (
-               app-text/asciidoc
-               app-text/docbook2X
-               sys-apps/texinfo
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       has_version '>=app-text/asciidoc-8.0' \
-               && myopts="${myopts} ASCIIDOC8=YesPlease"
-       myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.5.3.ebuild b/dev-util/git/git-1.6.5.3.ebuild
deleted file mode 100644 (file)
index 7c5d69e..0000000
+++ /dev/null
@@ -1,401 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5.3.ebuild,v 1.5 2009/11/18 17:31:09 armin76 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.5.4.ebuild b/dev-util/git/git-1.6.5.4.ebuild
deleted file mode 100644 (file)
index 728ba5a..0000000
+++ /dev/null
@@ -1,401 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5.4.ebuild,v 1.1 2009/12/03 22:31:43 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.5.5.ebuild b/dev-util/git/git-1.6.5.5.ebuild
deleted file mode 100644 (file)
index bb745a3..0000000
+++ /dev/null
@@ -1,401 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5.5.ebuild,v 1.1 2009/12/06 17:28:30 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.5.6.ebuild b/dev-util/git/git-1.6.5.6.ebuild
deleted file mode 100644 (file)
index d160588..0000000
+++ /dev/null
@@ -1,401 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5.6.ebuild,v 1.1 2009/12/11 11:05:44 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.5.7.ebuild b/dev-util/git/git-1.6.5.7.ebuild
deleted file mode 100644 (file)
index 17179e9..0000000
+++ /dev/null
@@ -1,406 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5.7.ebuild,v 1.1 2009/12/17 04:50:50 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               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"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.5.8.ebuild b/dev-util/git/git-1.6.5.8.ebuild
deleted file mode 100644 (file)
index b51382f..0000000
+++ /dev/null
@@ -1,406 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5.8.ebuild,v 1.1 2010/01/21 18:54:12 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               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"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.5.ebuild b/dev-util/git/git-1.6.5.ebuild
deleted file mode 100644 (file)
index 82e96bd..0000000
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5.ebuild,v 1.3 2009/11/16 20:57:10 darkside Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-DEPEND="${CDEPEND}"
-
-# These are needed to build the docs
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/asciidoc
-                       app-text/xmlto
-                       app-text/docbook2X
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       has_version '>=app-text/asciidoc-8.0' \
-               && myopts="${myopts} ASCIIDOC8=YesPlease"
-       myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-       fi
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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 :-(
-       [[ "$PV" == "9999" ]] && use doc && doinfo Documentation/{git,gitman}.info
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.5_rc1.ebuild b/dev-util/git/git-1.6.5_rc1.ebuild
deleted file mode 100644 (file)
index 89dcc4f..0000000
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5_rc1.ebuild,v 1.7 2009/11/16 20:57:10 darkside Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       dev-libs/openssl
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-DEPEND="${CDEPEND}"
-
-# These are needed to build the docs
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/asciidoc
-                       app-text/xmlto
-                       app-text/docbook2X
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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 mozsha1 ; then
-               myopts="${myopts} MOZILLA_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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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 [[ "$PV" == "9999" ]] && use doc; then
-               cd Documentation
-               git_emake man info html \
-                       || die "emake man html info failed"
-       fi
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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 /
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.5_rc2.ebuild b/dev-util/git/git-1.6.5_rc2.ebuild
deleted file mode 100644 (file)
index 43f3bc6..0000000
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5_rc2.ebuild,v 1.5 2009/11/16 20:57:10 darkside Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       app-arch/cpio
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-DEPEND="${CDEPEND}"
-
-# These are needed to build the docs
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/asciidoc
-                       app-text/xmlto
-                       app-text/docbook2X
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-}
-
-src_unpack() {
-       if [ "${PV}" != "9999" ]; then
-               unpack ${MY_P}.tar.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               Makefile || die "sed failed"
-
-       # Fix docbook2texi command
-       sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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 [[ "$PV" == "9999" ]] && use doc; then
-               cd Documentation
-               git_emake man info html \
-                       || die "emake man html info failed"
-       fi
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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 /
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.sh"
-       local tests_perl="t5502-quickfetch.sh \
-                                       t5512-ls-remote.sh \
-                                       t5520-pull.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
-               # Bug #225601 - t0004 is not suitable for root perm
-               # Bug #219839 - t1004 is not suitable for root perm
-               disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh"
-       else
-               [[ $cvs -gt 0 ]] && \
-                       has_version dev-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.6-r1.ebuild b/dev-util/git/git-1.6.6-r1.ebuild
deleted file mode 100644 (file)
index 28e254c..0000000
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.6-r1.ebuild,v 1.1 2009/12/26 00:10:34 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       # JS install fixup
-       epatch "${FILESDIR}"/git-1.6.6-always-install-js.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               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"
-
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               js=gitweb.js
-               [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
-               doins "${S}"/gitweb/${js}
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.6-r2.ebuild b/dev-util/git/git-1.6.6-r2.ebuild
deleted file mode 100644 (file)
index d91343b..0000000
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.6-r2.ebuild,v 1.1 2009/12/26 00:44:34 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       # JS install fixup
-       epatch "${FILESDIR}"/git-1.6.6-always-install-js.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               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"
-
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               js=gitweb.js
-               [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
-               doins "${S}"/gitweb/${js}
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.6.1.ebuild b/dev-util/git/git-1.6.6.1.ebuild
deleted file mode 100644 (file)
index e1d8f76..0000000
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.6.1.ebuild,v 1.1 2010/01/21 18:54:12 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       # JS install fixup
-       epatch "${FILESDIR}"/git-1.6.6-always-install-js.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               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"
-
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               js=gitweb.js
-               [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
-               doins "${S}"/gitweb/${js}
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.6.2.ebuild b/dev-util/git/git-1.6.6.2.ebuild
deleted file mode 100644 (file)
index d9cda5a..0000000
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.6.2.ebuild,v 1.1 2010/02/13 17:34:19 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       # JS install fixup
-       epatch "${FILESDIR}"/git-1.6.6-always-install-js.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               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"
-
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               js=gitweb.js
-               [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
-               doins "${S}"/gitweb/${js}
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.6.ebuild b/dev-util/git/git-1.6.6.ebuild
deleted file mode 100644 (file)
index 61e8ab3..0000000
+++ /dev/null
@@ -1,406 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.6.ebuild,v 1.1 2009/12/24 19:34:28 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               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"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.6_rc3.ebuild b/dev-util/git/git-1.6.6_rc3.ebuild
deleted file mode 100644 (file)
index 060f72f..0000000
+++ /dev/null
@@ -1,406 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.6_rc3.ebuild,v 1.1 2009/12/17 07:36:46 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               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"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.6.6_rc4.ebuild b/dev-util/git/git-1.6.6_rc4.ebuild
deleted file mode 100644 (file)
index 8b3a42f..0000000
+++ /dev/null
@@ -1,406 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.6_rc4.ebuild,v 1.1 2009/12/21 04:29:03 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               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"
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.7.0.2.ebuild b/dev-util/git/git-1.7.0.2.ebuild
deleted file mode 100644 (file)
index 8d2e701..0000000
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.7.0.2.ebuild,v 1.1 2010/03/07 23:21:25 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       # JS install fixup
-       epatch "${FILESDIR}"/git-1.7.0-always-install-js.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               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"
-
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               js=gitweb.js
-               [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
-               doins "${S}"/gitweb/${js}
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-1.7.0.ebuild b/dev-util/git/git-1.7.0.ebuild
deleted file mode 100644 (file)
index 1c10847..0000000
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.7.0.ebuild,v 1.1 2010/02/13 18:37:09 robbat2 Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       # JS install fixup
-       epatch "${FILESDIR}"/git-1.7.0-always-install-js.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               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"
-
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               js=gitweb.js
-               [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
-               doins "${S}"/gitweb/${js}
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/git-9999.ebuild b/dev-util/git/git-9999.ebuild
deleted file mode 100644 (file)
index 57441bd..0000000
+++ /dev/null
@@ -1,413 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-9999.ebuild,v 1.20 2010/02/28 02:18:15 sping Exp $
-
-EAPI=2
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-[ "$PV" == "9999" ] && inherit git
-
-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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-                       mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-                       doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-else
-       SRC_URI=""
-       EGIT_BRANCH="master"
-       EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-       # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
-       KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !blksha1? ( dev-libs/openssl )
-       sys-libs/zlib
-       perl?   ( dev-lang/perl )
-       tk?     ( dev-lang/tk )
-       curl?   (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs?  ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( virtual/perl-CGI )
-                       cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
-                       subversion? ( dev-util/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       gtk?
-       (
-               >=dev-python/pygtk-2.8
-               || ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
-       )"
-
-# 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
-       )"
-
-# Live ebuild builds HTML docs, additionally
-if [ "$PV" == "9999" ]; then
-       DEPEND="${DEPEND}
-               doc?    (
-                       app-text/xmlto
-               )"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       if ! use perl ; then
-               use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
-               use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
-               use subversion && ewarn "git-svn needs USE=perl, it won't work"
-       fi
-       if use webdav && ! use curl ; then
-               ewarn "USE=webdav needs USE=curl. Ignoring"
-       fi
-       if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/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
-}
-
-# 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
-
-       use iconv \
-               || myopts="${myopts} NO_ICONV=YesPlease"
-       use tk \
-               || myopts="${myopts} NO_TCLTK=YesPlease"
-       use perl \
-               && myopts="${myopts} INSTALLDIRS=vendor" \
-               || myopts="${myopts} NO_PERL=YesPlease"
-       use threads \
-               && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
-       use subversion \
-               || myopts="${myopts} NO_SVN_TESTS=YesPlease"
-
-       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.bz2
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-               cd "${S}"
-       else
-               git_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # Noperl is being merged to upstream as of 2009/04/05
-       #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-       # GetOpt-Long v2.38 is strict
-       # Merged in 1.6.3 final 2009/05/07
-       #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-       # JS install fixup
-       epatch "${FILESDIR}"/git-1.7.0-always-install-js.patch
-
-       sed -i \
-               -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
-               -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
-               -e 's:^\(CC = \).*$:\1$(OPTCC):' \
-               -e 's:^\(AR = \).*$:\1$(OPTAR):' \
-               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"
-
-}
-
-git_emake() {
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix=/usr \
-               htmldir=/usr/share/doc/${PF}/html \
-               "$@"
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       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
-
-       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
-}
-
-src_install() {
-       git_emake \
-               install || \
-               die "make install failed"
-
-       doman man?/*.[157] 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
-
-       dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-       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 "${D}${SITELISP}/${PN}/compat/.nosearch"
-               elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-       fi
-
-       if use gtk ; then
-               dobin "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       fi
-
-       dobin contrib/fast-import/git-p4
-       dodoc contrib/fast-import/git-p4.txt
-       newbin contrib/fast-import/import-tars.perl import-tars
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # svnimport - use git-svn
-       # p4import - excluded because fast-import has a better one
-       # examples - these are stuff that is not used in Git anymore actually
-       # patches - stuff the Git guys made to go upstream to other places
-       for i in continuous fast-import hg-to-git \
-               hooks remotes2config.sh stats \
-               workdir convert-objects blameview ; do
-               cp -rf \
-                       "${S}"/contrib/${i} \
-                       "${D}"/usr/share/${PN}/contrib \
-                       || die "Failed contrib ${i}"
-       done
-
-       if use perl && use cgi ; then
-               dodir /usr/share/${PN}/gitweb
-               insinto /usr/share/${PN}/gitweb
-               doins "${S}"/gitweb/gitweb.cgi
-               doins "${S}"/gitweb/gitweb.css
-               js=gitweb.js
-               [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js
-               doins "${S}"/gitweb/${js}
-               doins "${S}"/gitweb/git-{favicon,logo}.png
-
-               # Make sure it can run
-               fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
-
-               # INSTALL discusses configuration issues, not just installation
-               docinto /
-               newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-               newdoc  "${S}"/gitweb/README README.gitweb
-
-               find "${D}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       fi
-       if ! use subversion ; then
-               rm -f "${D}"/usr/libexec/git-core/git-svn \
-                       "${D}"/usr/share/man/man1/git-svn.1*
-       fi
-
-       if use xinetd ; then
-               insinto /etc/xinetd.d
-               newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-       fi
-
-       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-       fixlocalpod
-}
-
-src_test() {
-       local disabled=""
-       local tests_cvs="t9200-git-cvsexportcommit.sh \
-                                       t9400-git-cvsserver-server.sh \
-                                       t9600-cvsimport.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 \
-               t1004-read-tree-m-u-wf.sh \
-               t3700-add.sh \
-               t7300-clean.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-util/cvs && \
-                       let cvs=$cvs+1
-               [[ $cvs -gt 1 ]] && \
-                       built_with_use dev-util/cvs server && \
-                       let cvs=$cvs+1
-               if [[ $cvs -lt 3 ]]; then
-                       einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
-                       disabled="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       # 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
-       cd "${S}"
-       # Now run the tests
-       einfo "Start test run"
-       git_emake \
-               test || die "tests failed"
-}
-
-showpkgdeps() {
-       local pkg=$1
-       shift
-       elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-       if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
-               ewarn "You must build dev-util/subversion with USE=perl"
-               ewarn "to get the full functionality of git-svn!"
-       fi
-       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-util/git/metadata.xml b/dev-util/git/metadata.xml
deleted file mode 100644 (file)
index 569dfd9..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>no-herd</herd>
-  <maintainer>
-    <email>robbat2@gentoo.org</email>
-    <name>Robin H. Johnson</name>
-  </maintainer>
-  <maintainer>
-    <email>ricmm@gentoo.org</email>
-  </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="cgi">Install gitweb too</flag>
-    <flag name="mozsha1">Makes git use an optimized SHA1 routine from Mozilla that should be fast on non-x86 machines.</flag>
-    <flag name="blksha1">Use the new optimized SHA1 implementation.</flag>
-    <flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch.</flag>
-    <flag name="webdav">Adds support for push'ing to HTTP repositories via DAV.</flag>
-    <flag name="gtk">Include the gitview contrib tool.</flag>
-    <flag name="subversion">Include git-svn for <pkg>dev-util/subversion</pkg> support.</flag>
-  </use>
-</pkgmetadata>
index af6b24634f6c9f41394a692c7a775b22deb4de6f..9bd072b6124be86d02a21ede274b90d89532115e 100644 (file)
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST kdevelop-3.9.97.tar.bz2 2415397 RMD160 88c1d655fb3e54235dfa3a3d9de8f53183cd1913 SHA1 79141abbc2fd98e5bb23c5262cff16321ba72b3e SHA256 9d53ab9656ffa2cdb8388424cc02143b0bfb8e68a9cea00335a658d41de95be4
 DIST kdevelop-3.9.98.tar.bz2 2691907 RMD160 8f1710ca42b5107e3addf1371342514b9678e8a1 SHA1 a171a4855868a86f42d81a3b8a151b76bca7b9dc SHA256 8bf90fb74d33973f02cff5abd99d7624d088c38088a3740d794b76d28ea00fcd
 DIST kdevelop-3.9.99.tar.bz2 4056211 RMD160 e53c64e895849d4e3b4cecc099fb006327a2c329 SHA1 9c2d7a7077da23ed614d41f316700c30d7188e4b SHA256 84ead650a6d935972df4a88d8a8c2e91f8bf9396aaabf8cbb36e01e60389c493
 EBUILD kdevelop-3.9.97.ebuild 2067 RMD160 05869c86d0eb67586ea5bf9f410809f23d12d373 SHA1 d648466e21c66283d118fecac95932315f8c6eab SHA256 7df79891a52003d0a3382dcb790d6a5040f1e6b2ed72d33087ffdfbc120bd9cc
 EBUILD kdevelop-3.9.98.ebuild 1826 RMD160 89dd2655a27ec2c8275dc01f4c1d8bdbdfe32757 SHA1 9df7ba54cd960382b842de831ec65e2cdc81f81a SHA256 321fb54e47ac4705c449553d9dc06551f9d3e1f8cc95d5008a8d6cacb7f6170f
-EBUILD kdevelop-3.9.99.ebuild 1826 RMD160 6a76cee07d524f0254ae0a33bef509709502e250 SHA1 67adec78246cc1ecca394ae1f6f6f3bce5a6bdab SHA256 b3884d7919f05521cb4d70dfefaaac6df1e064b2792bde84fad341d43c2e199f
-MISC ChangeLog 29349 RMD160 231a8744ccbb1fdc2b529461e5788a18bd53a317 SHA1 16d084fc0e2b65450413e50ea0dd8b546f86dbf8 SHA256 d3f53fc85ca0c44f2448980f2158b91b15dad66b71ee2772395e8e45bf0a95c7
+EBUILD kdevelop-3.9.99.ebuild 1634 RMD160 952c2fa4751dcba5deabc2291b9051ff7d79589e SHA1 d1a8fcb8b1293ff169979969a4fa4ea340d2e877 SHA256 132e89b1a7aaeb013d462a3f65d24cc6f129aa9c20248c3f2a85748723cf13c6
+MISC ChangeLog 29457 RMD160 3ec36c7e5bff6ae759d3cf1645b4ebff2bd79afa SHA1 8679521da5cf7dadd8105bfc702f0ebc53dae877 SHA256 321dfc10d28e613f506c3b43768273ffa23d89bf611936ec59ead5a4070af610
 MISC metadata.xml 376 RMD160 93e6c292048eaf4c9a6510b167b6565f7a6ded38 SHA1 fc7c31107627f479cfedf13d0b89514e36840549 SHA256 6a5c6a78d5091e2045348ccb90057b68d3b6a25a17972779c4df81264650a602
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuhFI8ACgkQHB6c3gNBRYc88ACgnT3tUvBXmlwW2TGomXCe+KLe
+/PkAoMA476Rx8NyJ4i+Rx9aXpCZwa0DW
+=6RL0
+-----END PGP SIGNATURE-----