Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 433 insertions, 2 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 907bd099c8f9..70013c3072b2 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2010/06/22 18:47:46 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.15 2010/06/30 00:15:58 robbat2 Exp $
+
+*git-1.7.1.1 (30 Jun 2010)
+
+  30 Jun 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.1.1.ebuild:
+  Version bump.
 
   22 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   git-1.6.3.1.ebuild, git-1.6.3.3.ebuild, git-1.6.3.4.ebuild,
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index e4e65ff7fb62..f61b90a0a761 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -33,6 +33,7 @@ DIST git-1.6.6.tar.bz2 2328343 RMD160 59d96548ef54f117892d6c602973bd0decf155b4 S
 DIST git-1.7.0.3.tar.bz2 2438999 RMD160 cfe3b9ef21c62c47aaaef997d0cd44c7436649d6 SHA1 7244e2ac0c439c9acdd1432072a9ff3dce8bc319 SHA256 f68774019b52ac462da48a5315ce1f4dcd64a2327de4a14d13014bdc0c50f841
 DIST git-1.7.0.4.tar.bz2 2441048 RMD160 d4a9516be557ed3b12e88f8cb6b08c99764d69eb SHA1 ed4d3375b5ee3640433270d2f2fedaf69d021801 SHA256 ff283c3799c3f9719d0512bb23cf8854e1934f1ed36f2058b931d8f1c0b63430
 DIST git-1.7.0.tar.bz2 2430104 RMD160 5f37b556845dba23cc3e604e9b503b4ef0a9d3f7 SHA1 c0b536735a7f593877d61f5a8af72bdad0193d97 SHA256 a61e863944381c4f8231841f678f41f56b634bebca486a61005b35e5bcbb7c79
+DIST git-1.7.1.1.tar.bz2 2491729 RMD160 665433a2afe82be15edcb61a09b8912708db4885 SHA1 466b802272804cfcbe86a08879c6edb10b7a5a30 SHA256 f70c0fbb4445d3b638febbf33393adfc43d547926349c1df0a69f290a6b9c14a
 DIST git-1.7.1.tar.bz2 2475655 RMD160 b29995bac655e64d3c5d6911fe1235ba85ff58e6 SHA1 0b031d1ab63506f945ad3c6fb5f814c6a4fc3095 SHA256 bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2
 DIST git-htmldocs-1.6.3.1.tar.bz2 741913 RMD160 279b298feed72e0c0712c54061f5cbed3b9eb279 SHA1 4a6e77f7171b16878aa71765a3f947432e669214 SHA256 6376efa888075de5b319c1ebade8516b2fb0edea675cc7172dcbf139324800a1
 DIST git-htmldocs-1.6.3.3.tar.bz2 742321 RMD160 0ea1318aa4a1259bb00c45b03a84cd09f07114f4 SHA1 f6d5bec24edfd27bf91f0f0cc13cfcfd7ecd045f SHA256 b387dbbe281adbfe6aafb949b94970f753f2658220e998a8dd5258b8980443d4
@@ -61,6 +62,7 @@ DIST git-htmldocs-1.6.6.tar.bz2 847046 RMD160 4f21ac2d123579970c3f46d9b87aae96c3
 DIST git-htmldocs-1.7.0.3.tar.bz2 861912 RMD160 6a3b62c1de86e4f63e84fd092df2e94265c104e4 SHA1 9536a7b13c1caa4e6c27a005071b09e629654fc1 SHA256 145cddffc9f00d9bb243ee57a374abe6ed67408f2b5f0735e7f682599ceffa14
 DIST git-htmldocs-1.7.0.4.tar.bz2 862693 RMD160 5f8c269aae2fca3247a8da6e2538b63e6ac34640 SHA1 451e135f77f10911804b82afff2f059a21498a88 SHA256 8f6572da459233cfe62c2373c1a081599e597b47704bd49a74a09384d07529c7
 DIST git-htmldocs-1.7.0.tar.bz2 861086 RMD160 06be1a51168f4b4e522d06ed0edc3437658bd519 SHA1 efc0f2b5d663e72c8e543f3ea7fd47b98e58b029 SHA256 8338f71c9ee019ee591805a2804e7ed59de0b03538bffeb6a504088a63779241
