Diff git-1.7.8.4 with a git-1.7.9_rc2

/usr/portage/dev-vcs/git/git-1.7.9_rc2.ebuild 2012-01-29 00:35:00.000000000 +0400
1 1
# Copyright 1999-2012 Gentoo Foundation
2 2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.4.ebuild,v 1.1 2012/01/20 08:32:39 robbat2 Exp $
3
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9_rc2.ebuild,v 1.4 2012/01/28 20:35:53 robbat2 Exp $
4 4

  
5 5
EAPI=4
6 6

  
......
33 33
			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
34 34
			)"
35 35
	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
36
	KEYWORDS="" # Pending git-svn fixes
36 37
else
37 38
	SRC_URI=""
38 39
	KEYWORDS=""
......
40 41

  
41 42
LICENSE="GPL-2"
42 43
SLOT="0"
43
IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
44
IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
44 45

  
45 46
# Common to both DEPEND and RDEPEND
46 47
CDEPEND="
......
55 56
	emacs?  ( virtual/emacs )"
56 57

  
57 58
RDEPEND="${CDEPEND}
59
	app-crypt/gnupg
58 60
	perl? ( dev-perl/Error
59 61
			dev-perl/Net-SMTP-SSL
60 62
			dev-perl/Authen-SASL
61
			cgi? ( virtual/perl-CGI )
63
			cgi? ( virtual/perl-CGI app-text/highlight )
62 64
			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
63 65
			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
64 66
			)
......
74 76
#   .texi         --(makeinfo)---------> .info
75 77
DEPEND="${CDEPEND}
76 78
	app-arch/cpio
77
	doc?    (
79
	doc? (
78 80
		app-text/asciidoc
79 81
		app-text/docbook2X
80 82
		sys-apps/texinfo
83
	)
84
	test? (
85
		app-crypt/gnupg
81 86
	)"
82 87

  
83 88
# Live ebuild builds man pages and HTML docs, additionally
......
256 261

  
257 262
	# merged upstream
258 263
	#epatch "${FILESDIR}"/git-1.7.6-interix.patch
264

  
265
	# Newer versions of SVN hate a whitespace in the file URL.
266
	# So we avoid that by replaced the space with an underscore.
267
	#Initialized empty Git repository in /dev/shm/portage/dev-vcs/git-9999/work/git-9999/t/t d.t9155/git_project/.git/
268
	#svn: E235000: In file 'subversion/libsvn_subr/dirent_uri.c' line 2291: assertion failed (svn_uri_is_canonical(url, pool))
269
	#
270
	# With this change the following tests still fail: t9100 t9118 t9120
271
	# Without it, MOST of t91* fails, due to the space tripping up the
272
	# svn_uri_is_canonical.
273
    #
274
	# git-svn actually needs to be fixed here, but this chagne is useful for
275
	# testing it.
276
	#
277
	# This patch is my work to date on fixing git-svn, but it causes more
278
	# breakage than it fixes (it's manually-edited now to do nothing).
279
	#epatch "${FILESDIR}"/git-1.7.8-git-svn-1.7-canonical-path.patch
280
	cd "${S}"/t
281
	sed -i \
282
		-e 's/trash directory/trash_directory/g' \
283
		test-lib.sh t0000-basic.sh Makefile || die "sed failed"
259 284
}
260 285

  
261 286
git_emake() {
......
355 380
	fi
356 381

  
357 382
	dobin contrib/fast-import/git-p4
358
	dodoc contrib/fast-import/git-p4.txt
383
	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
359 384
	newbin contrib/fast-import/import-tars.perl import-tars
360 385
	newbin contrib/git-resurrect.sh git-resurrect
361 386

  
......
485 510
	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
486 511
		-i "${S}"/t/Makefile
487 512

  
488
	# Clean old results first
513
	# Clean old results first, must always run
489 514
	cd "${S}/t"
490
	git_emake clean
515
	nonfatal git_emake clean
491 516

  
492
	# Now run the tests
517
	# Now run the tests, keep going if we hit an error, and don't terminate on
518
	# failure
493 519
	cd "${S}"
494 520
	einfo "Start test run"
495
	git_emake test
521
	#MAKEOPTS=-j1
522
	nonfatal git_emake --keep-going test
496 523
	rc=$?
497 524

  
498
	# Display nice results
525
	# Display nice results, now print the results
499 526
	cd "${S}/t"
500
	git_emake aggregate-results
527
	nonfatal git_emake aggregate-results
501 528

  
502
	# And exit
529
	# And bail if there was a problem
503 530
	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
504 531
}
505 532

  
Thank you!