Version bump.

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

4 files changed, 836 insertions, 2 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index bbd5966c258f..2fbb5adecf7d 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.393 2010/01/02 15:16:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.394 2010/01/21 18:54:12 robbat2 Exp $
+
+*git-1.6.6.1 (21 Jan 2010)
+*git-1.6.5.8 (21 Jan 2010)
+
+  21 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.5.8.ebuild,
+  +git-1.6.6.1.ebuild:
+  Version bump.
 
   02 Jan 2010; Brent Baude <ranger@gentoo.org> git-1.6.5.1-r1.ebuild:
   Marking git-1.6.5.1-r1 ~ppc64 for bug 290163
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 1441b1a62b15..483df4fab220 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -18,9 +18,11 @@ DIST git-1.6.5.4.tar.bz2 2248240 RMD160 dd32eab5d5acfc47e7c73df01043fba19ee956fc
 DIST git-1.6.5.5.tar.bz2 2251115 RMD160 8b40fa2fd69367b36644dd931ffe983305a2c3ed SHA1 3480315deed7ab8b495032a7a06257491f520f53 SHA256 4d1aaf16b4c37c8412cceab09b009bfc0f8d7b9f30a809b82027ab7fa66fdbb3
 DIST git-1.6.5.6.tar.bz2 2250242 RMD160 85af6820d9173fe5a7481fdcdae460bbab1494d3 SHA1 1f09b5170fe906eafe0471dcb9ec9088bddd7653 SHA256 8e6261fc2fe162b0f1f5f0ad7aa42f8922491b9a1c43b3a1e9e6a7d049f2f106
 DIST git-1.6.5.7.tar.bz2 2250714 RMD160 83865a2ebef8fcc227fe18e621c1bb5bed03c0c9 SHA1 05f2dd3004d4e881d2ccbf528497204726fc6e9f SHA256 9477787040588167722679072567990d0982055afa832fe72b8cdc47b52e4346
+DIST git-1.6.5.8.tar.bz2 2251068 RMD160 50892e72ff4c04a9590266fe167d2b0dbffc4214 SHA1 e031ec8f07a40e256abf5f9ae70e98858e23bb7b SHA256 71e77b1d655645998c8efa5b62fca46e7d74dcfbccf704570e390dc4960baafc
 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
+DIST git-1.6.6.1.tar.bz2 2331778 RMD160 50c38a5790367ed66eacd1741b651d7fddaa1a2d SHA1 6941f1b675ea2047286437c834e6272175102c19 SHA256 79c3049913a11b966b92406ec3ef6c7c5eb680cfa2a8b0c1abb167b1bfaf9769
 DIST git-1.6.6.rc3.tar.bz2 2325545 RMD160 ca5a780f70175469ed21fad5a91753e677ffd37f SHA1 10c50d29fbf63e6959d81ae27bf89b95b78eaaf8 SHA256 6f237057745a61de2050a7775f6c2d7b16534e7c4a2d46c282167826609b6967
 DIST git-1.6.6.rc4.tar.bz2 2326566 RMD160 820e8b592ea09b84c4a3ffce5c867a87f53f532c SHA1 b13d9dff668ecd86d3aa14129e5ac4cdc31fb38d SHA256 8a79ad53bba052ef4822132a01cdb21c32ec1a9409da47f9d5dbbb78dcd032d8
 DIST git-1.6.6.tar.bz2 2328343 RMD160 59d96548ef54f117892d6c602973bd0decf155b4 SHA1 21d83108c618d0f90a166b7ce403c9d1166a0d95 SHA256 c3f7a384f7f8618ec1c2a732c8c0a94accf00214602beea34fbb39566041c19c
