Version bump.

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

3 files changed, 412 insertions, 2 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 88bc830979a2..e5259c058ee7 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.384 2009/12/03 22:31:43 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.385 2009/12/06 17:28:30 robbat2 Exp $
+
+*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)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index c4dcc7bcc61c..c857a52c8b56 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -14,6 +14,7 @@ DIST git-1.6.5.1.tar.bz2 2243592 RMD160 471d05a0534948b15ea9d329a8b9ea53e9537bba
 DIST git-1.6.5.2.tar.bz2 2244529 RMD160 b47eff794d5953263ce9d053c41e227035a96e5d SHA1 d31d3054a595e811069b86ceeac56760cae4a835 SHA256 a7050b45a4c5a2b40db83dc67dc3ff4b422ef1864df72316b3221ead2eefb5c1
 DIST git-1.6.5.3.tar.bz2 2247507 RMD160 270a4b70ca4ad8709dc0a3b653324c9cfadbb12c SHA1 f3b6e26e8fbf1c13a623cd80a663cae502f0cd8b SHA256 3822c8350be782f28a7a60138ec65a6f04f259940f84f7062e508d9f9d64eefa
 DIST git-1.6.5.4.tar.bz2 2248240 RMD160 dd32eab5d5acfc47e7c73df01043fba19ee956fc SHA1 615c2dee5ff56267450769c8b28cb602ebff5bb2 SHA256 e5548c4a4ddefbdb3e4a846061861c51b2498f7453606e03fa67f6ae1dc1dace
+DIST git-1.6.5.5.tar.bz2 2251115 RMD160 8b40fa2fd69367b36644dd931ffe983305a2c3ed SHA1 3480315deed7ab8b495032a7a06257491f520f53 SHA256 4d1aaf16b4c37c8412cceab09b009bfc0f8d7b9f30a809b82027ab7fa66fdbb3
 DIST git-1.6.5.rc1.tar.bz2 2225429 RMD160 80cda7add591c17ea6dab30818dbfc05486a7042 SHA1 6d8494a03c50358568992330015d479d396d72cf SHA256 46d22872f2fe1a9ee1af20f696d004d2f2f996212fee53d520435d5f199ef526
 DIST git-1.6.5.rc2.tar.bz2 2241993 RMD160 46b28f510de12fc3b88b57b1733e083c8e34d3fa SHA1 329d272d87afd5c4ec60ced27b4383e1e7e654f8 SHA256 5cca711f12ccb0d0535c5a2028fc796b188cb735dfbdf5f0a9610a20f0bd4034
 DIST git-1.6.5.tar.bz2 2243169 RMD160 70671e2b98d45dc0858691b3d163fb948fb7dfe6 SHA1 8047b6ea66bd0651c4f103febcba8eedfc034677 SHA256 377962fe1176a36030ca450d801fe745adc88a69bbba69d76d48e141d0147f92
@@ -29,6 +30,7 @@ DIST git-htmldocs-1.6.5.1.tar.bz2 775874 RMD160 2327c9da7e11068a415764921d101895
 DIST git-htmldocs-1.6.5.2.tar.bz2 775932 RMD160 66ecbc9def453db546c2d34d19b348740cfa3c29 SHA1 8c315490882641d0b001bb06822c232cb0f1d397 SHA256 693293e66111765af5b49ca80ac26b5a53d4831ab4853250affcd87324a89882
 DIST git-htmldocs-1.6.5.3.tar.bz2 778449 RMD160 481c4f42f089614aebff03defa303c9b7c0d900f SHA1 68efc2f409c8df8a2438cd300c0099c3b6cefff0 SHA256 0ffd4f13e34b0c96b0660af45012a8f02ac59300840b5736ff9f612172f42401
 DIST git-htmldocs-1.6.5.4.tar.bz2 780469 RMD160 c280b4d139dd237dbdad10d393ba62e8bbce1b4d SHA1 cc671ddae12d6069ad2ba61c756b1a4f6cf38115 SHA256 57f1f671ab39c80768cb1c2bd9780fa30f7d8b6f4a55d83bb6fa9fdd58f64630
