Version bump per bugs 274608 and 273905, has DoS fixes for gid-daemon.

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

3 files changed, 368 insertions, 2 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 56a7865ba2c0..278435badaac 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.344 2009/05/18 05:11:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.345 2009/06/22 20:36:31 robbat2 Exp $
+
+*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)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 9b04a007091b..901f6b39221a 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -18,6 +18,7 @@ DIST git-1.6.2.3.tar.bz2 2017249 RMD160 6df25ea7e1b51cf2aeeac02e8df6ec55257a46d2
 DIST git-1.6.2.5.tar.bz2 2019842 RMD160 3b8d0e2e49a3dffff6a2b1f775d97d0a75163330 SHA1 8986395a863b1d1428d578a8451c3c258226d53a SHA256 aca52a50e45a8fc3a6dd6705466afdc7d6d78d5d4ed7c44e9d60a0f29ba3219e
 DIST git-1.6.2.tar.bz2 2016213 RMD160 7e28be59954173666e26940ca66dd95f99cf029b SHA1 685b9e203786dd4bcd7672088bcac42e22930ee0 SHA256 ab7dc40240092aa2e72a8db7e0045893ca5fa07a936e9fa83b242248e3c9f635
 DIST git-1.6.3.1.tar.bz2 2056716 RMD160 711afae08753095c612670590d808de38de6d03c SHA1 1b6f6da17663b1031c723e516789aa9310f3ac71 SHA256 2ef617165f9af704b4948d0bd72a3055ade47eb8a5cf7a6caae8be0960646453
+DIST git-1.6.3.3.tar.bz2 2061691 RMD160 802ab3a44c27084ed199c77d0f8710da7a5793ec SHA1 200b49304696357ccf7a4837307348d681b7e04d SHA256 f94bc0d1fc861a12c7fb821b27a4e6a80901e84432cdb7894cb7a437d4c939ad
 DIST git-1.6.3.tar.bz2 2057039 RMD160 b496878b113ae8d13d2eaa1b65e4dd2d8e72834d SHA1 1dab1068d1886828bdb512e9b809bc779de35609 SHA256 1c28afd152d3f254be884c288a0d8de9a72de9af5d7fac3f2df43b096b103cdc
 DIST git-htmldocs-1.6.0.6.tar.bz2 691282 RMD160 9b268ac521da2bf03995533d53dc3f7d43897ef1 SHA1 9eecc27e26e88c8f7ed0eea658c2c2d71ec9b9a6 SHA256 1738845dfe336dee5bd736a37823876e32cf633dc2a9bf7047bd35a0c3b64e58
 DIST git-htmldocs-1.6.1.1.tar.bz2 714757 RMD160 1931b5df8ff338f9d343a8bc23d7093e1a258829 SHA1 7a95c18b3a30d23ce9c191a1c6fd92d009e28410 SHA256 c2e06539987c7dcccc078a5226c1b3276a6cbed03e33e891b8fd764331358a63
@@ -29,6 +30,7 @@ DIST git-htmldocs-1.6.2.3.tar.bz2 730139 RMD160 adfc3807858333533998a3e6fcb87023
 DIST git-htmldocs-1.6.2.5.tar.bz2 730033 RMD160 12af33f7e0de610cc792979bd1f74ec88600ee97 SHA1 f5c874be7c8db12bcc9ff91291f7db0908b956ad SHA256 727a7f9dd3dffdc55958dd690297c9d5f39d53ca1d3f7add29761fc36303d406
 DIST git-htmldocs-1.6.2.tar.bz2 727053 RMD160 a915884c94ac1cf2311389b32c410d12203b43e5 SHA1 4943d51bf49a574e1cefe3833ef6820964b40455 SHA256 e8847d1d2051db1ac1c8a9cf838584d52aad3ea999fb038fd76751ab14bf6a55
 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
 DIST git-htmldocs-1.6.3.tar.bz2 741684 RMD160 5875aa7485184592c9cd95697983dd63e427db3b SHA1 9526c6cece4ad11a27241638d875a71c0a75f61b SHA256 6146e31c11bd81aeb34c5992d3ac6819b9298ce9d64bdac11f8416896347053d
 DIST git-manpages-1.6.0.6.tar.bz2 217074 RMD160 81bdf5ac9662a7790682cb110640b32ca0f00756 SHA1 6a27a20f05cf0ac980915d5577d241a4836134de SHA256 80dc6a8a05bccdb49de261c32c9c22ab8c2e957edd618c0315fdf49e46f89bc8
 DIST git-manpages-1.6.1.1.tar.bz2 231331 RMD160 3a641502738104bb3c5322643ab4c293384e1d03 SHA1 8aba1fd66c6832880db6ecf961c1733bb3889e43 SHA256 004fda1ac720d6f0a5c93370f5b5a69f91c26929cf95fe9d760c79be5e369cfc
