/[gentoo-x86]/dev-vcs/git/git-9999.ebuild
Gentoo

Diff of /dev-vcs/git/git-9999.ebuild

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.26 Revision 1.27
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.26 2012/01/13 21:48:42 robbat2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.27 2012/01/20 08:27:19 robbat2 Exp $
4 4
5EAPI=4 5EAPI=4
6 6
7GENTOO_DEPEND_ON_PERL=no 7GENTOO_DEPEND_ON_PERL=no
8 8
53 webdav? ( dev-libs/expat ) 53 webdav? ( dev-libs/expat )
54 ) 54 )
55 emacs? ( virtual/emacs )" 55 emacs? ( virtual/emacs )"
56 56
57RDEPEND="${CDEPEND} 57RDEPEND="${CDEPEND}
58 app-crypt/gnupg
58 perl? ( dev-perl/Error 59 perl? ( dev-perl/Error
59 dev-perl/Net-SMTP-SSL 60 dev-perl/Net-SMTP-SSL
60 dev-perl/Authen-SASL 61 dev-perl/Authen-SASL
61 cgi? ( virtual/perl-CGI ) 62 cgi? ( virtual/perl-CGI )
62 cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) 63 cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
72# .txt/asciidoc --(asciidoc)---------> .xml/docbook 73# .txt/asciidoc --(asciidoc)---------> .xml/docbook
73# .xml/docbook --(docbook2texi.pl)--> .texi 74# .xml/docbook --(docbook2texi.pl)--> .texi
74# .texi --(makeinfo)---------> .info 75# .texi --(makeinfo)---------> .info
75DEPEND="${CDEPEND} 76DEPEND="${CDEPEND}
76 app-arch/cpio 77 app-arch/cpio
77 doc? ( 78 doc? (
78 app-text/asciidoc 79 app-text/asciidoc
79 app-text/docbook2X 80 app-text/docbook2X
80 sys-apps/texinfo 81 sys-apps/texinfo
82 )
83 test? (
84 app-crypt/gnupg
81 )" 85 )"
82 86
83# Live ebuild builds man pages and HTML docs, additionally 87# Live ebuild builds man pages and HTML docs, additionally
84if [[ ${PV} == *9999 ]]; then 88if [[ ${PV} == *9999 ]]; then
85 DEPEND="${DEPEND} 89 DEPEND="${DEPEND}
254 # merged upstream 258 # merged upstream
255 #epatch "${FILESDIR}"/git-1.7.5-interix.patch 259 #epatch "${FILESDIR}"/git-1.7.5-interix.patch
256 260
257 # merged upstream 261 # merged upstream
258 #epatch "${FILESDIR}"/git-1.7.6-interix.patch 262 #epatch "${FILESDIR}"/git-1.7.6-interix.patch
263
264 # Newer versions of SVN hate a whitespace in the file URL.
265 # So we avoid that by replaced the space with an underscore.
266 #Initialized empty Git repository in /dev/shm/portage/dev-vcs/git-9999/work/git-9999/t/t d.t9155/git_project/.git/
267 #svn: E235000: In file 'subversion/libsvn_subr/dirent_uri.c' line 2291: assertion failed (svn_uri_is_canonical(url, pool))
268 #
269 # With this change the following tests still fail: t9100 t9118 t9120
270 # Without it, MOST of t91* fails, due to the space tripping up the
271 # svn_uri_is_canonical.
272 #
273 # git-svn actually needs to be fixed here, but this chagne is useful for
274 # testing it.
275 #
276 # This patch is my work to date on fixing git-svn, but it causes more
277 # breakage than it fixes (it's manually-edited now to do nothing).
278 epatch "${FILESDIR}"/git-1.7.8-git-svn-1.7-canonical-path.patch
279 cd "${S}"/t
280 sed -i \
281 -e 's/trash directory/trash_directory/g' \
282 test-lib.sh t0000-basic.sh Makefile || die "sed failed"
259} 283}
260 284
261git_emake() { 285git_emake() {
262 # bug #326625: PERL_PATH, PERL_MM_OPT 286 # bug #326625: PERL_PATH, PERL_MM_OPT
263 # bug #320647: PYTHON_PATH 287 # bug #320647: PYTHON_PATH
353 python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview 377 python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
354 dodoc "${S}"/contrib/gitview/gitview.txt 378 dodoc "${S}"/contrib/gitview/gitview.txt
355 fi 379 fi
356 380
357 dobin contrib/fast-import/git-p4 381 dobin contrib/fast-import/git-p4
358 dodoc contrib/fast-import/git-p4.txt 382 #dodoc contrib/fast-import/git-p4.txt # Moved upstream
359 newbin contrib/fast-import/import-tars.perl import-tars 383 newbin contrib/fast-import/import-tars.perl import-tars
360 newbin contrib/git-resurrect.sh git-resurrect 384 newbin contrib/git-resurrect.sh git-resurrect
361 385
362 dodir /usr/share/${PN}/contrib 386 dodir /usr/share/${PN}/contrib
363 # The following are excluded: 387 # The following are excluded:
483 507
484 # Avoid the test system removing the results because we want them ourselves 508 # Avoid the test system removing the results because we want them ourselves
485 sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ 509 sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
486 -i "${S}"/t/Makefile 510 -i "${S}"/t/Makefile
487 511
488 # Clean old results first 512 # Clean old results first, must always run
489 cd "${S}/t" 513 cd "${S}/t"
490 git_emake clean 514 nonfatal git_emake clean
491 515
492 # Now run the tests 516 # Now run the tests, keep going if we hit an error, and don't terminate on
517 # failure
493 cd "${S}" 518 cd "${S}"
494 einfo "Start test run" 519 einfo "Start test run"
495 git_emake test 520 #MAKEOPTS=-j1
521 nonfatal git_emake --keep-going test
496 rc=$? 522 rc=$?
497 523
498 # Display nice results 524 # Display nice results, now print the results
499 cd "${S}/t" 525 cd "${S}/t"
500 git_emake aggregate-results 526 nonfatal git_emake aggregate-results
501 527
502 # And exit 528 # And bail if there was a problem
503 [ $rc -eq 0 ] || die "tests failed. Please file a bug." 529 [ $rc -eq 0 ] || die "tests failed. Please file a bug."
504} 530}
505 531
506showpkgdeps() { 532showpkgdeps() {
507 local pkg=$1 533 local pkg=$1

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.27

  ViewVC Help
Powered by ViewVC 1.1.20