+DIST git-htmldocs-1.7.1.1.tar.bz2 881196 RMD160 ba62ba98a19b99f7daaf52243ddcd762560334b5 SHA1 d45775c03246da814cce80bd7dee346779bff94e SHA256 075b99aa5af90f220961cc6adaeac4ee1270ce4212d4d5fe790129ab09e184a3
 DIST git-htmldocs-1.7.1.tar.bz2 873917 RMD160 7d14a9767884180451359b899ec8741b42f6da5f SHA1 94d18dea549c52ae0c38b1568ace46bbbdb29b44 SHA256 fc4efd0ea040ea7684a0101f6614f9ee6398e77fdbed9338f61426b962a2270a
 DIST git-manpages-1.6.3.1.tar.bz2 244098 RMD160 7de9ac0607365c2fed0eae6c67fdd0f826d044f8 SHA1 e4dd5f5a08d5a9b09cfcd2ba62f3ce7f77479afc SHA256 00ec75ef5d71e933ca173aa96cf254943f7750d536146433c0566ade984744fe
 DIST git-manpages-1.6.3.3.tar.bz2 243822 RMD160 57ffb06cdb1d0daf59aeeed2408860cfb2208e35 SHA1 0153298e215ac6beb3c6073aa1c8bd0de9a1da3b SHA256 a05a18f448a327137e1d6b04175caaabcc9c88f8327290b8f82b69119db39330
@@ -89,6 +91,7 @@ DIST git-manpages-1.6.6.tar.bz2 264409 RMD160 86fda1c25e75fbce40719f5c26b6172739
 DIST git-manpages-1.7.0.3.tar.bz2 272462 RMD160 9e59ab7d75985b952c136364ad14b87f80de152b SHA1 e10259bcb42c484fcf6faca3604612877eea67e7 SHA256 ac0622769e3c04e76a273e631a76027b83989bc09f17b550f4c2095f386a98a0
 DIST git-manpages-1.7.0.4.tar.bz2 272585 RMD160 1a0058a03cfabf593ee820f902e8797b583d6781 SHA1 27cd73ba52fa5594420268abc43cf255d251c62a SHA256 d13461a388f34aef4ad32fd4103a345392aa503c57b461dd1098473d665cde3d
 DIST git-manpages-1.7.0.tar.bz2 272259 RMD160 520953c815c821f5350e6bb96f605c2830678ce0 SHA1 8d8b149df1a3146c76a41f50c14302e0424a29af SHA256 62f629db43b2b2f5b871977a300cba43c25f67c7a03decad4d364c021b7573b6
+DIST git-manpages-1.7.1.1.tar.bz2 279139 RMD160 57111ebe479d9ce49dc16284a0009035038e458f SHA1 765e46fc076635f99eb326f9eeced5a04e3af45b SHA256 ebb0732f5058dd365683b40ca6aa937a4bc31d971a6c73cde0176ae14e923af0
 DIST git-manpages-1.7.1.tar.bz2 276911 RMD160 8f32c0f06e9ff76751dff6849e6c3df7db4b77c7 SHA1 6b1e6738d30334f6e9071f983959644b4b3e9378 SHA256 f4898ba376cfb407ccf266e6fcee95c4cfc36387823629923f9e742cfdffda0c
 EBUILD git-1.6.3.1.ebuild 9948 RMD160 14e0c42743a3ed451ff037d70242c4e186012597 SHA1 b8b3c2591c54616037750fb2ac5d107867380289 SHA256 2ba96b0da1f194fe224f79b7a5a01f4dbc801c29f025fcec73adcbb29609d47e
 EBUILD git-1.6.3.3.ebuild 9937 RMD160 1cbed8cc1ed087f6d88f03e970b7405e8d6207b5 SHA1 1fed52432d6881c44ea1fe8c84779f4d9e41f381 SHA256 1fa1f7a7819324e7600487a64b15456873530b26642274d649f5271925a606f6
