diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2010-03-17 15:13:27 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2010-03-17 15:13:27 +0000 |
| commit | 93ebfb3fabdc1a938eecf56fc4b9ccaa0e345d30 (patch) | |
| tree | 11b4f2065bf8621cdfc0864734386f9d4de91530 /dev-vcs | |
| parent | Prepare move of dev-util/git to dev-vcs/git (diff) | |
| download | gentoo-2-93ebfb3fabdc1a938eecf56fc4b9ccaa0e345d30.tar.gz gentoo-2-93ebfb3fabdc1a938eecf56fc4b9ccaa0e345d30.tar.bz2 gentoo-2-93ebfb3fabdc1a938eecf56fc4b9ccaa0e345d30.zip | |
dev-vcs/git: New package (copied from dev-util/git)
(Portage version: 2.2_rc67/cvs/Linux i686, RepoMan options: --force)
Diffstat (limited to 'dev-vcs')
38 files changed, 13760 insertions, 0 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog new file mode 100644 index 000000000000..be8d2d749c34 --- /dev/null +++ b/dev-vcs/git/ChangeLog @@ -0,0 +1,1858 @@ +# ChangeLog for dev-vcs/git +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.1 2010/03/17 15:13:19 sping Exp $ + + 17 Mar 2010; Sebastian Pipping <sping@gentoo.org> +files/50git-gentoo.el, + +git-1.6.3.1.ebuild, +git-1.6.3.3.ebuild, +git-1.6.3.4.ebuild, + +git-1.6.4.ebuild, +git-1.6.4.1.ebuild, +git-1.6.4.2.ebuild, + +git-1.6.4.3.ebuild, +git-1.6.4.4.ebuild, +git-1.6.5_rc1.ebuild, + +git-1.6.5_rc2.ebuild, +git-1.6.5.ebuild, +git-1.6.5.1.ebuild, + +git-1.6.5.1-r1.ebuild, +git-1.6.5.2.ebuild, +git-1.6.5.3.ebuild, + +git-1.6.5.4.ebuild, +git-1.6.5.5.ebuild, +git-1.6.5.6.ebuild, + +git-1.6.5.7.ebuild, +git-1.6.5.8.ebuild, +git-1.6.6_rc3.ebuild, + +git-1.6.6_rc4.ebuild, +git-1.6.6.ebuild, +git-1.6.6-r1.ebuild, + +git-1.6.6-r2.ebuild, +git-1.6.6.1.ebuild, +git-1.6.6.2.ebuild, + +files/git-1.6.6-always-install-js.patch, +git-1.7.0.ebuild, + +git-1.7.0.2.ebuild, +files/git-1.7.0-always-install-js.patch, + +git-9999.ebuild, +files/git-daemon.confd, +files/git-daemon.initd, + +files/git-daemon.xinetd, +metadata.xml: + New package (copied from dev-util/git) + +*git-1.7.0.2 (07 Mar 2010) + + 07 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.0.2.ebuild: + version bump. + + 28 Feb 2010; Sebastian Pipping <sping@gentoo.org> git-9999.ebuild: + Sync live ebuild with latest (bug #305157) + +*git-1.7.0 (13 Feb 2010) + + 13 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.0.ebuild, + +files/git-1.7.0-always-install-js.patch: + Version bump. + +*git-1.6.6.2 (13 Feb 2010) + + 13 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6.2.ebuild: + Version bump. + +*git-1.6.6.1 (21 Jan 2010) +*git-1.6.5.8 (21 Jan 2010) + + 21 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.8.ebuild, + +git-1.6.6.1.ebuild: + Version bump. + + 02 Jan 2010; Brent Baude <ranger@gentoo.org> git-1.6.5.1-r1.ebuild: + Marking git-1.6.5.1-r1 ~ppc64 for bug 290163 + +*git-1.6.6-r2 (26 Dec 2009) + + 26 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6-r2.ebuild, + git-9999.ebuild: + Bug #298390: All the Subversion ebuilds now offer perl, so we can USE-dep + on it. + +*git-1.6.6-r1 (26 Dec 2009) + + 26 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6-r1.ebuild, + +files/git-1.6.6-always-install-js.patch, git-9999.ebuild: + Bug #298277: Fixup JS install for Gitweb. Also port all recent fixes to + the live ebuild. + +*git-1.6.6 (24 Dec 2009) + + 24 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6.ebuild: + Version bump. + +*git-1.6.6_rc4 (21 Dec 2009) + + 21 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6_rc4.ebuild: + Version bump. + +*git-1.6.6_rc3 (17 Dec 2009) + + 17 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.6_rc3.ebuild: + Version bump for the upstream rc. + +*git-1.6.5.7 (17 Dec 2009) + + 17 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.7.ebuild: + Version bump and fix bug #296310 for Perl 5.10 users. + +*git-1.6.5.6 (11 Dec 2009) + + 11 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.6.ebuild: + version bump + +*git-1.6.5.5 (06 Dec 2009) + + 06 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.5.ebuild: + Version bump. + +*git-1.6.5.4 (03 Dec 2009) + + 03 Dec 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.4.ebuild: + Version bump. + + 18 Nov 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.5.1-r1.ebuild, + git-1.6.5.2.ebuild, git-1.6.5.3.ebuild: + Add ~alpha/~ia64 wrt #290163 + + 17 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5.3.ebuild: + Bug #290163: rekeyword for arm. Tested on mv78100. + + 17 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5.3.ebuild: + Bug #290465: uclibc needs an additional define to select a codepath that + it will compile against. + + 17 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5.3.ebuild: + Bug #290131: cpio is only needed for building git-gui now, and nothing + else at runtime. + +*git-1.6.5.3 (17 Nov 2009) + + 17 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.3.ebuild: + Version bump. Testcases updated to run a working subset with + FEATURES=-userpriv per bug #292865. + + 16 Nov 2009; Jeremy Olexa <darkside@gentoo.org> git-1.6.3.1.ebuild, + git-1.6.3.3.ebuild, git-1.6.3.4.ebuild, git-1.6.4.ebuild, + git-1.6.4.1.ebuild, git-1.6.4.2.ebuild, git-1.6.4.3.ebuild, + git-1.6.4.4.ebuild, git-1.6.5_rc1.ebuild, git-1.6.5_rc2.ebuild, + git-1.6.5.ebuild, git-1.6.5.1.ebuild, git-1.6.5.1-r1.ebuild, + git-1.6.5.2.ebuild, git-9999.ebuild: + Since app-misc/git was removed from the tree, remove that invalid atom + from the CDEPEND variable in dev-util/git ebuilds + +*git-1.6.5.2 (30 Oct 2009) + + 30 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.2.ebuild: + Bug #291107: version bump. + + 23 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5_rc2.ebuild, + git-1.6.5.ebuild, git-1.6.5.1.ebuild, git-1.6.5.1-r1.ebuild, + git-9999.ebuild: + USE-default on doc was unpopular, and got even more so with USE=doc now + bringing in dependencies. Turn off the default. + +*git-1.6.5.1-r1 (22 Oct 2009) + + 22 Oct 2009; Sebastian Pipping <sping@gentoo.org> +git-1.6.5.1-r1.ebuild, + git-9999.ebuild: + Build and install info pages (bug 287112), add dependency on texinfo, drop + keywords: alpha arm ia64 ppc64 + + 22 Oct 2009; Tobias Klausmann <klausman@gentoo.org> git-1.6.4.4.ebuild: + Added two more test sets to the black list for UID-0 testing + +*git-1.6.5.1 (18 Oct 2009) + + 18 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.1.ebuild: + Version bump + + 12 Oct 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.4.4.ebuild: + ia64/s390/sh/sparc stable wrt #287031 + +*git-1.6.5 (11 Oct 2009) + + 11 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.ebuild, + git-9999.ebuild: + Version bump. Bug #287101: fix manpage formatting. Bug #287104: build + manpages as needed. + + 11 Oct 2009; Tobias Klausmann <klausman@gentoo.org> git-1.6.4.4.ebuild: + Stable on alpha, bug #287031 + + 09 Oct 2009; Markus Meier <maekke@gentoo.org> git-1.6.4.4.ebuild: + arm/x86 stable, bug #287031 + + 09 Oct 2009; Markus Meier <maekke@gentoo.org> git-1.6.3.1.ebuild, + git-1.6.3.3.ebuild, git-1.6.3.4.ebuild, git-1.6.4.ebuild, + git-1.6.4.1.ebuild, git-1.6.4.2.ebuild, git-1.6.4.3.ebuild, + git-1.6.4.4.ebuild, git-1.6.5_rc1.ebuild, git-1.6.5_rc2.ebuild, + git-9999.ebuild: + fix dev-util/cvs detection in src_test due to built_with_use change for + non-existant package + + 02 Oct 2009; Joseph Jezak <josejx@gentoo.org> git-1.6.4.4.ebuild: + Marked ppc/ppc64 stable for bug #287031. + + 01 Oct 2009; Jeroen Roovers <jer@gentoo.org> git-1.6.4.4.ebuild: + Stable for HPPA (bug #287031). + + 30 Sep 2009; Dawid Węgliński <cla@gentoo.org> git-1.6.4.4.ebuild: + Stable on amd64 (bu #287031) + + 30 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.5_rc2.ebuild: + No git-svn by default. + +*git-1.6.5_rc2 (29 Sep 2009) + + 29 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5_rc2.ebuild, + git-9999.ebuild, metadata.xml: + Version bump again. Also handle bug #285238 to use the new SHA1 + implementation by default (and add other IUSE defaults too). + +*git-1.6.4.4 (18 Sep 2009) + + 18 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.4.ebuild: + Bug #285418: Version bump + + 16 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.3.1.ebuild, + git-1.6.3.3.ebuild, git-1.6.3.4.ebuild, git-1.6.4.ebuild, + git-1.6.4.1.ebuild, git-1.6.4.2.ebuild, git-1.6.4.3.ebuild, + git-1.6.5_rc1.ebuild, git-9999.ebuild: + Bug #283732: Perl module should be installed to vendor_perl instead of + site_perl. + + 16 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.3.1.ebuild, + git-1.6.3.3.ebuild, git-1.6.3.4.ebuild, git-1.6.4.ebuild, + git-1.6.4.1.ebuild, git-1.6.4.2.ebuild, git-1.6.4.3.ebuild, + git-1.6.5_rc1.ebuild: + Bug #278738: Do not use FEATURES. + + 16 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.3.1.ebuild, + git-1.6.3.3.ebuild, git-1.6.3.4.ebuild, git-1.6.4.ebuild, + git-1.6.4.1.ebuild, git-1.6.4.2.ebuild, git-1.6.4.3.ebuild, + git-1.6.5_rc1.ebuild, git-9999.ebuild: + Bug #267853: Update deps for gtksourceviewer with newer GNOME. + +*git-1.6.5_rc1 (13 Sep 2009) + + 13 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5_rc1.ebuild: + Version bump + +*git-1.6.4.3 (13 Sep 2009) + + 13 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.3.ebuild: + Version bump + +*git-1.6.4.2 (30 Aug 2009) + + 30 Aug 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.2.ebuild: + Version bump. + +*git-1.6.4.1 (27 Aug 2009) + + 27 Aug 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.4.1.ebuild: + Bug #282667: version bump. + + 30 Jul 2009; Robin H. Johnson <robbat2@gentoo.org> + -files/20080626-git-1.5.6.1-noperl.patch, + -files/20081123-git-1.6.0.4-noperl-cvsserver.patch, -git-1.6.0.6.ebuild, + -git-1.6.1.ebuild, -git-1.6.1.1.ebuild, + -files/20090126-git-1.6.1.1-noperl.patch, -git-1.6.1.2.ebuild, + -git-1.6.1.3.ebuild, -git-1.6.2.ebuild, -git-1.6.2.2.ebuild, + -git-1.6.2.2-r1.ebuild, -git-1.6.2.3.ebuild, -git-1.6.2.5.ebuild, + -git-1.6.2.5-r1.ebuild, -files/20090505-git-1.6.2.5-getopt-fixes.patch, + -files/20090305-git-1.6.2-noperl.patch, -git-1.6.3.ebuild, + -files/vim-ftdetect-gitcommit.vim: + Trim old version. + +*git-1.6.4 (29 Jul 2009) +*git-1.6.3.4 (29 Jul 2009) + + 29 Jul 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3.4.ebuild, + +git-1.6.4.ebuild: + New upstream releases. + + 30 Jun 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.3.3.ebuild: + arm/ia64/s390/sh/sparc stable wrt #273905 + + 27 Jun 2009; Brent Baude <ranger@gentoo.org> git-1.6.3.3.ebuild: + Marking git-1.6.3.3 ppc64 and ppc for bug 273905 + + 27 Jun 2009; Christian Faulhammer <fauli@gentoo.org> git-1.6.3.3.ebuild: + stable x86, security bug 273905 + + 26 Jun 2009; Tobias Heinlein <keytoaster@gentoo.org> git-1.6.3.3.ebuild: + amd64 stable, security bug ##273905 + + 26 Jun 2009; Tobias Klausmann <klausman@gentoo.org> git-1.6.3.3.ebuild: + Stable on alpha, bug #273905 + + 24 Jun 2009; Jeroen Roovers <jer@gentoo.org> git-1.6.3.3.ebuild: + Stable for HPPA (bug #273905). + +*git-1.6.3.3 (22 Jun 2009) + + 22 Jun 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3.3.ebuild: + Version bump per bugs 274608 and 273905, has DoS fixes for gid-daemon. + +*git-1.6.3.1 (18 May 2009) + + 18 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3.1.ebuild: + Version bump. + + 10 May 2009; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild: + getopt fixes in HEAD. + + 08 May 2009; Robin H. Johnson <robbat2@gentoo.org> +files/50git-gentoo.el: + Accidently removed a used file. + + 08 May 2009; Robin H. Johnson <robbat2@gentoo.org> -git-1.5.1.6.ebuild, + -git-1.5.3.7-r1.ebuild, -git-1.5.3.8.ebuild, + -files/git-1.5.3.8-t9101.patch, -files/git-1.5.3.8-t9106.patch, + -files/20080322-git-1.5.4.4-noperl.patch, -git-1.5.5.4.ebuild, + -files/70git-gentoo.el, -files/git-1.5.0-symlinks.patch, + -git-1.5.4.5.ebuild, -files/20080423-git-1.5.5.1-noperl.patch, + -git-1.5.5.3.ebuild, -git-1.5.5.3-r1.ebuild, + -files/20080528-git-1.5.5.3-noperl.patch, -git-1.5.6.1.ebuild, + -files/50git-gentoo.el, -git-1.5.6.2.ebuild, -files/72git-gentoo.el, + -files/git-1.5.3-symlinks.patch, -git-1.5.6.3.ebuild, -git-1.5.6.4.ebuild, + -git-1.5.6.5.ebuild, -git-1.6.0.ebuild, -git-1.6.0.1.ebuild, + -git-1.6.0.2.ebuild, -git-1.6.0.3.ebuild, -git-1.6.0.4.ebuild, + -git-1.6.0.4-r1.ebuild, -git-1.6.0.4-r2.ebuild, -git-1.6.3_rc4.ebuild: + Cleanup old ebuilds and files. + +*git-1.6.3 (08 May 2009) + + 08 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3.ebuild: + Version bump. + +*git-1.6.2.5-r1 (08 May 2009) + + 08 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.5-r1.ebuild: + Bug 268817: Accidently dropped the noperl patch, it's only merged in + upstreams 1.6.3.x series. + + 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.5.ebuild, + git-1.6.3_rc4.ebuild, git-9999.ebuild: + Fix bug #267853: dev-python/gtksourceview-python needed for gitview. + Update git-9999 for getopt fixes. + + 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.5.ebuild, + git-1.6.3_rc4.ebuild: + Backport a fix from the live ebuild. + + 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.5.ebuild, + +files/20090505-git-1.6.2.5-getopt-fixes.patch, git-1.6.3_rc4.ebuild: + Fix Getopt::Long usage bug, patch submitted to upstream as well. + +*git-1.6.2.5 (05 May 2009) + + 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.5.ebuild: + Version bump. + +*git-1.6.3_rc4 (05 May 2009) + + 05 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3_rc4.ebuild: + Version bump to release candidate for 1.6.3. In package.mask for the + moment. + +*git-1.6.2.3 (13 Apr 2009) + + 13 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.3.ebuild: + Version bump. + + 13 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.2-r1.ebuild, + git-9999.ebuild: + Bug #221179, do not install perl .packlist. + + 12 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.2-r1.ebuild, + git-9999.ebuild: + Manpages were missed in live ebuild. + + 05 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild: + Upstream is mergign the noperl patch now. + + 05 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild: + Forgot a bit. + + 05 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.2-r1.ebuild: + Refix bug #237210, missed a part. + +*git-9999 (03 Apr 2009) +*git-1.6.2.2-r1 (03 Apr 2009) + + 03 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.2-r1.ebuild, + +git-9999.ebuild: + Bug #238023 - add an scm-capable ebuild for Git, use it to tidy up the + ebuild a bit too. Based on the work by Sebastian Pipping + <webmaster@hartwork.org>. + +*git-1.6.2.2 (03 Apr 2009) + + 03 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.2.ebuild: + Version bump, also fixes bug #237210 for Emacs users. + + 03 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> + files/20090305-git-1.6.2-noperl.patch: + Fix testsuite functionality with USE=-perl, the add-interactive test uses + perl and was not excluded. + + 23 Mar 2009; Robin H. Johnson <robbat2@gentoo.org> metadata.xml: + Update metadata, ricmm is joining as a maintainer. + + 21 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> + metadata.xml: + Removing ferdy as a maintainer since he was retired. + + 06 Mar 2009; Christian Faulhammer <fauli@gentoo.org> git-1.6.2.ebuild: + fix HOMEPAGE + +*git-1.6.2 (06 Mar 2009) + + 06 Mar 2009; Robin H. Johnson <robbat2@gentoo.org> + +files/20090305-git-1.6.2-noperl.patch, +git-1.6.2.ebuild: + Version bump per bug #261241. Also fix bugs #256964, #238586. EAPI2 now in + use. + +*git-1.6.1.3 (11 Feb 2009) + + 11 Feb 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.1.3.ebuild: + Version bump. + +*git-1.6.1.2 (02 Feb 2009) + + 02 Feb 2009; Greg Kroah-Hartman <gregkh@gentoo.org> +git-1.6.1.2.ebuild: + version bump to 1.6.1.2 to fix pack-objects problem in 1.6.1.1 + +*git-1.6.1.1 (26 Jan 2009) + + 26 Jan 2009; Robin H. Johnson <robbat2@gentoo.org> + +files/20090126-git-1.6.1.1-noperl.patch, +git-1.6.1.1.ebuild: + Version bump. Also bug #254029 - fix noperl patch. + + 08 Jan 2009; Brent Baude <ranger@gentoo.org> git-1.6.0.6.ebuild: + Marking git-1.6.0.6 ppc64 for bug 251343 + +*git-1.6.1 (06 Jan 2009) + + 06 Jan 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.1.ebuild: + Version bump, bug 250321. + + 01 Jan 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.0.6.ebuild: + s390/sh stable wrt #251343 + + 29 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> git-1.6.0.6.ebuild: + ppc stable, bug #251343 + + 25 Dec 2008; Jeroen Roovers <jer@gentoo.org> git-1.6.0.6.ebuild: + Stable for HPPA (bug #251343). + + 23 Dec 2008; Raúl Porcel <armin76@gentoo.org> git-1.6.0.6.ebuild: + alpha/arm/ia64 stable wrt #251343 + + 23 Dec 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.6.0.6.ebuild: + Factor out the long emake invocation so that we can consistently call it + and avoid triggering a rebuild during install or test. + + 23 Dec 2008; Markus Meier <maekke@gentoo.org> git-1.6.0.6.ebuild: + amd64/x86 stable, bug #251343 + + 23 Dec 2008; Ferris McCormick <fmccor@gentoo.org> git-1.6.0.6.ebuild: + Sparc stable --- Security Bug #251343 --- all tests expected to pass do pass. + +*git-1.6.0.6 (23 Dec 2008) + + 23 Dec 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.6.ebuild: + Version bump. + + 27 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> files/git-daemon.initd: + Refix bug #238351 so that it works under baselayout1 and baselayout2. + +*git-1.6.0.4-r2 (24 Nov 2008) + + 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> files/git-daemon.initd, + +git-1.6.0.4-r2.ebuild: + Fix dumb typo, revbump to ensure any users that got the typo also get the + fix. + + 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> metadata.xml: + Document what USE=gtk does for Git. + + 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.6.0.4-r1.ebuild: + Bug #240280, fix to use CFLAGS/LDFLAGS better. + + 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.5.ebuild, + git-1.5.5.3.ebuild, git-1.5.5.3-r1.ebuild, git-1.5.5.4.ebuild, + git-1.5.6.1.ebuild, git-1.5.6.2.ebuild, git-1.5.6.3.ebuild, + git-1.5.6.4.ebuild, git-1.5.6.5.ebuild, git-1.6.0.ebuild, + git-1.6.0.1.ebuild, git-1.6.0.2.ebuild, git-1.6.0.3.ebuild, + git-1.6.0.4.ebuild, git-1.6.0.4-r1.ebuild: + Even better fixup for bug #238129. + + 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.6.0.4-r1.ebuild: + Bug #238586, issue a warning for dev-util/subversion[dso]. + + 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.5.ebuild, + git-1.5.5.3.ebuild, git-1.5.5.3-r1.ebuild, git-1.5.5.4.ebuild, + git-1.5.6.1.ebuild, git-1.5.6.2.ebuild, git-1.5.6.3.ebuild, + git-1.5.6.4.ebuild, git-1.5.6.5.ebuild, git-1.6.0.ebuild, + git-1.6.0.1.ebuild, git-1.6.0.2.ebuild, git-1.6.0.3.ebuild, + git-1.6.0.4.ebuild, git-1.6.0.4-r1.ebuild: + Bug #238129, the default behavior of built_with_use changed at some point. + We do not want to die, but just to print a warning. + +*git-1.6.0.4-r1 (24 Nov 2008) + + 24 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> +files/50git-gentoo.el, + +files/20081123-git-1.6.0.4-noperl-cvsserver.patch, + files/git-daemon.confd, files/git-daemon.initd, +git-1.6.0.4-r1.ebuild: + Fix bug #235393 for Emacs users. Fix bug #238351 for running the + standalone init.d more safely as non-root and include the pidfile. Bug + #247487, cvsserver now needs the Perl stuff. Bug #248446, fix htmldir + support. + +*git-1.6.0.4 (18 Nov 2008) + + 18 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.4.ebuild: + Bug #246244, version bump. + +*git-1.6.0.3 (29 Oct 2008) + + 29 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.3.ebuild: + Version bump. + +*git-1.6.0.2 (21 Sep 2008) + + 21 Sep 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.2.ebuild: + Version bump. + + 16 Sep 2008; Jeroen Roovers <jer@gentoo.org> git-1.5.6.4.ebuild: + Stable for HPPA (bug #234075). + + 16 Sep 2008; Robin H. Johnson <robbat2@gentoo.org> files/git-daemon.initd, + files/git-daemon.xinetd: + Git 1.6 requires that daemon been an argument not part of the name. + +*git-1.6.0.1 (30 Aug 2008) + + 30 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.1.ebuild: + Version bump, only bugfixes. + + 25 Aug 2008; Ulrich Mueller <ulm@gentoo.org> -files/71git-gentoo.el, + files/72git-gentoo.el: + Add comment in Emacs site-init file wrt bug 235393. Remove unused file. + + 27 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.6.4.ebuild, + git-1.5.6.5.ebuild, git-1.6.0.ebuild: + Remove references to dev-util/tla is latest stable and ~arch versions, per + bug #235681 + +*git-1.6.0 (24 Aug 2008) + + 24 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.0.ebuild: + Major version bump. Fixes bugs 219839, 225601 for userpriv during testing, + working subversion-1.5 support per bug 224185 and skips installing git-svn + when USE=-subversion per bug 233550. + +*git-1.5.6.5 (16 Aug 2008) + + 16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.6.5.ebuild: + Version bump. + + 16 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> metadata.xml: + Make repoman happy. + + 08 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org> git-1.5.6.4.ebuild: + ppc stable, bug #234075 + + 08 Aug 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.6.4.ebuild: + alpha/ia64 stable wrt #234075 + + 07 Aug 2008; Markus Meier <maekke@gentoo.org> git-1.5.6.4.ebuild: + x86 stable, bug #234075 + + 07 Aug 2008; Markus Rothe <corsair@gentoo.org> git-1.5.6.4.ebuild: + Stable on ppc64; bug #234075 + + 07 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org> git-1.5.6.4.ebuild: + stable amd64, bug #234075 + + 06 Aug 2008; Ferris McCormick <fmccor@gentoo.org> git-1.5.6.4.ebuild: + Sparc stable, security bug #234075 (good for about a week anyway). + +*git-1.5.6.4 (28 Jul 2008) + + 28 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.6.4.ebuild: + Version bump. + +*git-1.5.6.3 (17 Jul 2008) + + 17 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.6.3.ebuild: + Bug #232068, version bump. + +*git-1.5.6.2 (10 Jul 2008) + + 10 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.6.2.ebuild: + Version bump per bug #231380. + +*git-1.5.6.1 (26 Jun 2008) + + 26 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> + +files/20080626-git-1.5.6.1-noperl.patch, +git-1.5.6.1.ebuild: + Version bump. + + 24 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.5.4.ebuild: + Fix bug thanks to compnerd. + + 11 Jun 2008; nixnut <nixnut@gentoo.org> git-1.5.4.5.ebuild: + Stable on ppc wrt bug 225231 + + 11 Jun 2008; Kenneth Prugh <ken69267@gentoo.org> git-1.5.4.5.ebuild: + amd64 stable, bug #225231 + +*git-1.5.5.4 (11 Jun 2008) + + 11 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.5.4.ebuild: + Version bump. + + 10 Jun 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.4.5.ebuild: + alpha/ia64/sparc/x86 stable wrt #225231 + + 09 Jun 2008; Brent Baude <ranger@gentoo.org> git-1.5.4.5.ebuild: + stable ppc64, bug 225231 + +*git-1.5.5.3-r1 (07 Jun 2008) + + 07 Jun 2008; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.2.5.ebuild, + -git-1.5.4.ebuild, -git-1.5.4.2.ebuild, -git-1.5.4.3.ebuild, + -git-1.5.4.4.ebuild, -git-1.5.4.4-r1.ebuild, -git-1.5.5.1.ebuild, + -git-1.5.5.1-r1.ebuild, +git-1.5.5.3-r1.ebuild: + Remove unneeded patches to Makefile. Stop die'ing upon a bad USE + configuration by taking a sane decision. Remove unused versions. + + 28 May 2008; Robin H. Johnson <robbat2@gentoo.org> + files/20080528-git-1.5.5.3-noperl.patch: + Forgot to add doc at the top of the new patch. + +*git-1.5.5.3 (28 May 2008) + + 28 May 2008; Robin H. Johnson <robbat2@gentoo.org> + +files/20080528-git-1.5.5.3-noperl.patch, + +files/vim-ftdetect-gitcommit.vim, +git-1.5.5.3.ebuild: + Version bump, 1.5.5 series is pretty ready for primetime. + +*git-1.5.5.1-r1 (29 Apr 2008) + + 29 Apr 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.5.1-r1.ebuild: + The gitweb.cgi did not contain the build-time replacements. Ensure that it + does, and also make it executable by default so that portage does not + strip the executability on upgrade. + + 24 Apr 2008; Robin H. Johnson <robbat2@gentoo.org> + +files/20080322-git-1.5.4.4-noperl.patch, + -files/20080322-git-1.5.5.4-noperl.patch, git-1.5.4.4-r1.ebuild, + git-1.5.4.5.ebuild: + Fix bad numbering of file. + + 24 Apr 2008; Robin H. Johnson <robbat2@gentoo.org> + files/20080423-git-1.5.5.1-noperl.patch: + No absolute paths in patches! Bug #219099. + +*git-1.5.5.1 (24 Apr 2008) + + 24 Apr 2008; Robin H. Johnson <robbat2@gentoo.org> + +files/20080423-git-1.5.5.1-noperl.patch, +git-1.5.5.1.ebuild: + Bump to 1.5.5.1 per bug 217593, noperl patch ported by dberkholz. + +*git-1.5.4.5 (29 Mar 2008) + + 29 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4.5.ebuild: + Version bump. + + 24 Mar 2008; Raúl Porcel <armin76@gentoo.org> git-1.5.4.4-r1.ebuild: + Re-add ~ia64 wrt #214464 + +*git-1.5.4.4-r1 (24 Mar 2008) + + 24 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> + +files/20080322-git-1.5.5.4-noperl.patch, +git-1.5.4.4-r1.ebuild: + Per bug 214168, some users are really picky about wanting a Perl-free Git. + This new revision makes that a possibility, and now also introduces most + of the dependancies that were only previously stated in the pkg_postinst + phase. The following arch keywords have been dropped per bug 214464 until + the arches can keyword the dependancies: arm, ia64, s390, sh. + + 20 Mar 2008; Mike Frysinger <vapier@gentoo.org> git-1.5.4.4.ebuild: + Add support for USE=xinetd #213014. + + 20 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.4.ebuild: + The base Git.pm module now requires dev-perl/Error, so it is no longer + optional under USE=perl. dev-perl/Net-SMTP-SSL remains optional as it is + only used for git-send-email. + + 17 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.4.4.ebuild: + dev-perl/Authen-SASL is an indirect dependancy of Net-SMTP-SSL already w/ + USE=sasl, so we can skip it here. + +*git-1.5.4.4 (17 Mar 2008) + + 17 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4.4.ebuild: + Version bump, fixing bugs #213549, #213543, #212131. + +*git-1.5.4.3 (27 Feb 2008) + + 27 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4.3.ebuild: + Version bump. + +*git-1.5.4.2 (17 Feb 2008) + + 17 Feb 2008; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.4.2.ebuild: + New upstream version + + 11 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> git-1.5.4.ebuild: + Fix sed for LDFLAGS, and make CFLAGS sed as robust as that. + + 03 Feb 2008; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.4.ebuild: + Add USE=threads as per bug #208422 + +*git-1.5.4 (03 Feb 2008) + + 03 Feb 2008; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.4_rc2.ebuild, + -git-1.5.4_rc3.ebuild, -git-1.5.4_rc4.ebuild, +git-1.5.4.ebuild: + New upstream version. Remove RCs for 1.5.4 + + 01 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> git-1.5.2.5.ebuild, + git-1.5.3.7-r1.ebuild, git-1.5.3.8.ebuild, git-1.5.4_rc2.ebuild, + git-1.5.4_rc3.ebuild, git-1.5.4_rc4.ebuild: + Clarify the extra deps for git-svnimport. + +*git-1.5.4_rc4 (01 Feb 2008) + + 01 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc4.ebuild: + Version bump. + + 14 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org> + git-1.5.3.7-r1.ebuild: + ppc. stable + +*git-1.5.4_rc3 (14 Jan 2008) + + 14 Jan 2008; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc3.ebuild: + Bump the release candidate for more testing. + + 13 Jan 2008; Fernando J. Pereda <ferdy@gentoo.org> + +files/git-1.5.3.8-t9101.patch, git-1.5.3.8.ebuild: + Add a fix for some test cases under subversion 1.4.6 + +*git-1.5.3.8 (10 Jan 2008) + + 10 Jan 2008; Fernando J. Pereda <ferdy@gentoo.org> + +files/git-1.5.3.8-t9106.patch, -git-1.5.3.2.ebuild, -git-1.5.3.3.ebuild, + -git-1.5.3.4.ebuild, -git-1.5.3.4-r1.ebuild, -git-1.5.3.5.ebuild, + -git-1.5.3.6.ebuild, -git-1.5.3.6-r1.ebuild, -git-1.5.3.7.ebuild, + +git-1.5.3.8.ebuild, -git-1.5.4_rc0.ebuild, -git-1.5.4_rc1.ebuild, + git-1.5.4_rc2.ebuild: + Version bump. Fix some bugs and style nits. Remove unneeded verbosity. + Remove unused versions. + +*git-1.5.4_rc2 (01 Jan 2008) + + 01 Jan 2008; Markus Ullmann <jokey@gentoo.org> +git-1.5.4_rc2.ebuild: + Version bump, granted by robbat2 as test-suite passes + + 29 Dec 2007; <welp@gentoo.org> git-1.5.4_rc1.ebuild: + Keyworded ~sparc-fbsd; bug 203655 + + 27 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild: + Stable on amd64. Tested by myself and gentoofan23. + + 25 Dec 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.3.7-r1.ebuild: + alpha/ia64/sparc/x86 stable wrt #202383 + + 25 Dec 2007; Brent Baude <ranger@gentoo.org> git-1.5.3.7-r1.ebuild: + Marking git-1.5.3.7-r1 ppc64 for bug 203283 + + 25 Dec 2007; nixnut <nixnut@gentoo.org> ChangeLog: + Stable on ppc wrt bug 203283 + + 25 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild, + git-1.5.4_rc0.ebuild, git-1.5.4_rc1.ebuild: + Bug 201544: Use the proper build mechanism to disable the Tk-using sections + of git. + +*git-1.5.4_rc1 (25 Dec 2007) + + 25 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc1.ebuild: + Add latest rc from upstream. + + 25 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild, + git-1.5.4_rc0.ebuild: + Install the git-p4 tool and the import-tars tool. + + 17 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.1.6.ebuild, + git-1.5.2.5.ebuild, git-1.5.3.2.ebuild, git-1.5.3.3.ebuild, + git-1.5.3.4.ebuild, git-1.5.3.4-r1.ebuild, git-1.5.3.5.ebuild, + git-1.5.3.6.ebuild, git-1.5.3.6-r1.ebuild, git-1.5.3.7.ebuild, + git-1.5.3.7-r1.ebuild, git-1.5.4_rc0.ebuild: + Clean up all minorsyn problems with ebuilds. + +*git-1.5.4_rc0 (17 Dec 2007) + + 17 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.4_rc0.ebuild: + Version bump. rc0 is for testing only, not production uage. Masked via + package.mask. + + 06 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild: + Fix typo. + +*git-1.5.3.7-r1 (06 Dec 2007) + + 06 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.3.7-r1.ebuild: + Install the gitweb stuff, as it's used by instaweb, and is also + independantly useful, but does not lend itself to webapp-config very well. + +*git-1.5.3.7 (05 Dec 2007) + + 05 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.3.7.ebuild: + Version bump. Please note that the CVS testcases are disabled unless you + have FEATURES=userpriv, as CVS rejects commits as root. + +*git-1.5.3.6-r1 (22 Nov 2007) + + 22 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.3.6-r1.ebuild: + Add missing cpio dependancy, redo the documentation install so that the text + versions and (optionally) HTML versions are installed including the release + notes. Also install some new bits from contrib: blameview, + continuous-integration, remotes2config. + +*git-1.5.3.6 (20 Nov 2007) + + 20 Nov 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.6.ebuild: + New upstream version + +*git-1.5.3.5 (14 Nov 2007) + + 14 Nov 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.5.ebuild: + Version bump (bug #198903) + + 19 Oct 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.3.4-r1.ebuild: + vim-plugin.eclass pulls in vim, that is not desired. Revert that change for now + +*git-1.5.3.4-r1 (19 Oct 2007) + + 19 Oct 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.4-r1.ebuild: + Install vim and some stuff from contrib (related: bug #194940) + + 05 Oct 2007; Mike Frysinger <vapier@gentoo.org> git-1.5.3.4.ebuild: + Fix incorrect binding of iconv<->uclibc. + +*git-1.5.3.4 (04 Oct 2007) + + 04 Oct 2007; Fernando J. Pereda <ferdy@gentoo.org> +files/72git-gentoo.el, + +git-1.5.3.4.ebuild: + New upstream version. Include fixes from bug #194690 thanks to Christian + Faulhammer <opfer@gentoo.org> + +*git-1.5.3.3 (30 Sep 2007) + + 30 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.3.ebuild: + New upstream version + + 28 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.3.ebuild: + Remove 1.5.3 + + 28 Sep 2007; Joshua Kinard <kumba@gentoo.org> git-1.5.2.5.ebuild: + Stable on mips, per #193113. + + 20 Sep 2007; Christoph Mende <angelos@gentoo.org> git-1.5.2.5.ebuild: + Stable on amd64 wrt bug #193113 + + 20 Sep 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.2.5.ebuild: + alpha/ia64 stable wrt #193113 + + 20 Sep 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.2.5.ebuild: + Stable for SPARC (bug #193113). + + 20 Sep 2007; Brent Baude <ranger@gentoo.org> git-1.5.2.5.ebuild: + Marking git-1.5.2.5 ppc64 for bug 193113 + + 19 Sep 2007; Lars Weiler <pylon@gentoo.org> git-1.5.2.5.ebuild: + Stable on ppc; bug #193113. + + 19 Sep 2007; Markus Meier <maekke@gentoo.org> git-1.5.2.5.ebuild: + x86 stable, bug #193113 + +*git-1.5.3.2 (19 Sep 2007) + + 19 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3.2.ebuild: + New upstream version + +*git-1.5.3 (02 Sep 2007) + + 02 Sep 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.3_rc7.ebuild, + +git-1.5.3.ebuild: + New upstream version. Remove rc7 + +*git-1.5.3_rc7 (29 Aug 2007) + + 29 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> + -files/git-1.5.3_rc5-read-tree.patch, -git-1.5.3_rc5-r1.ebuild, + +git-1.5.3_rc7.ebuild: + New upstream version. Remove rc5 + + 24 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.2.4.ebuild, + -git-1.5.3_rc4.ebuild: + Remove unused obsoleted versions + +*git-1.5.2.5 (15 Aug 2007) + + 15 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.2.5.ebuild: + New maintenance version for 1.5.2 series + +*git-1.5.3_rc5-r1 (15 Aug 2007) + + 15 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> + +files/git-1.5.3_rc5-read-tree.patch, -git-1.5.3_rc5.ebuild, + +git-1.5.3_rc5-r1.ebuild: + Add a patch to fix a segfault in rc5. Remove the buggy version. rc4 is safe. + +*git-1.5.3_rc5 (15 Aug 2007) + + 15 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.3_rc5.ebuild: + New upstream version. + + 13 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> + -files/git-1.5.2-tempfile.patch, -git-1.5.0.7.ebuild, -git-1.5.2.ebuild, + -git-1.5.2.1.ebuild, -git-1.5.2.2.ebuild: + Remove old and unused stuff + +*git-1.5.3_rc4 (08 Aug 2007) + + 08 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> + +files/git-1.5.3-symlinks.patch, +git-1.5.3_rc4.ebuild: + Version bump + + 29 Jul 2007; Christian Heim <phreak@gentoo.org> git-1.5.0.7.ebuild, + git-1.5.1.6.ebuild, git-1.5.2.ebuild, git-1.5.2.1.ebuild, + git-1.5.2.2.ebuild, git-1.5.2.4.ebuild: + Fixing the DEPEND/RDEPEND for the move of net-www/apache to + www-servers/apache (#78622). + +*git-1.5.2.4 (27 Jul 2007) + + 27 Jul 2007; Robin H. Johnson <robbat2@gentoo.org> metadata.xml, + git-1.5.0.7.ebuild, git-1.5.1.6.ebuild, git-1.5.2.ebuild, + git-1.5.2.1.ebuild, git-1.5.2.2.ebuild, +git-1.5.2.4.ebuild: + Add new upstream version, and also improve the DESCRIPTION per bug #185057, + and the longdescription in metadata at the same time. + + 25 Jun 2007; Joshua Kinard <kumba@gentoo.org> git-1.5.1.6.ebuild: + Stable on mips, per #179245. + + 23 Jun 2007; Matti Bickel <mabi@gentoo.org> git-1.5.1.6.ebuild: + ppc stable (bug #179245) + +*git-1.5.2.2 (16 Jun 2007) + + 16 Jun 2007; Fernando J. Pereda <ferdy@gentoo.org> +files/71git-gentoo.el, + +git-1.5.2.2.ebuild: + New upstream version. Fix for bug #181718 + + 14 Jun 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.1.6.ebuild: + Stable for HPPA (bug #179245). + +*git-1.5.2.1 (04 Jun 2007) + + 04 Jun 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.2.1.ebuild: + New upstream version + + 31 May 2007; Daniel Gryniewicz <dang@gentoo.org> git-1.5.1.6.ebuild: + Marked stable on amd64 for bug #179245 + + 28 May 2007; Brent Baude <ranger@gentoo.org> git-1.5.1.6.ebuild: + Marking git-1.5.1.6 ppc64 stable for bug 179245 + + 24 May 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.1.6.ebuild: + ia64 + x86 stable wrt #179245 + + 23 May 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.2.ebuild: + Add dev-perl/TermReadKey for git-svn. Fixes bug #179560 + + 23 May 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.1.6.ebuild: + Stable on alpha as per bug #179245 + + 23 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> git-1.5.1.6.ebuild: + Stable on sparc wrt #179245 + + 21 May 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.1.6.ebuild: + Reverting to ~hppa. + + 21 May 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.1.6.ebuild: + Stable for HPPA (bug #179245). + +*git-1.5.2 (20 May 2007) +*git-1.5.1.6 (20 May 2007) + + 20 May 2007; Fernando J. Pereda <ferdy@gentoo.org> + +files/git-1.5.2-tempfile.patch, -git-1.5.1.2.ebuild, -git-1.5.1.3.ebuild, + -git-1.5.1.4.ebuild, -git-1.5.1.5.ebuild, +git-1.5.1.6.ebuild, + +git-1.5.2.ebuild: + New upstream versions. Remove old ones. + +*git-1.5.1.5 (19 May 2007) + + 19 May 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.1.5.ebuild: + New upstream version. Fixes bug #177280. + +*git-1.5.1.4 (09 May 2007) + + 09 May 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.1.4.ebuild: + Version bump. + +*git-1.5.1.3 (01 May 2007) + + 01 May 2007; Robin H. Johnson <robbat2@gentoo.org> +git-1.5.1.3.ebuild: + Version bump. + + 24 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.1.1.ebuild, + -git-1.4.4.4.ebuild, -git-1.5.1.1.ebuild: + Remove unused stuff + + 23 Apr 2007; Bryan Østergaard <kloeri@gentoo.org> git-1.5.0.7.ebuild: + Stable on Mips, bug 173327. + +*git-1.5.1.2 (23 Apr 2007) + + 23 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.1.2.ebuild: + New upstream version. + +*git-1.5.1.1 (12 Apr 2007) + + 12 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.1.ebuild, + +git-1.5.1.1.ebuild: + New upstream version, superceeds 1.5.1 + + 11 Apr 2007; Christian Faulhammer <opfer@gentoo.org> git-1.5.0.7.ebuild: + stable amd64, bug 173327 + + 08 Apr 2007; Markus Rothe <corsair@gentoo.org> git-1.5.0.7.ebuild: + Stable on ppc64; bug #173327 + + 06 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> git-1.5.0.7.ebuild: + ppc stable + + 04 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.0.7.ebuild: + Stable on alpha wrt bug #173327 + + 04 Apr 2007; Jeroen Roovers <jer@gentoo.org> git-1.5.0.7.ebuild: + Stable for HPPA (bug #173327). + + 04 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> git-1.5.0.7.ebuild: + Stable on sparc wrt #173327 + + 04 Apr 2007; Raúl Porcel <armin76@gentoo.org> git-1.5.0.7.ebuild: + ia64 + x86 stable wrt bug 173327 + + 04 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.2.4.ebuild, + -git-1.4.4.3.ebuild: + Remove unused versions. + +*git-1.5.1 (04 Apr 2007) +*git-1.5.0.7 (04 Apr 2007) + + 04 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.6.ebuild, + +git-1.5.0.7.ebuild, +git-1.5.1.ebuild: + Revision and version bump. Remove 1.5.0.6 + +*git-1.5.0.6 (29 Mar 2007) + + 29 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.5.ebuild, + +git-1.5.0.6.ebuild: + New upstream version. Remove 1.5.0.5 + +*git-1.5.0.5 (19 Mar 2007) + + 19 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.4.ebuild, + +git-1.5.0.5.ebuild: + New upstream version. Remove old one. + +*git-1.5.0.4 (16 Mar 2007) + + 16 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.3.ebuild, + -git-1.5.0.3-r1.ebuild, +git-1.5.0.4.ebuild: + New upstream version. Remove old ones. + +*git-1.5.0.3-r1 (11 Mar 2007) + + 11 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> + +files/git-1.5.0-symlinks.patch, +git-1.5.0.3-r1.ebuild: + Create relative symlinks instead of absolute ones. + +*git-1.5.0.3 (09 Mar 2007) + + 09 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.2.ebuild, + +git-1.5.0.3.ebuild: + New upstream version. Fix for bug #170066. Remove old version. + +*git-1.5.0.2 (27 Feb 2007) + + 27 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.1.ebuild, + +git-1.5.0.2.ebuild: + New upstream version. Remove .1 since it is buggy + + 20 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.ebuild: + Remove unused version, superceed by 1.5.0.1 + +*git-1.5.0.1 (19 Feb 2007) + + 19 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.0.1.ebuild: + New upstream version. + + 15 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.5.0.ebuild: + Add a showpkgdeps message for git send-email. Fixes bug #167058. Reported by + Christian Schlotter <again@gmx.de> + +*git-1.5.0 (14 Feb 2007) + + 14 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.5.0.ebuild: + New upstream version. + + 15 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> git-1.4.4.4.ebuild: + Stable on sparc wrt #159822 + + 15 Jan 2007; Jeroen Roovers <jer@gentoo.org> git-1.4.4.4.ebuild: + Stable for HPPA (bug #159822). + + 15 Jan 2007; Steve Dibb <beandog@gentoo.org> git-1.4.4.4.ebuild: + amd64 stable, bug 159822 + + 14 Jan 2007; Markus Rothe <corsair@gentoo.org> git-1.4.4.4.ebuild: + Stable on ppc64; bug #159822 + + 13 Jan 2007; Andrej Kacian <ticho@gentoo.org> git-1.4.4.4.ebuild: + Stable on x86, bug #159822. + + 13 Jan 2007; nixnut <nixnut@gentoo.org> git-1.4.4.4.ebuild: + Stable on ppc wrt bug 159822 + +*git-1.4.4.4 (12 Jan 2007) + + 12 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.4.ebuild: + Version bump + stable on Alpha. See bug #159822 + + 09 Jan 2007; Markus Rothe <corsair@gentoo.org> git-1.4.4.3.ebuild: + Stable on ppc64; bug #159822 + + 07 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org> git-1.4.4.3.ebuild: + ppc stable, bug #159822 + + 06 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.5.ebuild, + -git-1.4.4.2.ebuild: + QA: Clean unused versions. + + 06 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.1.1.ebuild, + git-1.4.2.4.ebuild, git-1.4.3.5.ebuild, git-1.4.4.2.ebuild, + git-1.4.4.3.ebuild: + einfo -> elog + + 04 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> git-1.4.4.3.ebuild: + Stable on IA64. + + 04 Jan 2007; Torsten Veller <tove@gentoo.org> git-1.4.4.3.ebuild: + Stable on x86 (#159822) + + 04 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.4.3.ebuild: + Stable on alpha as per bug #159822 + + 04 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> git-1.4.4.3.ebuild: + Stable on sparc wrt #159822 + + 03 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.4.3.ebuild: + git-instaweb has some additional dependencies, fixes bug #159698 + + 31 Dec 2006; Robin H. Johnson <robbat2@gentoo.org> git-1.4.3.5.ebuild, + git-1.4.4.2.ebuild, git-1.4.4.3.ebuild: + Fix type in einfo. + +*git-1.4.4.3 (20 Dec 2006) + + 20 Dec 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.3.ebuild: + New upstream version. + +*git-1.4.4.2 (07 Dec 2006) + + 07 Dec 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.4.ebuild, + -git-1.4.4.1.ebuild, +git-1.4.4.2.ebuild: + New upstream version. Clean old ebuilds for the 1.4.4 branch. + +*git-1.4.4.1 (26 Nov 2006) + + 26 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.1.ebuild: + New upstream version. + + 16 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.4.ebuild: + Remove tar-tree tests if we don't have unzip installed. + +*git-1.4.4 (15 Nov 2006) + + 15 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.4.ebuild: + New upstream version. + +*git-1.4.3.5 (12 Nov 2006) + + 12 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.4.ebuild, + +git-1.4.3.5.ebuild: + New upstream version, superceeds 1.4.3.4 + + 09 Nov 2006; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org> + git-1.4.3.4.ebuild: + Add ~mips to keywords + + 08 Nov 2006; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org> + git-1.4.1.1.ebuild: + Stable on mips + +*git-1.4.3.4 (05 Nov 2006) + + 05 Nov 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.3.ebuild, + +git-1.4.3.4.ebuild: + New upstream version. + +*git-1.4.3.3 (30 Oct 2006) + + 30 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.2.ebuild, + +git-1.4.3.3.ebuild: + New upstream version, remove old one. + + 28 Oct 2006; Christian Faulhammer <opfer@gentoo.org> git-1.4.2.4.ebuild: + x86 stable wrt bug #151669 + +*git-1.4.3.2 (24 Oct 2006) + + 24 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.1.ebuild, + +git-1.4.3.2.ebuild: + New upstream version, remove buggy one. Also add a pkg_postinst message as + per bug #152320. + +*git-1.4.3.1 (21 Oct 2006) + + 21 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.3.ebuild, + +git-1.4.3.1.ebuild: + New upstream version, remove a buggy one. + + 21 Oct 2006; <nixnut@gentoo.org> git-1.4.2.4.ebuild: + Stable on ppc wrt bug 151669 + + 20 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.3.ebuild: + Add a needed fixlocalpod call to src_install spotted by Jakub Moc + <jakub@gentoo.org> + +*git-1.4.3 (19 Oct 2006) + + 19 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.1.6.ebuild, + +git-1.4.3.ebuild: + New upstream version. Remove ancient one (1.1.6) since It is no longer useful + + 18 Oct 2006; Patrick McLean <chutzpah@gentoo.org> git-1.4.2.4.ebuild: + Stable on amd64 (bug #151669). + + 17 Oct 2006; Jeroen Roovers <jer@gentoo.org> git-1.4.2.4.ebuild: + Stable for HPPA (bug #151669). + + 17 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.4.2.4.ebuild: + Stable on sparc wrt #151669 + + 17 Oct 2006; Markus Rothe <corsair@gentoo.org> git-1.4.2.4.ebuild: + Stable on ppc64; bug #151669 + + 17 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.4.ebuild: + Stable on alpha as per bug #151669 + +*git-1.4.2.4 (17 Oct 2006) + + 17 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.0-r1.ebuild, + -git-1.4.2.3.ebuild, +git-1.4.2.4.ebuild: + New upstream version. Remove old (1.4.0-r1) and buggy (1.4.2.3) ones. + + 04 Oct 2006; Fabian Groffen <grobian@gentoo.org> git-1.4.0-r1.ebuild, + git-1.4.1.1.ebuild, git-1.4.2.3.ebuild: + Dropped ~ppc-macos, see you in prefix. + +*git-1.4.2.3 (02 Oct 2006) + + 02 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.2.1.ebuild, + -git-1.4.2.2.ebuild, +git-1.4.2.3.ebuild: + New upstream version. Remove buggy ones. + +*git-1.4.2.2 (30 Sep 2006) + + 30 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.2.2.ebuild: + New upstream version. + + 27 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.4.2.ebuild: + Remove git-1.4.2 since it has a buggy builtin-mv command. + + 22 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.1.ebuild: + Typo fixed. Bug #148413 thanks to Jimmy.Jazz@gmx.net + + 13 Sep 2006; Aron Griffis <agriffis@gentoo.org> git-1.4.1.1.ebuild: + Mark 1.4.1.1 stable on ia64 + +*git-1.4.2.1 (13 Sep 2006) + + 13 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.2.1.ebuild: + New upstream version. + + 11 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> + +files/git-daemon.xinetd, git-1.4.2.ebuild: + Add a xinetd configuration file.As per bug #145177. Thanks to Patrick + Guimond <patg@patg.homeunix.org> + + 07 Sep 2006; Christel Dahlskjaer <christel@gentoo.org> git-1.4.1.1.ebuild: + Added ~mips, as per bug #126850 + + 15 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.ebuild: + Typo fixed: donsider -> consider + + 14 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.ebuild: + Only run git-svn tests if we have dev-util/subversion + + 14 Aug 2006; <dougg@gentoo.org> git-1.1.6.ebuild, git-1.4.0-r1.ebuild, + git-1.4.1.1.ebuild, git-1.4.2.ebuild: + fixing tcltk USE flag as per bug #17808 + + 13 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.2.ebuild: + app-editors/emacs -> virtual/emacs + +*git-1.4.2 (13 Aug 2006) + + 13 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.2.ebuild: + New upstream version. + + 12 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.4.ebuild, + -git-1.3.3.ebuild, -git-1.4.0.ebuild, -git-1.4.1.ebuild: + Clean old versions. + + 12 Aug 2006; Krzysiek Pawlik <nelchael@gentoo.org> git-1.4.1.1.ebuild: + Stable on x86, see bug #143586. + + 12 Aug 2006; Markus Rothe <corsair@gentoo.org> git-1.4.1.1.ebuild: + Stable on ppc64; bug #143586 + + 12 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.1.1.ebuild: + Add ( emacs? app-editors/emacs ) dependency since elisp-common.eclass + doesn't provide it. Thanks to nixnut@gentoo.org for noticing. + + 12 Aug 2006; Luca Barbato <lu_zero@gentoo.org> git-1.4.1.1.ebuild: + Marked ppc + + 11 Aug 2006; Jeroen Roovers <jer@gentoo.org> git-1.4.1.1.ebuild: + Stable for HPPA (bug #143586). + + 11 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.4.1.1.ebuild: + Stable on sparc wrt #143586 + + 11 Aug 2006; Daniel Gryniewicz <dang@gentoo.org> git-1.4.1.1.ebuild: + Marked stable on amd64 for + + 11 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.1.1.ebuild: + Stable on alpha wrt bug #143586 + + 08 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.4.1.1.ebuild: + Recommend dev-perl/libwww-perl to use git-svn. Fixes bug #142116. + +*git-1.4.1.1 (25 Jul 2006) + + 25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> +git-1.4.1.1.ebuild: + Version bump. + + 11 Jul 2006; Aron Griffis <agriffis@gentoo.org> git-1.4.0-r1.ebuild, + git-1.4.1.ebuild: + Mark 1.4.0-r1 stable on ia64, mark 1.4.1 ~ia64 + +*git-1.4.1 (02 Jul 2006) + + 02 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> +git-1.4.1.ebuild: + Version bump to version 1.4.1. No gitweb installed as of yet. + + 28 Jun 2006; Fabian Groffen <grobian@gentoo.org> git-1.4.0-r1.ebuild: + Marked ~ppc-macos + +*git-1.4.0-r1 (27 Jun 2006) + + 27 Jun 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.4.0-r1.ebuild: + Install gitview and git-svn. Fixes bug #137942, thanks to Nguyen Thai Ngoc + Duy <pclouds@gentoo.org>. + +*git-1.4.0 (10 Jun 2006) + + 10 Jun 2006; Fernando J. Pereda <ferdy@gentoo.org> metadata.xml, + -git-1.2.6.ebuild, -git-1.3.1.ebuild, -git-1.3.2.ebuild, + +git-1.4.0.ebuild: + New upstream version. Removed Carlos from metadata.xml as he requested. + Removed some old versions, too. + + 21 May 2006; Fernando J. Pereda <ferdy@gentoo.org> +files/70git-gentoo.el, + git-1.3.3.ebuild: + Add USE=emacs support. Patch by Christian Schlotter <again@gmx.de> in bug + #133883. + +*git-1.3.3 (17 May 2006) + + 17 May 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.3.3.ebuild: + New upstream version. + + 14 May 2006; Diego Pettenò <flameeyes@gentoo.org> git-1.3.2.ebuild: + Add ~x86-fbsd keyword. + +*git-1.3.2 (04 May 2006) + + 04 May 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.3.2.ebuild: + New upstream version. + +*git-1.3.1 (25 Apr 2006) + + 25 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.3.0-r1.ebuild, + +git-1.3.1.ebuild: + Version bump. Remove 1.3.0-r1. + + 21 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.2.4.ebuild: + Stable on hppa + +*git-1.3.0-r1 (19 Apr 2006) + + 19 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.3.0.ebuild, + +git-1.3.0-r1.ebuild: + Remove unneeded dependencies and add a new tarball with some late + documentation changes. Install git-send-email unconditionally since now it + doesn't require extra deps (the related USE-flag goes away). Inform about + git-cvsserver. Remove the buggy old one. + +*git-1.3.0 (18 Apr 2006) + + 18 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.3.0.ebuild: + New upstream version. + +*git-1.2.6 (08 Apr 2006) + + 08 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.5.ebuild, + +git-1.2.6.ebuild: + New upstream version. Removed 1.2.5 + +*git-1.2.5 (05 Apr 2006) + + 05 Apr 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.3.ebuild, + +git-1.2.5.ebuild: + New upstream version. Use the X use flag instead of tcltk. Remove 1.2.3. + + 22 Mar 2006; Luis Medinas <metalgod@gentoo.org> git-1.2.4.ebuild: + Stable on amd64. Bug #126850. + + 22 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.2.4.ebuild: + ~hppa blessing + + 20 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.2.4.ebuild: + Stable on sparc wrt #126850 + + 20 Mar 2006; Luca Barbato <lu_zero@gentoo.org> git-1.2.4.ebuild: + Marked ppc + + 19 Mar 2006; Krzysiek Pawlik <nelchael@gentoo.org> git-1.2.4.ebuild: + Stable on x86, see bug #126850. + + 19 Mar 2006; Markus Rothe <corsair@gentoo.org> git-1.2.4.ebuild: + Stable on ppc64; bug #126850 + + 19 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.2.4.ebuild: + Stable on alpha wrt bug #126850 + +*git-1.2.4 (02 Mar 2006) + + 02 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.1.ebuild, + -git-1.2.2.ebuild, +git-1.2.4.ebuild: + New upstream version. Trim old ones + +*git-1.2.3 (23 Feb 2006) + + 23 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.2.3.ebuild: + New upstream version + +*git-1.2.2 (19 Feb 2006) + + 19 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.2.0.ebuild, + +git-1.2.2.ebuild: + New upstream version. Remove old one. + + 18 Feb 2006; Simon Stelling <blubb@gentoo.org> git-1.1.6.ebuild: + stable on amd64 + + 17 Feb 2006; Joseph Jezak <josejx@gentoo.org> git-1.1.6.ebuild: + Marked ppc stable for bug #122887. + +*git-1.2.1 (16 Feb 2006) + + 16 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-0.7.ebuild, + +git-1.2.1.ebuild: + New upstream version, remove ancient one + + 15 Feb 2006; Markus Rothe <corsair@gentoo.org> git-1.1.6.ebuild: + Stable on ppc64; bug #122887 + + 15 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org> git-1.1.6.ebuild: + Stable on sparc wrt #122887 + + 15 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> git-1.1.6.ebuild: + Stable on x86, bug #122887. + + 15 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8a.ebuild, + -git-0.99.9n.ebuild, -git-1.0.6.ebuild, git-1.1.6.ebuild: + git-1.1.6 stable on alpha. Remove ancienct ~arch versions + + 13 Feb 2006; Stuart Longland <redhatter@gentoo.org> git-1.1.6.ebuild: + Added ~mips to git-1.1.6 as per bug #108215. + +*git-1.2.0 (13 Feb 2006) + + 13 Feb 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.1.5.ebuild, + +git-1.2.0.ebuild: + Version bump, remove 1.1.5 + +*git-1.1.6 (30 Jan 2006) + + 30 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.1.3.ebuild, + -git-1.1.4.ebuild, +git-1.1.6.ebuild: + New upstream version, remove old ones + +*git-1.1.5 (28 Jan 2006) + + 28 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.1.5.ebuild: + new upstream version + +*git-1.1.4 (20 Jan 2006) + + 20 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> -git-1.1.2.ebuild, + +git-1.1.4.ebuild: + New upstream version. + +*git-1.1.3 (17 Jan 2006) + + 17 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> + -files/git-1.1.1-glossary-from-1.1.0.diff, -git-1.1.1.ebuild, + +git-1.1.3.ebuild: + new upstream version, remove 1.1.1 + +*git-1.1.2 (14 Jan 2006) + + 14 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.1.2.ebuild: + new upstream version + + 12 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.1.1.ebuild: + We should only try to apply git-1.1.1-glossary-from-1.1.0.diff if USE=doc. + Fixes bug #118755, thanks to Christian Heim <phreak@gentoo.org> + +*git-1.1.1 (11 Jan 2006) + + 11 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> + +files/git-1.1.1-glossary-from-1.1.0.diff, -git-1.1.0.ebuild, + +git-1.1.1.ebuild: + Version bump. Remove 1.1.0 as it reported a wrong version and might make + confuse bugreports. + + 09 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> git-1.1.0.ebuild: + http://kernel.org/pub -> mirror://kernel/ in SRC_URI + +*git-1.1.0 (09 Jan 2006) + + 09 Jan 2006; Fernando J. Pereda <ferdy@gentoo.org> +git-1.1.0.ebuild: + New upstream version + +*git-1.0.6 (28 Dec 2005) + + 28 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-1.0.5.ebuild, + +git-1.0.6.ebuild: + A new day, means a new upstream version + +*git-1.0.5 (27 Dec 2005) + + 27 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-1.0.4.ebuild, + +git-1.0.5.ebuild: + New upstream version. + +*git-1.0.4 (24 Dec 2005) + + 24 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-1.0.3.ebuild, + +git-1.0.4.ebuild: + New upstream version. Remove 1.0.3 + +*git-1.0.3 (23 Dec 2005) + + 23 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> + -files/git-1.0.0-http-fix.patch, -git-1.0.0-r1.ebuild, +git-1.0.3.ebuild: + Version bump, remove old version + +*git-1.0.0-r1 (21 Dec 2005) + + 21 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> + +files/git-1.0.0-http-fix.patch, -git-1.0.0.ebuild, +git-1.0.0-r1.ebuild: + This is what upstream calls 1.0.0a. Remove 1.0.0 since it is a bit broken + +*git-1.0.0 (21 Dec 2005) + + 21 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> +git-1.0.0.ebuild: + New upstream version + +*git-0.99.9n (15 Dec 2005) + + 15 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9m.ebuild, + +git-0.99.9n.ebuild: + New upstream version, remove old one + +*git-0.99.9m (12 Dec 2005) + + 12 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9l.ebuild, + +git-0.99.9m.ebuild: + version bump, remove old version + +*git-0.99.9l (04 Dec 2005) + + 04 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9k.ebuild, + +git-0.99.9l.ebuild: + version bump. remove old version + + 02 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> + -files/git-0.99.9j-binary-diff-fix.patch: + remove unneeded patch + +*git-0.99.9k (01 Dec 2005) + + 01 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9j.ebuild, + +git-0.99.9k.ebuild: + version bump, remove old version + + 30 Nov 2005; Tom Gall <tgall@gentoo.org> git-0.99.9j.ebuild: + stable on ppc64 (and works well!) + + 19 Nov 2005; Carlos Silva <r3pek@gentoo.org> + +files/git-0.99.9j-binary-diff-fix.patch, -files/git-0.99.9j-diff.patch, + git-0.99.9j.ebuild: + Rename the patch to a more understandable name + +*git-0.99.9j (19 Nov 2005) + + 19 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> + +files/git-0.99.9j-diff.patch, -git-0.99.9i.ebuild, +git-0.99.9j.ebuild: + version bump; this is 1.0rc2. Remove old version (aka 1.0rc1) + +*git-0.99.9i (15 Nov 2005) + + 15 Nov 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.9h.ebuild, + +git-0.99.9i.ebuild: + Version bump + +*git-0.99.9h (14 Nov 2005) + + 14 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9g.ebuild, + +git-0.99.9h.ebuild: + version bump, remove old version + +*git-0.99.9g (10 Nov 2005) + + 10 Nov 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.9f.ebuild, + +git-0.99.9g.ebuild: + Version bump + +*git-0.99.9f (08 Nov 2005) + + 08 Nov 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.9e.ebuild, + +git-0.99.9f.ebuild: + Version bump + +*git-0.99.9e (07 Nov 2005) + + 07 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9d.ebuild, + +git-0.99.9e.ebuild: + version bump, remove old one + +*git-0.99.9d (06 Nov 2005) + + 06 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9c.ebuild, + +git-0.99.9d.ebuild: + version bump, remove old version + +*git-0.99.9c (04 Nov 2005) + + 04 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9b.ebuild, + +git-0.99.9c.ebuild: + version bump, remove old version + +*git-0.99.9b (02 Nov 2005) + + 02 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.9.ebuild, + +git-0.99.9b.ebuild: + version bump, removed old version + +*git-0.99.9 (30 Oct 2005) + + 30 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8f.ebuild, + +git-0.99.9.ebuild: + version bump. remove old version + +*git-0.99.8f (19 Oct 2005) + + 19 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8d.ebuild, + -git-0.99.8e.ebuild, +git-0.99.8f.ebuild: + version bump, remove old versions + +*git-0.99.8e (18 Oct 2005) + + 18 Oct 2005; Carlos Silva <r3pek@gentoo.org> +git-0.99.8e.ebuild: + Version bump + +*git-0.99.8d (16 Oct 2005) + + 16 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8c-r1.ebuild, + +git-0.99.8d.ebuild: + version bump, remove old version + +*git-0.99.8c-r1 (14 Oct 2005) + + 14 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-0.99.8b.ebuild, + -git-0.99.8c.ebuild, +git-0.99.8c-r1.ebuild: + provide a custom src_test since the default one fails. fix one pkg_postinst + einfo. remove 0.99.8{b,c} + +*git-0.99.8c (11 Oct 2005) + + 11 Oct 2005; Carlos Silva <r3pek@gentoo.org> +git-0.99.8c.ebuild: + New version from upstream. This version have an important fix to + git-ls-tree. When two identical blobs or trees were contained in a tree, the + earlier code mislabeled them in the output. + +*git-0.99.8b (06 Oct 2005) + + 06 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> +git-0.99.8b.ebuild: + version bump. Fix git-send-email installation. Added missing dependency on + dev-perl/Email-Valid. Dropped ~mips keyword, see bug #108215 for more + information. + +*git-0.99.8a (05 Oct 2005) + + 05 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> + +files/git-daemon.confd, +files/git-daemon.initd, metadata.xml, + -git-0.99.8.ebuild, +git-0.99.8a.ebuild: + Added myself to metadata. Version bump, added init script and its conf.d + file. Fixed USE=doc. Removed not needed deps and rephrased pkg_postinst. + Removed old version + +*git-0.99.8 (03 Oct 2005) + + 03 Oct 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.6.ebuild, + -git-0.99.7d.ebuild, +git-0.99.8.ebuild: + Version bump + + 28 Sep 2005; Ilya A. Volynets-Evenbakh <ilya@total-knowledge.com> + git-0.99.7d.ebuild: + mark ~mips + +*git-0.99.7d (25 Sep 2005) + + 25 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.7a-r1.ebuild, + +git-0.99.7d.ebuild: + Version bump. Applied the patches found in bug #106998 + +*git-0.99.7a-r1 (22 Sep 2005) + + 22 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.7a.ebuild, + +git-0.99.7a-r1.ebuild: + Rev bump to fix some dependencies and added the tcltk use flag + +*git-0.99.7a (21 Sep 2005) + + 21 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.7.ebuild, + +git-0.99.7a.ebuild: + Version bump. Also did some cleanup on the DEPEND/RDEPEND var's and added + the gitsendemail use flag. Fixes bug #106791, thx to Max Loparyev. + +*git-0.99.7 (19 Sep 2005) + + 19 Sep 2005; Carlos Silva <r3pek@gentoo.org> +git-0.99.7.ebuild: + Version bump + + 18 Sep 2005; Markus Rothe <corsair@gentoo.org> git-0.99.6.ebuild: + Added ~ppc64 (bug #106318) + + 12 Sep 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild, + git-0.99.6.ebuild: + Fixed homepage. Closes bug #105648 + +*git-0.99.6 (08 Sep 2005) + + 08 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.5-r2.ebuild, + +git-0.99.6.ebuild: + Version bump. Removed version 0.99.5 + +*git-0.99.5-r2 (04 Sep 2005) + + 04 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.5-r1.ebuild, + +git-0.99.5-r2.ebuild: + Forgot to revbump + + 04 Sep 2005; Carlos Silva <r3pek@gentoo.org> git-0.99.5-r1.ebuild: + Added app-text/rcs as dep. Closes bug #104536 + +*git-0.99.5-r1 (27 Aug 2005) + + 27 Aug 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.4.ebuild, + -git-0.99.5.ebuild, +git-0.99.5-r1.ebuild: + Removed version 0.99.4. Revbumped version 0.99.5 to add a missing dep + (dev-util/cvsps). Closes bug #103962 + + 26 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> git-0.99.5.ebuild: + marked ~alpha wrt bug #101907 + +*git-0.99.5 (25 Aug 2005) + + 25 Aug 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.3.ebuild, + git-0.99.4.ebuild, +git-0.99.5.ebuild: + Version bump + + 24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> git-0.7.ebuild: + Stable on sparc + +*git-0.99.4 (13 Aug 2005) + + 13 Aug 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild, + +git-0.99.4.ebuild: + Marked version 0.7 stable on x86 and added version 0.99.4 + +*git-0.99.3 (09 Aug 2005) + + 09 Aug 2005; Michał Januszewski <spock@gentoo.org> +git-0.99.3.ebuild: + Version bump. + + 15 Jul 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild: + Closing bug #98032. thx Carsten Lohrke + + 24 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> git-0.7.ebuild: + To ~sparc + + 19 May 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild: + Adding net-misc/curl as a dep. Thanks to Priit Laes in bug #93247 + + 17 May 2005; Carlos Silva <r3pek@gentoo.org> git-0.7.ebuild: + Removing git-pasky references + + 07 May 2005; David Holm <dholm@gentoo.org> git-0.7.ebuild: + Added to ~ppc. + +*git-0.7 (05 May 2005) + + 05 May 2005; Carlos Silva <r3pek@gentoo.org> -git-0.6.ebuild, + +git-0.7.ebuild: + Removing old git version (0.6) and adding the new one (0.7) + +*git-0.6 (26 Apr 2005) + + 26 Apr 2005; Carlos Silva <r3pek@gentoo.org> -git-0.04.ebuild, + +git-0.6.ebuild: + Bumping to 0.6 + +*git-0.5 (21 Apr 2005) + + 21 Apr 2005; Carlos Silva <r3pek@gentoo.org> +git-0.5.ebuild: + Version bump + + 15 Apr 2005; Carlos Silva <r3pek@gentoo.org> : + Cleaning up the ebuild + +*git-0.04 (15 Apr 2005) + + 15 Apr 2005; Carlos Silva <r3pek@gentoo.org> +metadata.xml: + Initial import + diff --git a/dev-vcs/git/files/50git-gentoo.el b/dev-vcs/git/files/50git-gentoo.el new file mode 100644 index 000000000000..1646a391c53c --- /dev/null +++ b/dev-vcs/git/files/50git-gentoo.el @@ -0,0 +1,13 @@ + +;;; dev-vcs/git site-lisp configuration + +(add-to-list 'load-path "@SITELISP@") +(autoload 'git-status "git" "Entry point into git-status mode." t) +;;(autoload 'git-blame-mode "git-blame" +;; "Minor mode for incremental blame for Git." t) + +;; GNU Emacs >=22.2 already includes vc-git.el. +;; Enable the following only if Emacs has no GIT support. +(unless (fboundp 'vc-git-registered) + (add-to-list 'load-path "@SITELISP@/compat") + (add-to-list 'vc-handled-backends 'GIT)) diff --git a/dev-vcs/git/files/git-1.6.6-always-install-js.patch b/dev-vcs/git/files/git-1.6.6-always-install-js.patch new file mode 100644 index 000000000000..f4a3825102cd --- /dev/null +++ b/dev-vcs/git/files/git-1.6.6-always-install-js.patch @@ -0,0 +1,36 @@ +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-vcs/git/files/git-1.7.0-always-install-js.patch b/dev-vcs/git/files/git-1.7.0-always-install-js.patch new file mode 100644 index 000000000000..56f455e47601 --- /dev/null +++ b/dev-vcs/git/files/git-1.7.0-always-install-js.patch @@ -0,0 +1,36 @@ +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-vcs/git/files/git-daemon.confd b/dev-vcs/git/files/git-daemon.confd new file mode 100644 index 000000000000..75b421680c80 --- /dev/null +++ b/dev-vcs/git/files/git-daemon.confd @@ -0,0 +1,19 @@ +# conf.d file for git-daemon +# +# Please check man 1 git-daemon for more information about the options +# git-daemon accepts. You MUST edit this to include your repositories you wish +# to serve. +# +# Some of the meaningful options are: +# --syslog --- Enables syslog logging +# --verbose --- Enables verbose logging +# --export-all --- Exports all repositories +# --port=XXXX --- Starts in port XXXX instead of 9418 +# +GITDAEMON_OPTS="--syslog /var/git" + +# To run an anonymous git safely, the following user should be able to only +# read your Git repositories. It should not able able to write to anywhere on +# your system, esp. not the repositories. +GIT_USER="nobody" +GIT_GROUP="nobody" diff --git a/dev-vcs/git/files/git-daemon.initd b/dev-vcs/git/files/git-daemon.initd new file mode 100644 index 000000000000..c6ee19f5c034 --- /dev/null +++ b/dev-vcs/git/files/git-daemon.initd @@ -0,0 +1,30 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon.initd,v 1.1 2010/03/17 15:13:27 sping Exp $ + +PIDFILE=/var/run/git-daemon.pid + +depend() { + need net + use logger +} + +start() { + [ -e /lib/librc.so ] || BL1_COMPAT="--name git-daemon" + ebegin "Starting git-daemon" + start-stop-daemon --start --quiet --background \ + --pidfile ${PIDFILE} ${BL1_COMPAT} \ + --exec /usr/bin/git -- daemon \ + --pid-file=${PIDFILE} \ + --user=${GIT_USER} --group=${GIT_GROUP} \ + ${GITDAEMON_OPTS} + eend $? +} + +stop() { + ebegin "Stopping git-daemon" + start-stop-daemon --stop --quiet \ + --pidfile ${PIDFILE} + eend $? +} diff --git a/dev-vcs/git/files/git-daemon.xinetd b/dev-vcs/git/files/git-daemon.xinetd new file mode 100644 index 000000000000..02c938d4bd6c --- /dev/null +++ b/dev-vcs/git/files/git-daemon.xinetd @@ -0,0 +1,13 @@ +service git-daemon +{ + disable = yes + socket_type = stream + wait = no + user = nobody + type = UNLISTED + protocol = tcp + log_on_failure += USERID + port = 9418 + server = /usr/bin/git + server_args = daemon --inetd --syslog --export-all --base-path=/var/git +} diff --git a/dev-vcs/git/git-1.6.3.1.ebuild b/dev-vcs/git/git-1.6.3.1.ebuild new file mode 100644 index 000000000000..46868fc696b3 --- /dev/null +++ b/dev-vcs/git/git-1.6.3.1.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.3.1.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.3.3.ebuild b/dev-vcs/git/git-1.6.3.3.ebuild new file mode 100644 index 000000000000..1efb4ccd840a --- /dev/null +++ b/dev-vcs/git/git-1.6.3.3.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.3.3.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.3.4.ebuild b/dev-vcs/git/git-1.6.3.4.ebuild new file mode 100644 index 000000000000..1410af354597 --- /dev/null +++ b/dev-vcs/git/git-1.6.3.4.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.3.4.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.4.1.ebuild b/dev-vcs/git/git-1.6.4.1.ebuild new file mode 100644 index 000000000000..910502f42c9b --- /dev/null +++ b/dev-vcs/git/git-1.6.4.1.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.1.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.4.2.ebuild b/dev-vcs/git/git-1.6.4.2.ebuild new file mode 100644 index 000000000000..2d57c946b7b5 --- /dev/null +++ b/dev-vcs/git/git-1.6.4.2.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.2.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.4.3.ebuild b/dev-vcs/git/git-1.6.4.3.ebuild new file mode 100644 index 000000000000..e1c7b8d8207c --- /dev/null +++ b/dev-vcs/git/git-1.6.4.3.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.3.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.4.4.ebuild b/dev-vcs/git/git-1.6.4.4.ebuild new file mode 100644 index 000000000000..e1fd8ed226d9 --- /dev/null +++ b/dev-vcs/git/git-1.6.4.4.ebuild @@ -0,0 +1,369 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.4.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.4.ebuild b/dev-vcs/git/git-1.6.4.ebuild new file mode 100644 index 000000000000..c6dd6f5b33ce --- /dev/null +++ b/dev-vcs/git/git-1.6.4.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.5.1-r1.ebuild b/dev-vcs/git/git-1.6.5.1-r1.ebuild new file mode 100644 index 000000000000..58447517428e --- /dev/null +++ b/dev-vcs/git/git-1.6.5.1-r1.ebuild @@ -0,0 +1,389 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.1-r1.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.5.1.ebuild b/dev-vcs/git/git-1.6.5.1.ebuild new file mode 100644 index 000000000000..7325c50e4105 --- /dev/null +++ b/dev-vcs/git/git-1.6.5.1.ebuild @@ -0,0 +1,377 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.1.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.5.2.ebuild b/dev-vcs/git/git-1.6.5.2.ebuild new file mode 100644 index 000000000000..130a7832e77f --- /dev/null +++ b/dev-vcs/git/git-1.6.5.2.ebuild @@ -0,0 +1,389 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.2.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.5.3.ebuild b/dev-vcs/git/git-1.6.5.3.ebuild new file mode 100644 index 000000000000..f30de48ff5e2 --- /dev/null +++ b/dev-vcs/git/git-1.6.5.3.ebuild @@ -0,0 +1,401 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.3.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.5.4.ebuild b/dev-vcs/git/git-1.6.5.4.ebuild new file mode 100644 index 000000000000..19c98ecabeb6 --- /dev/null +++ b/dev-vcs/git/git-1.6.5.4.ebuild @@ -0,0 +1,401 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.4.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.5.5.ebuild b/dev-vcs/git/git-1.6.5.5.ebuild new file mode 100644 index 000000000000..8626922d625a --- /dev/null +++ b/dev-vcs/git/git-1.6.5.5.ebuild @@ -0,0 +1,401 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.5.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.5.6.ebuild b/dev-vcs/git/git-1.6.5.6.ebuild new file mode 100644 index 000000000000..88bbcf356838 --- /dev/null +++ b/dev-vcs/git/git-1.6.5.6.ebuild @@ -0,0 +1,401 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.6.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.5.7.ebuild b/dev-vcs/git/git-1.6.5.7.ebuild new file mode 100644 index 000000000000..d5ead21d6306 --- /dev/null +++ b/dev-vcs/git/git-1.6.5.7.ebuild @@ -0,0 +1,406 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.7.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.5.8.ebuild b/dev-vcs/git/git-1.6.5.8.ebuild new file mode 100644 index 000000000000..7ce1368c20ca --- /dev/null +++ b/dev-vcs/git/git-1.6.5.8.ebuild @@ -0,0 +1,406 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.8.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.5.ebuild b/dev-vcs/git/git-1.6.5.ebuild new file mode 100644 index 000000000000..ff6192de1df5 --- /dev/null +++ b/dev-vcs/git/git-1.6.5.ebuild @@ -0,0 +1,377 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.5_rc1.ebuild b/dev-vcs/git/git-1.6.5_rc1.ebuild new file mode 100644 index 000000000000..e78971e93e54 --- /dev/null +++ b/dev-vcs/git/git-1.6.5_rc1.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5_rc1.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.5_rc2.ebuild b/dev-vcs/git/git-1.6.5_rc2.ebuild new file mode 100644 index 000000000000..59e0584789c5 --- /dev/null +++ b/dev-vcs/git/git-1.6.5_rc2.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.5_rc2.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.6-r1.ebuild b/dev-vcs/git/git-1.6.6-r1.ebuild new file mode 100644 index 000000000000..59853df95bc1 --- /dev/null +++ b/dev-vcs/git/git-1.6.6-r1.ebuild @@ -0,0 +1,413 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6-r1.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.6-r2.ebuild b/dev-vcs/git/git-1.6.6-r2.ebuild new file mode 100644 index 000000000000..3b8933e02c5f --- /dev/null +++ b/dev-vcs/git/git-1.6.6-r2.ebuild @@ -0,0 +1,413 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6-r2.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.6.1.ebuild b/dev-vcs/git/git-1.6.6.1.ebuild new file mode 100644 index 000000000000..568f2541028f --- /dev/null +++ b/dev-vcs/git/git-1.6.6.1.ebuild @@ -0,0 +1,413 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6.1.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.6.2.ebuild b/dev-vcs/git/git-1.6.6.2.ebuild new file mode 100644 index 000000000000..6f2e25919e84 --- /dev/null +++ b/dev-vcs/git/git-1.6.6.2.ebuild @@ -0,0 +1,413 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6.2.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.6.ebuild b/dev-vcs/git/git-1.6.6.ebuild new file mode 100644 index 000000000000..cfa4cbef6a89 --- /dev/null +++ b/dev-vcs/git/git-1.6.6.ebuild @@ -0,0 +1,406 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.6_rc3.ebuild b/dev-vcs/git/git-1.6.6_rc3.ebuild new file mode 100644 index 000000000000..e3d32c8083bb --- /dev/null +++ b/dev-vcs/git/git-1.6.6_rc3.ebuild @@ -0,0 +1,406 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6_rc3.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.6.6_rc4.ebuild b/dev-vcs/git/git-1.6.6_rc4.ebuild new file mode 100644 index 000000000000..ca0bd4ae3d3d --- /dev/null +++ b/dev-vcs/git/git-1.6.6_rc4.ebuild @@ -0,0 +1,406 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.6_rc4.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-1.7.0.2.ebuild b/dev-vcs/git/git-1.7.0.2.ebuild new file mode 100644 index 000000000000..fa04a90ea9b2 --- /dev/null +++ b/dev-vcs/git/git-1.7.0.2.ebuild @@ -0,0 +1,413 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.0.2.ebuild,v 1.1 2010/03/17 15:13:19 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-vcs/git/git-1.7.0.ebuild b/dev-vcs/git/git-1.7.0.ebuild new file mode 100644 index 000000000000..d3ade7ac12d8 --- /dev/null +++ b/dev-vcs/git/git-1.7.0.ebuild @@ -0,0 +1,413 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.0.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild new file mode 100644 index 000000000000..9fa252373d35 --- /dev/null +++ b/dev-vcs/git/git-9999.ebuild @@ -0,0 +1,413 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.1 2010/03/17 15:13:19 sping Exp $ + +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-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml new file mode 100644 index 000000000000..569dfd93f4f6 --- /dev/null +++ b/dev-vcs/git/metadata.xml @@ -0,0 +1,35 @@ +<?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> |