@@ -40,6 +42,7 @@ DIST git-manpages-1.6.2.3.tar.bz2 236557 RMD160 69bba5db8eccc66d55964182cc8bb597
 DIST git-manpages-1.6.2.5.tar.bz2 236794 RMD160 a24ba361b57976db7d0fc2a24c2617ad22b859c8 SHA1 c61b94fa0de850aa2db26a6525e88a6adba5c4e3 SHA256 a6659d9e50a2f610b7c0a6c676537268032ab8bf7637ce944d9872c6dc3d8af2
 DIST git-manpages-1.6.2.tar.bz2 236341 RMD160 b770b9e5bcc259735ae72412eda9b1ec9b587f08 SHA1 e621826b090cac60d28758eb9ec2c7ab4c0d63ba SHA256 13e7d352f9cac1f34d64b5deb006d0961941e43975a33f7d8507df58df1fe68e
 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
 DIST git-manpages-1.6.3.tar.bz2 243465 RMD160 f185e27354358d4a60bc14bdd2a990438fc6ac0d SHA1 7b91d101d22ec72c84c3b71838f4613dc7e80e1e SHA256 35310ce8fe3b6274a915495f41eeae8fcc7386fe8bcdc9218e324c4131bdaeb5
 EBUILD git-1.6.0.6.ebuild 8659 RMD160 cbe8dad707605a31994ea493790f6afcdb4f0227 SHA1 7e01b2ff590a30fb9f4df406045f79270c9fbe87 SHA256 5dbf47cfe75164020e72497a19078fdaabbb63fb13685965c1e7c6ab3c319e3d
 EBUILD git-1.6.1.1.ebuild 8605 RMD160 5ba0aacd6084de03f87f5bcb49e53bfd1e3b522c SHA1 53427f6845e34d9b1738eb746263a880bcea1596 SHA256 3ab687c1f71ece1a743c4cf141a7300359d9b78e400e80bcd610ea98f898bfe2
@@ -53,7 +56,8 @@ EBUILD git-1.6.2.5-r1.ebuild 9689 RMD160 8aff5d3edeee0ef4ae5f5397501e20d29f91759
 EBUILD git-1.6.2.5.ebuild 9687 RMD160 b998ff1c5fa9967e5521678a8428baad717d51dd SHA1 c992fe4e6f0c573451dfdc968be0b989eba3f51c SHA256 8c893fa2025a9511916d7032e742413f9e659246f1c14721ab427ef5397f24e2
 EBUILD git-1.6.2.ebuild 8443 RMD160 0138c4f89eed7055664bb2a84d6e41bc1be60e2d SHA1 7bc2abe4a18f4150792724e6550817f2802ef48a SHA256 a2c7e4858f2bd21973d818d059023cfd2c98177a0bae2aa1c31fff1e7309ec13
 EBUILD git-1.6.3.1.ebuild 9724 RMD160 6fddcdf02259023d7a4f67403a35e5909601962d SHA1 8090d2005f692080a415c57d361fb6b48eac8d19 SHA256 4655efe55cdd5d971484b7136b2caad0ec29b4cebe105e6654a6709f07d5678d
+EBUILD git-1.6.3.3.ebuild 9724 RMD160 a252f25df3807fe67363ade95ebd833ca258ca4e SHA1 7ab2d0a91ff0c1613daa5860fd4f65d58d19ab71 SHA256 132989a78f14b3653ffd578802ecef66c84b8f3d25d8c7f3d6acff46a9d1ed91
 EBUILD git-1.6.3.ebuild 9722 RMD160 98ff70c6dc59efcd6425340e27b22b327cb20990 SHA1 ea9aeb7c5ad84013e760320fdc46d0a3c27061f5 SHA256 3c0f295db6aaff5263a2c56b4c6e45095ef3f5a13e267b80bab78a19eac42d4e
 EBUILD git-9999.ebuild 9629 RMD160 2d406fe0e19369f9cf92b53374a95cbab9a25614 SHA1 b6370c0dbb237b408e329c60264418ad8e1e4ea1 SHA256 ed80bc83221d42cc7c6ddb9f5a186e0067827db8018e8b6e916d5ec9f3949aac
-MISC ChangeLog 52501 RMD160 315e664f796d6ca4f03da2872f319cd6570677a2 SHA1 deb870a0962a0f70288e91321fd22655d4922bce SHA256 8fcbfe35d0c926f0c6588e5a37b945b5efda814000cd172ab48262bed5c26c20
+MISC ChangeLog 52677 RMD160 08bc29c36647e36bb5e5d0c73b8c6ffffef7b4f7 SHA1 e477162158c93dea1b5b8e7a3c77e380a8e5e224 SHA256 d5352b4b6291df1e328b55d64bdb5e9abf622aa0d9039e37f1294df697d6f2c8
 MISC metadata.xml 1535 RMD160 1117b90f1e7550ce3a47f844ac17db78ed803cc3 SHA1 223d8e6b2faf20bf290d90d0d6322473daa49b0c SHA256 58d9f467528fee5c7062d0a2344a3b61ff0b8b7a0a84dffc9f56557f7eadd70b
diff --git a/dev-util/git/git-1.6.3.3.ebuild b/dev-util/git/git-1.6.3.3.ebuild
new file mode 100644
index 000000000000..18fb1598b2e2
--- /dev/null
+++ b/dev-util/git/git-1.6.3.3.ebuild
@@ -0,0 +1,357 @@
+# 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.3.3.ebuild,v 1.1 2009/06/22 20:36:31 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 )"
+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="
+	!app-misc/git
+	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/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} 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 ! has userpriv "${FEATURES}"; 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 0 ]] && \
+			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
+}