@@ -39,9 +41,11 @@ DIST git-htmldocs-1.6.5.4.tar.bz2 780469 RMD160 c280b4d139dd237dbdad10d393ba62e8
 DIST git-htmldocs-1.6.5.5.tar.bz2 784103 RMD160 858953350d038fa871b340ef14887478171b5cd2 SHA1 e4ee4723010ead023b5db22d6d2a1a56d16a0864 SHA256 9c664e86f802ac78635d1c416d64e9f01862c4089692d928ebef4bee4c18662c
 DIST git-htmldocs-1.6.5.6.tar.bz2 783935 RMD160 1bd69da1ed5f7d32d358631700da2715a31e33c6 SHA1 a7642cd63ce5bbb8340095d65d57342c311c7a2f SHA256 c968f60dba6517d2f741cad26dcc52f8e3cf4bb264e115e5aa4b775a9881d93a
 DIST git-htmldocs-1.6.5.7.tar.bz2 784296 RMD160 412de996916034c5d5c59eaffb45b542f708381b SHA1 343791188b6332f17978ffc0fb5c1549ac38231d SHA256 b51790452d0c016e8cf93d43c5113b0565397eb03943d8b18bf420fe5977ed8b
+DIST git-htmldocs-1.6.5.8.tar.bz2 785781 RMD160 b43c68620f629154ff9207e80cdd5d9b6c5a35ac SHA1 708ed85fc819d35f8f237299d468c2123148c4ed SHA256 dcd919d44f4f1d30069a47e2f5e2d009a32afb61c500c0ad40748d09c4315eea
 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
+DIST git-htmldocs-1.6.6.1.tar.bz2 848476 RMD160 892d02428f72e2d133c2b3f10c0d870701439b6c SHA1 e4bdd13fca2aa47d70c4c0645d0aae9b1c16c72f SHA256 06378bbad53b04eb22c0c62400f0bc723d692611c126228b914a8888c8a63e54
 DIST git-htmldocs-1.6.6.rc3.tar.bz2 846535 RMD160 a8a8e3dc712cd59e6712821d58b9d852ad9d9c39 SHA1 04c17f269524fa19415886283faac1b81840c202 SHA256 4f6ddc4a329a150a9525e61d948339fbd67ac8f5f2ac017a40b52164cee739b6
 DIST git-htmldocs-1.6.6.rc4.tar.bz2 847454 RMD160 4a14752e3fced6e389387a66c5927b35664aae7c SHA1 c2b8e44bdc4de0a7e064da9303e05f0963fae46b SHA256 17721212bff450f795c359fddf58e45924be6db0f7f48edc494cfe63ad9c7ee3
 DIST git-htmldocs-1.6.6.tar.bz2 847046 RMD160 4f21ac2d123579970c3f46d9b87aae96c319e230 SHA1 8313c14989d63317d0d6866a0aad68db5abb194b SHA256 35ed4ffef3231e0641ee6042952ffb55e108af098bd32296b04a570b17a157df
@@ -60,9 +64,11 @@ DIST git-manpages-1.6.5.4.tar.bz2 256887 RMD160 5c02008781e413f452ee604f669485a7
 DIST git-manpages-1.6.5.5.tar.bz2 257668 RMD160 02a103c9fcab9406a3311f731f5f10b966c112b3 SHA1 f8b0cec115108714944da4c5e8005912b86f85b5 SHA256 1462c3c71985d760679bfd27219c03572c92d3149aaef8cae802fe6217d05c73
 DIST git-manpages-1.6.5.6.tar.bz2 257256 RMD160 b33f010f2426430f433b48dcd592ee406724c243 SHA1 b97e529538a2a28345e567d46d64538f99906b84 SHA256 344b4e85afc4a07595c745adda3b3fe9ef7a4c6780ed1cb9d2a4350b8d2063a2
 DIST git-manpages-1.6.5.7.tar.bz2 257450 RMD160 8c08af43cd3cfa58a1bafb60e07b77b99e8782d8 SHA1 bb383dd768ece1cc602c2ba7dcf623fe8bba2a44 SHA256 009f272fbd7be89b93a197fc947abb8d83ef702bb664373fe715bcefcd2102d2
