Version bump.

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

3 files changed, 389 insertions, 2 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index f23c8b44721f..b3cb3b1e54bf 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.371 2009/10/12 17:03:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.372 2009/10/18 02:02:09 robbat2 Exp $
+
+*git-1.6.5.1 (18 Oct 2009)
+
+  18 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.1.ebuild:
+  Version bump
 
   12 Oct 2009; Raúl Porcel <armin76@gentoo.org> git-1.6.4.4.ebuild:
   ia64/s390/sh/sparc stable wrt #287031
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 06129107ba0a..6a164648c7c9 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -10,6 +10,7 @@ DIST git-1.6.4.2.tar.bz2 2173527 RMD160 aa34a890652e7795bd50eb8c577f5baf1718bf74
 DIST git-1.6.4.3.tar.bz2 2172892 RMD160 4cb8708336e4e7cdf855ade5621a99ae7363fd30 SHA1 961ae8028609dfa95daf80fe33d24cf342f03454 SHA256 36db53f6d8d656c94fbfacc555e8d550a2381414585e6f7f6da0662dc717c138
 DIST git-1.6.4.4.tar.bz2 2174826 RMD160 8bad28bf8aedc6d5a9dcae39736c1ceeabbbe992 SHA1 da66a6323cc0842b19e3dbc5bb8ee5a59975037f SHA256 fc7e4d6c4172c62c93d5e974019f7193b03c8bc0a1c6f3a9fcc1d0928b808d7a
 DIST git-1.6.4.tar.bz2 2166226 RMD160 fc4dca08c69d23f3211306593ee689e4bb52303c SHA1 e6dd6b1fe937aa14866ce7d8672a50fb1956c41b SHA256 31d1346211df985288a21426bc3e820be817ead589ae32c7e545854480bc8185
+DIST git-1.6.5.1.tar.bz2 2243592 RMD160 471d05a0534948b15ea9d329a8b9ea53e9537bba SHA1 c955aa579be9bf5991adf465e6e4a2d6ba173fc1 SHA256 d78e2c6a55a250f8b57660a2a569df14dc24c9bb338bd2c1e50f3bee227ad9fd
 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
@@ -21,6 +22,7 @@ DIST git-htmldocs-1.6.4.2.tar.bz2 757661 RMD160 f8ae01c621e3d75e589540ad65919783
 DIST git-htmldocs-1.6.4.3.tar.bz2 755709 RMD160 2eb320622866de390caa1185eeea115a0a47112f SHA1 d05931858698f9429c6db5ad770dc8704949698a SHA256 01acea1702875e86214ff2fdd4a5257965a40b5ae666f7a54fa3ad347609d86a
 DIST git-htmldocs-1.6.4.4.tar.bz2 756995 RMD160 a6d376213cfd442c046e8cce22c496e18c267ce9 SHA1 63a4e5d23f58bb76bba4630d176eca827f5273c0 SHA256 9adedf1d90fd2d9485a00d75c8c63bd6174c54faf1b99cedc5d8230a8f73d8c2
 DIST git-htmldocs-1.6.4.tar.bz2 753185 RMD160 dfb3edc5b5be7d7931721e7837e5d72a9a38a6cd SHA1 cf162b278a39fbe78c90f015ba3749d99b8ab7db SHA256 70a83b82d1900e4ca80608388a87b3aa9e066f9a29cef487db1c29de645e06b9
+DIST git-htmldocs-1.6.5.1.tar.bz2 775874 RMD160 2327c9da7e11068a415764921d10189506b959d1 SHA1 34ff79cb18f48aa062996e82d3fa2e3547b096c4 SHA256 cef6b4ca58512854628f9b07dc1c3c21c4f6c4e90ee3f4902b34f9b3d2105703
 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
@@ -32,6 +34,7 @@ DIST git-manpages-1.6.4.2.tar.bz2 248508 RMD160 80aac9a3bef03ca9973ab3e7dd03cd02
 DIST git-manpages-1.6.4.3.tar.bz2 248228 RMD160 27699b3d7a5e2088099c7695e3f4d1214c6f5ed8 SHA1 3186ed5a5e14496842c8389b4a3704c57a7e9569 SHA256 99489e55548dd1898d866bdc90dc94942396eebf42dde0d446f1eb7195c83d29
 DIST git-manpages-1.6.4.4.tar.bz2 248348 RMD160 fd1a267973373bc625336abe2b50545e12cc6fa4 SHA1 39b76f19751995ba3f093cac0b47900e22a5dbd2 SHA256 a2b2fb1aabdbb3e1e8ae9472523b9fef23c3e8a992bb8f68f17ad832a6e59c98
 DIST git-manpages-1.6.4.tar.bz2 246610 RMD160 0b008edd9b120a82973a7caed380e2a13f4af478 SHA1 34c8afef3e03283585edb1093b517f697f18a47b SHA256 b7ed025920594dff4ab9dc959bbefd99fa4ce3ebadef81fc92aad4d66065b7d5
