Version bump to release candidate for 1.6.3. In package.mask for the moment.

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

3 files changed, 362 insertions, 2 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index b0de256b46bd..c98a9e9aeddf 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # 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.333 2009/04/13 03:02:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.334 2009/05/05 17:04:12 robbat2 Exp $
+
+*git-1.6.3_rc4 (05 May 2009)
+
+  05 May 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.3_rc4.ebuild:
+  Version bump to release candidate for 1.6.3. In package.mask for the
+  moment.
 
 *git-1.6.2.3 (13 Apr 2009)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 679bb97703f0..bfe8ae21ac6c 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -40,6 +40,7 @@ DIST git-1.6.1.tar.bz2 1971286 RMD160 41798548551362611499fd2a525a42f5182b1d20 S
 DIST git-1.6.2.2.tar.bz2 2016513 RMD160 c48641c3b995222d2b70f85482e66d9f66bc1734 SHA1 c5edf42bb2d1e9cbb89a63712bfd567330573190 SHA256 7b440c1589de36e94b751cfb3b9d60d9a3131eeab8229e759a1fd0328ea36166
 DIST git-1.6.2.3.tar.bz2 2017249 RMD160 6df25ea7e1b51cf2aeeac02e8df6ec55257a46d2 SHA1 902452eff5f35b4a915f6e4d90a83391b765ed4d SHA256 c61eaf1c775b56b1421d1f53e4cd4f1eb9a0fd874d653f4810db126cf14651ba
 DIST git-1.6.2.tar.bz2 2016213 RMD160 7e28be59954173666e26940ca66dd95f99cf029b SHA1 685b9e203786dd4bcd7672088bcac42e22930ee0 SHA256 ab7dc40240092aa2e72a8db7e0045893ca5fa07a936e9fa83b242248e3c9f635
+DIST git-1.6.3.rc4.tar.bz2 2055437 RMD160 cf07f48a145a8ed38b122761b4f6e3034ec3f1b4 SHA1 df53c134e3d5ea0b8fcd77db4719f288f6c38692 SHA256 1fbaae9feca168a8b4b9bff25d75b1ac7912d6dfb0883ef8267e7c69bd1429b9
 DIST git-htmldocs-1.5.1.6.tar.bz2 489138 RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 SHA1 907749b4eba99c696589be750bc9432b9818954b SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685
 DIST git-htmldocs-1.5.3.7.tar.bz2 549391 RMD160 18d01c803fd529ac897ae249ce4e05193ee9850a SHA1 926fb29604d69ce45ecf7b57d1b8feeb6c356f9b SHA256 e28c7e149e0f5adb66093af287dffe0caef83926ae08c6cdb6a2d35bc9148d04
 DIST git-htmldocs-1.5.3.8.tar.bz2 549444 RMD160 f4df777094158beea16bd2f0783ef846198e2c36 SHA1 d822887c45437daebf08c7cfe6e93a4ce5136fd3 SHA256 200a7231d6a594aeb5cb0c0e1cf25513c086f53b84170c7c5376199b2659b874
@@ -64,6 +65,7 @@ DIST git-htmldocs-1.6.1.tar.bz2 713909 RMD160 d592885906d0d7fa6283e9a40226f191a4
 DIST git-htmldocs-1.6.2.2.tar.bz2 730394 RMD160 71e189cc6b0ce212ad468664a6fba87f5a1618a4 SHA1 0daafac257a5aa9210d02303ee30f4334b197393 SHA256 96bb0e4ea6ab952e8860cf7f8eccf64d58139f9ede235064cd88777c2d1d1ed5
 DIST git-htmldocs-1.6.2.3.tar.bz2 730139 RMD160 adfc3807858333533998a3e6fcb87023c94a87a5 SHA1 89b0b5ad1c1524088250b887a3b7cde03b309e64 SHA256 5eecea976d555f264f73572ee3f97ddf6a721b33ad2b8744049c0df6b5c02329
 DIST git-htmldocs-1.6.2.tar.bz2 727053 RMD160 a915884c94ac1cf2311389b32c410d12203b43e5 SHA1 4943d51bf49a574e1cefe3833ef6820964b40455 SHA256 e8847d1d2051db1ac1c8a9cf838584d52aad3ea999fb038fd76751ab14bf6a55