+DIST git-htmldocs-1.6.5.5.tar.bz2 784103 RMD160 858953350d038fa871b340ef14887478171b5cd2 SHA1 e4ee4723010ead023b5db22d6d2a1a56d16a0864 SHA256 9c664e86f802ac78635d1c416d64e9f01862c4089692d928ebef4bee4c18662c
 DIST git-htmldocs-1.6.5.rc1.tar.bz2 774249 RMD160 f9c319d80e0eba8bc4f2fc70123089ac6e515698 SHA1 a766e7807eb67ba49de09e2e6388b49f2e921ed2 SHA256 40df0c92a83214797c38fefab0895204d6e33e6c38948d85b0bcbd4ca770e2d0
 DIST git-htmldocs-1.6.5.rc2.tar.bz2 775350 RMD160 95c41c3688e63a688ac7620e94e776438c8117c0 SHA1 4382f3ab4a92eab4aa9df5e24490bc34613c1ac6 SHA256 f6419fb705145bff92fb2a9242dfa5f4f375d9726c390e5f5faf896bdb96aa1e
 DIST git-htmldocs-1.6.5.tar.bz2 776027 RMD160 1d066dea548373ef61eaed281aae5597b487c56e SHA1 f80ebd5d54b934fa6bab99a306fba1c8d33351ca SHA256 4a92484dc73b7cd1e29ee763ad06af902e13b4de16ef8f82cdf6b7c588c46b02
@@ -44,6 +46,7 @@ DIST git-manpages-1.6.5.1.tar.bz2 252259 RMD160 a276db7b9799c233d1ea50e9116fd864
 DIST git-manpages-1.6.5.2.tar.bz2 256189 RMD160 112429c85cee71b36c12fb0f50b8170a8098c3ae SHA1 9af56df0a9479bc0d761c4b9e9817fb82eeaf73f SHA256 893c1abc6729d19aef26e3e1ffff7323fc1bb6e290974c932e8ab51197fdd921
 DIST git-manpages-1.6.5.3.tar.bz2 256865 RMD160 1fb0b8703ff8d5fc7ca03529faf0492c0bdc2b43 SHA1 733c7ce1a36338dff82dad23c3e68c5a2684fec5 SHA256 0ace2ac5b3be31f919f594a3c56fbd567fbc90ac7d1db72b17335495ca29759b
 DIST git-manpages-1.6.5.4.tar.bz2 256887 RMD160 5c02008781e413f452ee604f669485a7eb07622c SHA1 a619584436f18cf9ce7927461a687bc1f5136e8d SHA256 3047eb40c5239b7c6d67628db60446e50027e7282eee6db400996081ca244ec7
+DIST git-manpages-1.6.5.5.tar.bz2 257668 RMD160 02a103c9fcab9406a3311f731f5f10b966c112b3 SHA1 f8b0cec115108714944da4c5e8005912b86f85b5 SHA256 1462c3c71985d760679bfd27219c03572c92d3149aaef8cae802fe6217d05c73
 DIST git-manpages-1.6.5.rc1.tar.bz2 252098 RMD160 6e7b2b6c78c494c2c4e6ba5fff1c6af26dbd588e SHA1 ca612c39d80b4e7b6629c15f99923a1a35ed99c0 SHA256 bb8e6b08ae70449aca656e81afd12946889757c5bfa8cfc989d6919cf5ce4b17
 DIST git-manpages-1.6.5.rc2.tar.bz2 252286 RMD160 40bd2ff2578c7d60189ab51a0337ddd1412e4bbe SHA1 3099ec224be319b6f7ea7e930fdfeaa4e6284acd SHA256 18fa31c7b206906cce614cf49aa93a9a38fab88f33b79d9b963833112629f72e
 DIST git-manpages-1.6.5.tar.bz2 252127 RMD160 d35622533558bbaea8a762e5940471b365c9d31a SHA1 ebc5d4edf9bb1541774b9224dd0609a22ba64862 SHA256 4fb88e4217a82594581a8cae148766fea77a2d9778141fde8bc17517e90a5ca4