+DIST git-manpages-1.6.5.1.tar.bz2 252259 RMD160 a276db7b9799c233d1ea50e9116fd864b221e18f SHA1 e0dc828f2ec4a4ab47ee7f56ba305843e4f7fa8b SHA256 6d5eda88b136129ca5fee6703a3d000245f38870d4b0292d252bfea786c3f5a3
 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
@@ -43,9 +46,10 @@ EBUILD git-1.6.4.2.ebuild 9821 RMD160 f15a4f0f08995c626b629339c5dc58ed32434e0c S
 EBUILD git-1.6.4.3.ebuild 9821 RMD160 af24b1ba074d9057a8f5e599404f31b50f49b5fd SHA1 f93074849d2bb74ce909d9b82660012367b26fbc SHA256 1edaf7a0d525436a516bfc2dca0701575c283a8fd947fd9e7a9eb17078af553e
 EBUILD git-1.6.4.4.ebuild 9811 RMD160 c0780fdf55763b2d6de60daf9ea1808d2aad16b3 SHA1 9c16fdf4e691f341aebf3a62c2fd7c4ead8da062 SHA256 b3d51ba85fd2a60cae86a9733a0e27255e2b45a763efbac7a3a87b13552ca3d2
 EBUILD git-1.6.4.ebuild 9819 RMD160 de1cf8f5663fbab2bb375df1e2cd3bb2b52f198b SHA1 0e8a42316f6208afc2945372931aff2b27bd965f SHA256 ac21060922927b8416e9322b8465abc547fd75ec884a61176a3833c6b46f6338
+EBUILD git-1.6.5.1.ebuild 10168 RMD160 88b3bf9a825f2747d6bf5e00453e4767418ef938 SHA1 c338dea641ed782111c24341e56546e65be77d6e SHA256 38dacbe31209f19df1caef00b44549bf3209739c6703843a71dffcd68a4848bb
 EBUILD git-1.6.5.ebuild 10166 RMD160 9bcc1577d0b38e77213c116c0613a95ff0ff4cce SHA1 fdf93b802abbc2d3b55e67fe4d6c6b534e2785c2 SHA256 badc2c40eae8c1e374f5d8e89541cfd23596975d7d965c74dabc4c44cbdfdcc4
 EBUILD git-1.6.5_rc1.ebuild 9823 RMD160 40a2e88febb5674a6f79ac382e8cd94f4a4930b9 SHA1 8c3262bf66824db6705044a4ef50dfbab3304ed7 SHA256 518ac6c3ebbcea01f28193899656af708b1ec59988129415adef42c80850f90d
 EBUILD git-1.6.5_rc2.ebuild 9839 RMD160 5af2b096f748f2dc3a3176eeda04083756509653 SHA1 c43a3ea0e626f903692688442a2a46b8304d9773 SHA256 f14799b5bdad4fb565fd64f782189489dedf29d778f6d8969ce75267f59ea5ea
 EBUILD git-9999.ebuild 10166 RMD160 20455e5779020e00b966b49acb59f42da7301b76 SHA1 523efde94fdbabd41fc89a0286679fe9435629e3 SHA256 5fe02526fec50db0662ade16f11e3bd88c0adef72e455d542db1e15da6a34a96
-MISC ChangeLog 57206 RMD160 d3255c10b227432fe6c557bb48f6239ff2036d82 SHA1 5986657a39d8e0c76247d4d45dc335b215559dad SHA256 cc07bf76a2e9dfec50046ead0de1aec7aca32d011907b9a56078d639a14f1847
+MISC ChangeLog 57324 RMD160 3179f46a02ace5156e4377f0d987a8c2550d73f6 SHA1 467a454738f34145534c984532132bc66955973e SHA256 d32d41714a75f3859c14a245fc26d2d2f4daabc00a3dc931fac40dc818349f1e
 MISC metadata.xml 1610 RMD160 6b03b898986d26bba7ff441dc1c8c9ec04a9a2b9 SHA1 a0a0d304138c648729d225954de89c1aac359008 SHA256 d070dc8e46e0fd44676d0491353f95385e65c1ffcd1313193dc59d495245c007
diff --git a/dev-util/git/git-1.6.5.1.ebuild b/dev-util/git/git-1.6.5.1.ebuild
new file mode 100644
index 000000000000..cb8e02cc47b1
--- /dev/null
+++ b/dev-util/git/git-1.6.5.1.ebuild
@@ -0,0 +1,378 @@
+# 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.1.ebuild,v 1.1 2009/10/18 02:02:09 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="
+	!app-misc/git
+	!blksha1? ( 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/pygtksourceview:2  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 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"
+
+	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
+	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 :-(
+	[[ "$PV" == "9999" ]] && 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"
+
+	# 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
+		# 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 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
+}