+DIST git-htmldocs-1.6.3.rc4.tar.bz2 741137 RMD160 227b83c87931a62dce6324742e69edc06977ff9a SHA1 8153a15bab07c7e027e9f9d4f4c3fc6a2b324f63 SHA256 4004f4690918f74d69924f9c5f43b2723384a337d430f2ad6e46b2784b094c88
 DIST git-manpages-1.5.1.6.tar.bz2 133945 RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 SHA1 f4eeb116aaeeabf329c9de8d49421af42e4a6f51 SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d
 DIST git-manpages-1.5.3.7.tar.bz2 147932 RMD160 fd4b45c221cbc63f580a32595c59eb52da1baa2f SHA1 7cc45f156298d0fbd4ead4a9b2096ed2143287b8 SHA256 870e68ef57f4175152b9b8decc721d8cbc9850ed8eda73919fc9e060f3968ffa
 DIST git-manpages-1.5.3.8.tar.bz2 147875 RMD160 c2a15b7a0742f14a70d0bf06d4d14fe9cf2b329b SHA1 15b9ece73c28897affb5da187835d19ff20e9962 SHA256 73a7cc2c0473694d454a6b7cb311ccdeb82f350bc8e652229d361592ea0a482f
@@ -88,6 +90,7 @@ DIST git-manpages-1.6.1.tar.bz2 231011 RMD160 98f8af44e2b10898df0c4b599e0f88c0d5
 DIST git-manpages-1.6.2.2.tar.bz2 236466 RMD160 5719e66084aab0a9bb040b8859845091bab465ef SHA1 5748daa7da1839922f8651cd95b62cacca6328a4 SHA256 e6dc1cf2e2e2748314300c825a36ff808158d5d288b7d75009c40972a338f6f5
 DIST git-manpages-1.6.2.3.tar.bz2 236557 RMD160 69bba5db8eccc66d55964182cc8bb59788c8b812 SHA1 3bac1d069ddc842ad6d999961d67c975dbdfed5a SHA256 ac069d89745a35f0fcdfe29512524273fa8c41cfe6888c9e6fb0c7e04b2956ac
 DIST git-manpages-1.6.2.tar.bz2 236341 RMD160 b770b9e5bcc259735ae72412eda9b1ec9b587f08 SHA1 e621826b090cac60d28758eb9ec2c7ab4c0d63ba SHA256 13e7d352f9cac1f34d64b5deb006d0961941e43975a33f7d8507df58df1fe68e
+DIST git-manpages-1.6.3.rc4.tar.bz2 243392 RMD160 b3afca4c032471a304e30521ad1397066dcb0410 SHA1 19ca42a2e56808fdbc9a8a91fab6b263f69f55e7 SHA256 f25c836163a814abb702ce1b236eb4b0e283978860c60782aaf373d767939b59
 EBUILD git-1.5.1.6.ebuild 4400 RMD160 c81b28b5efca8244c87cc5f0ac1923c03c9e5b1f SHA1 bb71d825a1c1eef4a5ba26958a7e4dd35b02d938 SHA256 8cbd6c76e3cc3a9e00a3accdb69dec8e134b99acf7cad1e39b243c6289559734
 EBUILD git-1.5.3.7-r1.ebuild 6371 RMD160 847ed38b63b34256ce17991dc6c4dbd34c207955 SHA1 d6edbbd1bcd150992f69eb2655e1ab5b4a925420 SHA256 7d881d0f76b68244aa0021e71beb8537197f2147aa464b5707c39217ec6be87c
 EBUILD git-1.5.3.8.ebuild 6388 RMD160 a76f9cc851a04c6b898f7f34d85b5433e28cfe2a SHA1 d10fbe86d2825b563025c0014db93cbbfd57d47c SHA256 13dc2bf683b369d4b61016587072db9c6b6af54ff0aa32ff2a542ec968a42b84