@@ -60,9 +63,10 @@ EBUILD git-1.6.5.1.ebuild 10153 RMD160 b03e6a70366c9a2d7b1e3f69c85b486563f3391c
 EBUILD git-1.6.5.2.ebuild 10440 RMD160 371e044c71f2488d5ccbc0a8a404b2b11edd02f9 SHA1 c9857f14fd733b2f3b7b667badb88fb2c1f89b12 SHA256 b5e265024e67eab80b113fbdd97065b03e59473175e6278d486a7ff5394644a5
 EBUILD git-1.6.5.3.ebuild 10822 RMD160 b082868e0f5952e98a6e11b5965fc122949e54ce SHA1 76438a893776efbd08ab5fe213c7ec0679a7a974 SHA256 b19f80883e072ea99b45cd9870fdf38fd84d2186fb0163d3bfecbc03648df4b2
 EBUILD git-1.6.5.4.ebuild 10822 RMD160 c51e347831e2a61b070e16cae510bb7847c630db SHA1 e761fc3954deca821a3f7a9c77b81386b17bd11f SHA256 1bad49c126d9d32aa2c9df3d2daf476e5ce71113ab3a67240675fe5e12670fda
+EBUILD git-1.6.5.5.ebuild 10822 RMD160 0fd9110b3e5b4446c068a7295c30e1ba2c0e5456 SHA1 c5d84135dbaf3df269a164c1986702094426867a SHA256 c2fe54a0d7e62d719967eeda44208a10671b143a9d5afdf6a8aa00f4f3cfe545
 EBUILD git-1.6.5.ebuild 10151 RMD160 b604e61e1c293f315fb3c65cf68fbc00f1f16b76 SHA1 2af4747aa0fafd4cf26f0c30d7957cef53cd0b59 SHA256 70dbe58f206110ad781858e54f80c4f3b094fe28524430e16f3754be276c9e1e
 EBUILD git-1.6.5_rc1.ebuild 9810 RMD160 23db321ce87550053fdd25faf3dee43b051a9bdc SHA1 d984a36291740c627761a9b6f9e601b70f038f1f SHA256 0661b98bb406fd7ea7a46b4c9094bbd6ad0220feaddf8406950e0f53b251bee3
 EBUILD git-1.6.5_rc2.ebuild 9825 RMD160 7f95a77f7711d8432e3b489e7802e2b1190ac2cd SHA1 d47951f7fa820446551dea608471f2388d77b7df SHA256 eec4c8f43b9bb211580e01e36cae0732e55fb6742d9068bea9c4a16344ccac0e
 EBUILD git-9999.ebuild 10446 RMD160 b4b134f3c7f105e9bb31def3a8285ed68636c7ab SHA1 35b7e8834ceb1fb9a4952a5650a74fa60adccee9 SHA256 6c59097ee9dab230afcdb80cfe4a4405547a9cd16d2cce2b2cc7a9ed9c0f3f5e
-MISC ChangeLog 59537 RMD160 6550f2c80d0f8a7fe5033cabf5e5198181551a59 SHA1 033a3e07acb98f3879e77faa0c00fca10a4736d0 SHA256 4de670bd69c063d9607e5c4e36f1194cb8ec46ee09d9fa513bdb731294444966
+MISC ChangeLog 59656 RMD160 0c2993dd46603412905997f3531f2d9d78ef2b8f SHA1 b7f407b3e1969c7720c488d68002674ed52c2e74 SHA256 bad26670ddb39095067639aab0513903f5195c4b037cb84edbb860944f64b8ae
 MISC metadata.xml 1610 RMD160 6b03b898986d26bba7ff441dc1c8c9ec04a9a2b9 SHA1 a0a0d304138c648729d225954de89c1aac359008 SHA256 d070dc8e46e0fd44676d0491353f95385e65c1ffcd1313193dc59d495245c007