+DIST git-manpages-1.6.5.8.tar.bz2 257494 RMD160 00aa690c3e6e7c6fb9a105515cbd9152293e25ff SHA1 42fe981efb679636b47a193b86f99810326e60b5 SHA256 a0b43a6483d6d5441bb42bed298e3c2ecd194dd983045c0feba523552418fb08
 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
+DIST git-manpages-1.6.6.1.tar.bz2 264778 RMD160 a25109904f9813d43907dad261c516eeae0fba47 SHA1 7447d89130e6506a8f0dc3dc198aa4a5a86a93fd SHA256 8282a948e8d06d75cad38e91ef6ca99871f44021c5e2ddd1c50327259a808236
 DIST git-manpages-1.6.6.rc3.tar.bz2 264396 RMD160 987619b81ffbca2a7024961242653c5d54968149 SHA1 dfe1312fe7a294b609c855c5256e7409c58fece0 SHA256 9de35dd5e5a2bbfb8af933cd03358b7d9ab9e65a32134c5aa97429600715e25b
 DIST git-manpages-1.6.6.rc4.tar.bz2 264432 RMD160 14a8631bf6f91083822020f4fd44cfa6a88c1f48 SHA1 3b3c7c7a6e811e6f89b0162c5e847928c6466b81 SHA256 be91019bd480e7109b454e824608ef44b93732edc66374613ea245111d985168
 DIST git-manpages-1.6.6.tar.bz2 264409 RMD160 86fda1c25e75fbce40719f5c26b61727394f6f84 SHA1 1621c502908d6cbd640a81a7c96dc22a30a68a60 SHA256 d1f5ec7e4094bc1ee9b6326e93c7354962c0da29ae801793c48a044e2846e862
@@ -82,14 +88,16 @@ EBUILD git-1.6.5.4.ebuild 10822 RMD160 c51e347831e2a61b070e16cae510bb7847c630db
 EBUILD git-1.6.5.5.ebuild 10822 RMD160 0fd9110b3e5b4446c068a7295c30e1ba2c0e5456 SHA1 c5d84135dbaf3df269a164c1986702094426867a SHA256 c2fe54a0d7e62d719967eeda44208a10671b143a9d5afdf6a8aa00f4f3cfe545
 EBUILD git-1.6.5.6.ebuild 10822 RMD160 ac8cbeffc207f2ed885eb21fcc520c966c6b8ae5 SHA1 764b96810add1220e27ef70c4410748f3d395c13 SHA256 bec8150df142594d448ca2cced58e8d82c2ab2c7afeab7c361f465ec92ff1a83
 EBUILD git-1.6.5.7.ebuild 10946 RMD160 e38e103a60eba0267de125b4215c6c2755715e92 SHA1 fec1903ca1f8cc6cbed66e133981b4c0bffa1f4c SHA256 5301dcc096452a642c14b554d171d01bcb84e49f8bfa05d9d713d67bbe14efc1
+EBUILD git-1.6.5.8.ebuild 10951 RMD160 c8e597d6d4ca88b99839db7f787de75066cccdea SHA1 cefa492903724fcdd0ac616d34879fe43dd9e052 SHA256 680a79acf7f9d6d21ce9f5b894bc7786447f9ac55f1a74d3e717d23c717e18e6
 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-1.6.6-r1.ebuild 11125 RMD160 52882c3f30ab63578caf10e8f2e8288c94905082 SHA1 cfa1461379d3f82ef22623ba47cb8264d14f21e7 SHA256 9569e8c8490bb74430169be0842be91c880793dd9f4e3d5e4f77c292797060bf
 EBUILD git-1.6.6-r2.ebuild 11130 RMD160 93f4e79cf93185064a266b9ca52cb56c7eb9818d SHA1 f1ce076cc53a5c74d6af189fd3750d6c6e5b6259 SHA256 cde2853503277f18eef83250bc9042fa884b134b3026a615724695e99da86025