@@ -116,6 +119,7 @@ EBUILD git-1.6.2.2-r1.ebuild 9483 RMD160 353cf39456b1021dee4175026b9f5406f9e1523
 EBUILD git-1.6.2.2.ebuild 8528 RMD160 aae037fc6b4af9cba28048c770138691ac607d03 SHA1 3b72b7eb7aa8bf8266c2f64c262552b07c670f02 SHA256 151a6c06c5f13ada3d57629aa4ac46284995950279c11b7928be5cea9adda06d
 EBUILD git-1.6.2.3.ebuild 9480 RMD160 1608d1e2d7f5665c30d9e273009b423478e99281 SHA1 76975c25b501909cd0c2b5d0d9a0e92c5430363c SHA256 7418ee5ffcc070339b5fcc66e17a0f1bc33ec1755d8d7fb5c30f18d9475d07e8
 EBUILD git-1.6.2.ebuild 8443 RMD160 0138c4f89eed7055664bb2a84d6e41bc1be60e2d SHA1 7bc2abe4a18f4150792724e6550817f2802ef48a SHA256 a2c7e4858f2bd21973d818d059023cfd2c98177a0bae2aa1c31fff1e7309ec13
+EBUILD git-1.6.3_rc4.ebuild 9538 RMD160 fc9973d8fb1cdcc418296d4369974eef24742014 SHA1 5efc6bc2846e389ef6bdbfdd4ce5a572618130b5 SHA256 1133fdfa4e16394eb5da30655e26ccf1680d1fe9be599c312c8df8ce518a76c7
 EBUILD git-9999.ebuild 9447 RMD160 0f3e10d371c3e44cf3825f9c84840dced2ba0575 SHA1 b2a5b9c5f13600344d368085b2e9df831fd4863d SHA256 3351e00fb6a0bc7382f96efaf4bb378f45725c2c6c2dffda6b4e8dc641d5b529
-MISC ChangeLog 50102 RMD160 03e1261fbe92ffc3f15495aa3b10be81122efeef SHA1 4a07d71dbbf0a27d8f8bf6632a29f7930ec1ed18 SHA256 930feef0051f671bcf6dcfa7a2e2488c58cd28631ea2c99dc52af8010a3da02a
+MISC ChangeLog 50290 RMD160 dc030e0e74f72d46656beeaaf798d0df38f6e0b2 SHA1 c2d4dc318bb0b39ce9f58ad32b5c4d8b6cc6f3fb SHA256 e3f14742844e781eebbc54d79ed3d58dbc3cf3000a1f2e2768587faa7b45e028
 MISC metadata.xml 1535 RMD160 1117b90f1e7550ce3a47f844ac17db78ed803cc3 SHA1 223d8e6b2faf20bf290d90d0d6322473daa49b0c SHA256 58d9f467528fee5c7062d0a2344a3b61ff0b8b7a0a84dffc9f56557f7eadd70b
diff --git a/dev-util/git/git-1.6.3_rc4.ebuild b/dev-util/git/git-1.6.3_rc4.ebuild
new file mode 100644
index 000000000000..1c9b66151133
--- /dev/null
+++ b/dev-util/git/git-1.6.3_rc4.ebuild
@@ -0,0 +1,350 @@
+# 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_rc4.ebuild,v 1.1 2009/05/05 17:04:12 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 ~sparc-fbsd ~x86 ~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 )"
+
+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
+
+	# Noperl is being merged to upstream as of 2009/04/05
+	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.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?/* 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
+}