diff --git a/dev-util/git/git-1.6.5.5.ebuild b/dev-util/git/git-1.6.5.5.ebuild
new file mode 100644
index 000000000000..bb745a36f98f
--- /dev/null
+++ b/dev-util/git/git-1.6.5.5.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.5.5.ebuild,v 1.1 2009/12/06 17:28:30 robbat2 Exp $
+
+EAPI=2
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+[ "$PV" == "9999" ] && inherit git
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [ "$PV" != "9999" ]; then
+	SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
+			mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
+			doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+else
+	SRC_URI=""
+	EGIT_BRANCH="master"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	!blksha1? ( dev-libs/openssl )
+	sys-libs/zlib
+	perl?   ( dev-lang/perl )
+	tk?     ( dev-lang/tk )
+	curl?   (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${CDEPEND}
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI )
+			cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	gtk?
+	(
+		>=dev-python/pygtk-2.8
+		|| ( dev-python/pygtksourceview:2  dev-python/gtksourceview-python )
+	)"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc?    (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+	)"
+
+# Live ebuild builds HTML docs, additionally
+if [ "$PV" == "9999" ]; then
+	DEPEND="${DEPEND}
+		doc?    (
+			app-text/xmlto
+		)"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if ! use perl ; then
+		use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi"
+		use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs"
+		use subversion && ewarn "git-svn needs USE=perl, it won't work"
+	fi
+	if use webdav && ! use curl ; then
+		ewarn "USE=webdav needs USE=curl. Ignoring"
+	fi
+	if use subversion && has_version dev-util/subversion && built_with_use --missing false dev-util/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts="${myopts} BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${myopts} NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	if [ "${PV}" != "9999" ]; then
+		unpack ${MY_P}.tar.bz2
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.bz2
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
+		cd "${S}"
+	else
+		git_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# Noperl is being merged to upstream as of 2009/04/05
+	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
+
+	# GetOpt-Long v2.38 is strict
+	# Merged in 1.6.3 final 2009/05/07
+	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		Makefile || die "sed failed"
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+}
+
+git_emake() {
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix=/usr \
+		htmldir=/usr/share/doc/${PF}/html \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ "$PV" == "9999" ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	doman man?/*.[157] Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	dobashcompletion contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	dobin contrib/fast-import/git-p4
+	dodoc contrib/fast-import/git-p4.txt
+	newbin contrib/fast-import/import-tars.perl import-tars
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# svnimport - use git-svn
+	# p4import - excluded because fast-import has a better one
+	# examples - these are stuff that is not used in Git anymore actually
+	# patches - stuff the Git guys made to go upstream to other places
+	for i in continuous fast-import hg-to-git \
+		hooks remotes2config.sh stats \
+		workdir convert-objects blameview ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${D}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		dodir /usr/share/${PN}/gitweb
+		insinto /usr/share/${PN}/gitweb
+		doins "${S}"/gitweb/gitweb.cgi
+		doins "${S}"/gitweb/gitweb.css
+		doins "${S}"/gitweb/git-{favicon,logo}.png
+
+		# Make sure it can run
+		fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${D}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	fi
+	if ! use subversion ; then
+		rm -f "${D}"/usr/libexec/git-core/git-svn \
+			"${D}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9600-cvsimport.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-util/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-util/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+	cd "${S}"
+	# Now run the tests
+	einfo "Start test run"
+	git_emake \
+		test || die "tests failed"
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then
+		ewarn "You must build dev-util/subversion with USE=perl"
+		ewarn "to get the full functionality of git-svn!"
+	fi
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}