+EBUILD git-1.6.6.1.ebuild 11129 RMD160 22db3dc7f6582db9f3d06ac85f9d563df32e8671 SHA1 8f3d58359746b2e08dfc41b8374c2c1b7feac4cc SHA256 19e770df7ee4b3c8556f7457db30d0db19f9ca7adbee9cd35f3a7c23d6a48196
 EBUILD git-1.6.6.ebuild 10944 RMD160 5fbeb97e618d70fd89d769625b3f326e4807a663 SHA1 92d66eb3692532b79ad27823cbad7de83088d7c7 SHA256 8ef6535cf8d2016e2e4797071d11f9878b877c711d4e2a45efe95b06ae624772
 EBUILD git-1.6.6_rc3.ebuild 10948 RMD160 d26ee1d80db76370257ef1a9dc98d147dac8998e SHA1 fa5850d6fd8b645e766cea7f7db0f13c01727fd5 SHA256 39316fe2f1e1b6dcf36ee3cb67f1c949ee2cb86d83fe3ec20bc2337b9c42a223
 EBUILD git-1.6.6_rc4.ebuild 10948 RMD160 a8a6e815a9bad3b2b0bd585a03249ba5ebaac3ab SHA1 31f2c22aed19ae373096deceee109e8812a5b1d4 SHA256 02dba7f8470d2bfef0116c8b8266de9200693745bf396bdf2e93036f0a2fb540
 EBUILD git-9999.ebuild 11127 RMD160 f8d5ae620a551c4ff473356a931ad8d445e6b8cb SHA1 4eb76484dc64f5aff32e1dba45eb2d3319c686b0 SHA256 23ef849a0321e3237cd5c909e774078e6ada59a5a92a08407d81a1d257ee0883
-MISC ChangeLog 60899 RMD160 00d6b9ba1184c437aa3500a83ebdf098ed7cb688 SHA1 aa959bd258b25e7f3a2d79f3ecb731c39fe0b889 SHA256 e095cc39fd99ffe3d6764248b5c8efbfffbfb16f577953078115260d951029b4
+MISC ChangeLog 61069 RMD160 c48a640665578404ff841c2a4d83148325f78ff5 SHA1 b02d59ca8f5d39ff37a6311b1a40ed2656435012 SHA256 4d38c1d01220f01c6cb39269ade924b3258cc4ae31faf540d7c6bd423482fc36
 MISC metadata.xml 1610 RMD160 6b03b898986d26bba7ff441dc1c8c9ec04a9a2b9 SHA1 a0a0d304138c648729d225954de89c1aac359008 SHA256 d070dc8e46e0fd44676d0491353f95385e65c1ffcd1313193dc59d495245c007
diff --git a/dev-util/git/git-1.6.5.8.ebuild b/dev-util/git/git-1.6.5.8.ebuild
new file mode 100644
index 000000000000..b51382fa60f5
--- /dev/null
+++ b/dev-util/git/git-1.6.5.8.ebuild
@@ -0,0 +1,406 @@
+# Copyright 1999-2010 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.8.ebuild,v 1.1 2010/01/21 18:54: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 )"
+	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,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-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"
+
+	# 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
+		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
+}
diff --git a/dev-util/git/git-1.6.6.1.ebuild b/dev-util/git/git-1.6.6.1.ebuild
new file mode 100644
index 000000000000..e1d8f765e90c
--- /dev/null
+++ b/dev-util/git/git-1.6.6.1.ebuild
@@ -0,0 +1,413 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.6.1.ebuild,v 1.1 2010/01/21 18:54: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 )"
+	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,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-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
+
+	# JS install fixup
+	epatch "${FILESDIR}"/git-1.6.6-always-install-js.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 \
+					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
+}