@@ -121,6 +124,7 @@ EBUILD git-1.7.0.3.ebuild 11277 RMD160 457272eea311f89d46e4f2fb2bc4c640c4d54a85
 EBUILD git-1.7.0.4.ebuild 11277 RMD160 ea3eae9e873577233e36a01f2d79d4a765a46692 SHA1 c03ffc5fb601bc0b7c48fc2581c79ec4320e19e8 SHA256 7540a1fb7b05d117af63212ab0dd6ea7aaea34fea8b90396f492ac0ce6f08008
 EBUILD git-1.7.0.ebuild 11275 RMD160 2cb0a9155ec4ffb0fd7045d3824508bdf65b4e94 SHA1 1897bd017c7ee74981e870a57ccd2e0e7c113a60 SHA256 f5024a1a0e8d5b72b7d1faa0e7f64fb47122a8e5f4635b5f6cac71944e2b0347
 EBUILD git-1.7.1-r1.ebuild 11477 RMD160 156e1e8e92b567bef7e4c68a21bccf97a49bb724 SHA1 ce2497331d392088711f6e2a101a6bd9f4da4d9a SHA256 a538fd60ff4b9ade631a562113357873209a9e3625aa05135b1d817e0bed0c09
+EBUILD git-1.7.1.1.ebuild 11479 RMD160 ecd11a8ca56f9bb38848b2f8278e0068e8c90863 SHA1 f4f8171dec318b06f215376aca40eab53db857b9 SHA256 10cb900acf3a1756b69ea795286b855968856b2e9ea71adbce168b3614738cc1
 EBUILD git-9999.ebuild 11267 RMD160 01f76a5e2f10faefecef89641377296535061860 SHA1 66f75a31674acf05dce53d164a8349c28bf428f2 SHA256 bebf393f824d891625a074bab936fa66dc0c195f638b23af99214b1fe7112597
-MISC ChangeLog 66682 RMD160 99dc4c9b185dac79fa86d53649cafe3e9dab9011 SHA1 08b92974ed9734c7b998a79ceb2d46de7ddac073 SHA256 c33c3f7964f8e48dd4c0452bfc35a07c8655c1f512238aa75d93f921c95023db
+MISC ChangeLog 66800 RMD160 a889ba05841fb9306f0d7e7da80818ec89cb938e SHA1 b3a0c45999caa62b636443c043500f370aa696f4 SHA256 7e2092c0c7d3c27128f2a437954ff27bd3e44ecc0e2d3b56df82ab8547d62b54
 MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b
diff --git a/dev-vcs/git/git-1.7.1.1.ebuild b/dev-vcs/git/git-1.7.1.1.ebuild
new file mode 100644
index 000000000000..be50262dcfad
--- /dev/null
+++ b/dev-vcs/git/git-1.7.1.1.ebuild
@@ -0,0 +1,422 @@
+# 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.1.1.ebuild,v 1.1 2010/06/30 00:15:58 robbat2 Exp $
+
+EAPI=2
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+[ "$PV" == "9999" ] && inherit git
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [ "$PV" != "9999" ]; then
+	SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
+			mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
+			doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~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
+	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-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/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-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+}
+
+# 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 \
+		|| einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205."
+	#	|| 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.1-always-install-js.patch
+
+	# USE=-iconv causes segfaults, fixed post 1.7.1
+	# Gentoo bug #321895
+	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.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 \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.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-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	# 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-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then
+		ewarn "You must build dev-vcs/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
+}