Version bump.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

3 files changed, 538 insertions, 2 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 8d6a4c4464ce..a440d30b2712 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.123 2012/02/23 02:54:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.124 2012/02/28 02:08:40 robbat2 Exp $
+
+*git-1.7.8.5 (28 Feb 2012)
+
+  28 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.8.5.ebuild:
+  Version bump.
 
 *git-1.7.9.2 (23 Feb 2012)
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 599b2cc25766..82b556c12e06 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -24,6 +24,7 @@ DIST git-1.7.8.1.tar.gz 3539908 RMD160 b9b6c52fa38712679867e140c6b5d1bfcbc05831
 DIST git-1.7.8.2.tar.gz 3543890 RMD160 9d2cd1f2c1009122a2c8d41f7d4696fa83d3f198 SHA1 7187c1af96db0c181b801957d6e152ec7cd60ab6 SHA256 2247f214fce3be72da3020947ce3fbfb7f6f9950a145897554e043cd63f9a3e3
 DIST git-1.7.8.3.tar.gz 3543164 RMD160 2c88b4cf4f915363dfdc1bddda925f4a62b4e454 SHA1 e5eb8c289b69d69fd08c81b587a06eb5dd2b5c1c SHA256 77f52b7104a107e0fbe1ce85b3f35c97f029fab92cd35a3909015ca169af505d
 DIST git-1.7.8.4.tar.gz 3544195 RMD160 ee203b3d6252c2df150ef7904c6b95672dea4aff SHA1 add7b05f26216181d1b148dde298432132552b0f SHA256 71a5a98d386061fe606b5be1ac390dc725d418d12edfa20796ff7671247c67e3
+DIST git-1.7.8.5.tar.gz 3544390 RMD160 900f57e121f0aa0a312128983c030d21400aec7a SHA1 bb3d715437a4751f7de0c89156bf97dae7c6049a SHA256 b235fd332525c22eeb6f4f5e0b44b21f1ff1c35a7c76e6729a7a560b2fbed622
 DIST git-1.7.8.tar.gz 3538330 RMD160 efde5f593ea804a998c4aeebc27ccbc0674596e4 SHA1 7453e737e008f7319a5eca24a9ef3c5fb1f13398 SHA256 ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713
 DIST git-1.7.9.1.tar.gz 3608449 RMD160 acff1b02a507220e51a86b63d38a5ae4ec01f70f SHA1 bd85327627f96c4e98071a4d1d32c30f210aa54a SHA256 b689a0ddbc99f9a69aef7c81c569289a28ba0787cd27e5e188112e1c3f0e8152
 DIST git-1.7.9.2.tar.gz 3611846 RMD160 af5a35d1630c2ea2472665f461953baaf3a42dfc SHA1 7aff1048480a8637de94e8d82744d312c0b5e060 SHA256 bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75
@@ -41,6 +42,7 @@ DIST git-htmldocs-1.7.8.1.tar.gz 1695296 RMD160 9f0a4d43e327da14592ecca6816301f1
 DIST git-htmldocs-1.7.8.2.tar.gz 1697858 RMD160 d9f5c0b4c01e682f241ebc59d1abf7cd79fe6dd0 SHA1 9047175e5c46aa3260c42e6b4459cf4ee5a7bb8a SHA256 c402b231b8d8b8ecae267a6e3b0224c473c0f0c3fd0e22915d07854276d8c800
 DIST git-htmldocs-1.7.8.3.tar.gz 1698145 RMD160 3c77c0ae24b3bd035c1057648736d6ba008c57ab SHA1 8a65d2425c1b6f646d130cf5846e92e9e0e93736 SHA256 d6dad326af1aaae36d349f6a722a6c53e6a936f4e6a470d96320857319db6af9
 DIST git-htmldocs-1.7.8.4.tar.gz 1699142 RMD160 beccc1e17f6d930c79f2f35aeac4e8dc0c318e1e SHA1 ac2b89d8d4418c7633ee2344e89eb7dfcb81522a SHA256 a86d8d939cb031d8ebbbaa17399c32474a13e0e4a6705406ad5771620b351acd
+DIST git-htmldocs-1.7.8.5.tar.gz 1699204 RMD160 6313e769957f94a5b120656ed1b6419709a8aa8a SHA1 71cf25158ae3499e33327fa9469279771429f9f7 SHA256 64eb6ebac332cd23eb9f0ae1aec26c7f03da9e73b32dbb32bb84ec8c6efd19a7
 DIST git-htmldocs-1.7.8.tar.gz 1694941 RMD160 07344d8dd95f2d72667cf16a4f340aa5cc4c8950 SHA1 2734079e22a0a6e3e78779582be9138ffc7de6f7 SHA256 45b3e3016bd5dbd933bafd5e8091acb0431ff3a63b7fd829e9d9832dde096862
 DIST git-htmldocs-1.7.9.1.tar.gz 1743893 RMD160 ba3b1b5eeeeb00ca0050c670ad3bddea5c19ffcb SHA1 de5ad73499cfdb08e261bc481c84a75f11b7ff0f SHA256 df21e008501ca0825d153d1746cf0f7742a87b15a98c6881d4fb9611897226df
 DIST git-htmldocs-1.7.9.2.tar.gz 1745003 RMD160 296cd29ff0a3f464760c8c30efa1123f17174222 SHA1 3cf13b03b2f64d0458212232cc18983231f8251e SHA256 da9c90e9e175448cf7940acbd287bc927294b3fd8ddf8d9a1e10266eff872b3b
@@ -58,6 +60,7 @@ DIST git-manpages-1.7.8.1.tar.gz 496876 RMD160 d3e601038e8fc85b32798148ecc8c8239
 DIST git-manpages-1.7.8.2.tar.gz 497249 RMD160 94477d2e301c684ca271334ee66699071421c896 SHA1 cc394a0a9689297fddad40c1ccbded0ba9d708da SHA256 87b95eb0e6d93c71dcf850100a1ebdb2e06b86a03603a695f7ffb947f4da94a9
 DIST git-manpages-1.7.8.3.tar.gz 497446 RMD160 87aad1c9975a006683ab6b1128df39ae19b30d2c SHA1 a6e2b7cff8181ee52a1cc00ebba7b349850d6680 SHA256 5c0c402d41c577b9cd9a31e30abd029d3e79d6c3164d4a527d3103ee2a0dfb5a
 DIST git-manpages-1.7.8.4.tar.gz 497621 RMD160 0ab22cbe1820b29d991a63cfb087aacb42b8223e SHA1 4372c423a0d2f7df33b5b39727a81f0a7b40669d SHA256 b4930a17de7b18d40d81c3830913e5c4c2a91134e3a331ad49757d496ee53b76
+DIST git-manpages-1.7.8.5.tar.gz 497426 RMD160 b4d902d69d0b983fa9ed6c014eb3a7a02ac263df SHA1 ce327331973b6e100b6a69ab8f9c526690260e92 SHA256 1a890f2cd2a875d2716ebc83413c08750ce15194297f3aabd66014f4f8f511d2
 DIST git-manpages-1.7.8.tar.gz 496974 RMD160 ee09c9a1c80fe46ca3a6787ea30eadeddee2a9a0 SHA1 93315f7f51d7f27d3e421c9b0d64afa27f3d16df SHA256 f67d593f5aecd01ec42683cff515172c67f79109161629621e9df58e39ef5354
 DIST git-manpages-1.7.9.1.tar.gz 508057 RMD160 2ed606396ece433ff3206bb4013867882e2cf51f SHA1 8c6ee031b39da5c5e53f927952838796e0959ce9 SHA256 f31d91061e96b5f882ceed2160d44937b2679931e7e217a66bfe3a23df46adae
 DIST git-manpages-1.7.9.2.tar.gz 508005 RMD160 229aee67eb986f81d8e2d511df18dfd8adc0ae41 SHA1 d6992d899fb70e40983f94a2f96ad24b8ee93557 SHA256 c653a3678bb5668c280a0d5ba584fdfb0e4272acbbd00901dc2363ea3f58eede
@@ -75,11 +78,12 @@ EBUILD git-1.7.8.1.ebuild 15110 RMD160 4e8aef92de685c2636f45ed19b169a10da0d2085
 EBUILD git-1.7.8.2.ebuild 15110 RMD160 1b0ea4da22c120a9d696c62dbf19c97e4215dad6 SHA1 631e62ad317a44841363f19a167d9ba83f6d90ec SHA256 c4021030525ea958d054077bcf9658e24a3222bf105dbe68f04cfb6c95e28ce8
 EBUILD git-1.7.8.3.ebuild 15110 RMD160 e6c7afb193b21fed5df83773d245cb906c742713 SHA1 93e44695e199d483f076c62adc7de723f5782283 SHA256 cd68b51ae7d404e05f7e84f13d8e3d4ad54d434ea46d611232c516174dcfc739
 EBUILD git-1.7.8.4.ebuild 15110 RMD160 08984137854bd39d7d1f81773e81d7a615ed2a73 SHA1 6aaecd308c32d0f8a5f2467edb7061fc4b9079de SHA256 8b999e3208749bff054c2d3d35569d4d945a645793f702045501a84a46bdede8
+EBUILD git-1.7.8.5.ebuild 15110 RMD160 08e1944f00196f50b7daa312f1462acfcffdc10d SHA1 00b7b765eecc87ea44ea3c3c3e04d54d837d2cb7 SHA256 0915823368f53351c4ff8ed306e1c1b3ee204394c9bac154b03af5e57b20fb9a
 EBUILD git-1.7.8.ebuild 15108 RMD160 bbf80a4cdc89f02f98a0fab0c514b84adae71f7b SHA1 59459055b38ac4560ca487fcf2c4551739957725 SHA256 ada91dcf9536675492ac599fda7072b47a135356180c36b04ed8210dc0070760
 EBUILD git-1.7.9.1.ebuild 16745 RMD160 fb6e5b2f0db6f372a7e51d87db2420e101d7cd03 SHA1 2145fe0320e0b2cf0315a16deae659aa10210f4b SHA256 44ddbe1ddaa2f4137c3072a22b99e977b37f54a4e45633b501ba31b62f6408b8
 EBUILD git-1.7.9.2.ebuild 16745 RMD160 ab9da336e51e9c27cf25b72ea12937c16be107a6 SHA1 5afb8b891481407c648be6266654210740619e97 SHA256 9e71db55b1917ad0e229feda4955a5c4336f3fbc604d23ccfcf06df4c974e052
 EBUILD git-1.7.9.ebuild 16743 RMD160 57726023782dd6f2913ac1268f200e900c24adbe SHA1 420cdd91bc2079901f044fbbf1005fa3ff9f502a SHA256 9327c388badccee21c25f6fe5556fba20e9e245de276cd784a2a5220117746db
 EBUILD git-1.7.9_rc2.ebuild 16377 RMD160 8de8a1978772346f6aee19e07fa7409a4a6d9a76 SHA1 d884a5714ac92b4b423ec651f6d29a1ad100f8ad SHA256 c843afeb9b1139d5b883d25c4398aa7b1663c5faa223d4dba96b59119c5bba71
 EBUILD git-9999.ebuild 16335 RMD160 ef3dd86600eb42a6aa274fc1507bef7fc06a9275 SHA1 a874f8d6b567a1af52c6cff760678e0ff0e71e8a SHA256 39cdd6da1b229e68421950abc264407f8d5251037bd7db1a535c999bf458118d
-MISC ChangeLog 86195 RMD160 38af8a4b2124c56e018f2a2ce7281bde17e7f11a SHA1 451e311e4e1754aa014067ec481f3e7451596840 SHA256 ddc78b0e78e717e62558ab02be4f3e4957c0ceb359784d37134fd6051c4be726
+MISC ChangeLog 86314 RMD160 c6fec6adf55e65d1464151a77c5e205e6e6bc1d3 SHA1 f752f1b4e606f20bd8b279f156eafcd93dd9eafd SHA256 18e7c0b409089901b4c1aefba950faefe3de2e8b8283299fd571d7dca40136e6
 MISC metadata.xml 1519 RMD160 4ba9e2c4e8239f644b1f4a82bc47d1b587e195a6 SHA1 813d8c8015a1cb757e54fa8681f8a7686cfc40e7 SHA256 58313781f3108991fee93cb0119e6720fe895487e43d44dbf96c4733f81854ca
diff --git a/dev-vcs/git/git-1.7.8.5.ebuild b/dev-vcs/git/git-1.7.8.5.ebuild
new file mode 100644
index 000000000000..7cdf9e34cf54
--- /dev/null
+++ b/dev-vcs/git/git-1.7.8.5.ebuild
@@ -0,0 +1,527 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.5.ebuild,v 1.1 2012/02/28 02:08:40 robbat2 Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
+
+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_SUFFIX="gz"
+	SRC_URI_GOOG="http://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python 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[-build] dev-libs/libpcre )
+	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-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8
+		dev-python/pygtksourceview:2
+	) )"
+
+# 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 man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc
+		app-text/xmlto"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+pkg_setup() {
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/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
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	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
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${myopts} NO_EXTERNAL_GREP="
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
+	#	|| myopts="${myopts} NO_ICONV=YesPlease"
+	# because, above, we need to do this unconditionally (no "&& use iconv")
+	use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use python \
+		|| myopts="${myopts} NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+
+	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.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_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
+	# Merged in 1.7.5.x
+	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
+
+	# USE=-iconv causes segfaults, fixed post 1.7.1
+	# Gentoo bug #321895
+	#epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
+
+	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
+	# user.
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
+
+	# bug #350075: t9001: fix missing prereq on some tests
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
+
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		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"
+
+	# bug #318289
+	# Merged upstream
+	#epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
+
+	# merged upstream
+	#epatch "${FILESDIR}"/git-1.7.5-interix.patch
+
+	# merged upstream
+	#epatch "${FILESDIR}"/git-1.7.6-interix.patch
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="$(PYTHON -a)"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+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"
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman 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
+
+	newbashcomp 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 "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use python && use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/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
+	newbin contrib/git-resurrect.sh git-resurrect
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		blameview buildsystems ciabot continuous convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
+		stats svn-fe vim workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/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 \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.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 \
+		t0070-fundamental.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-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/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
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first
+	cd "${S}/t"
+	git_emake clean
+
+	# Now run the tests
+	cd "${S}"
+	einfo "Start test run"
+	git_emake test
+	rc=$?
+
+	# Display nice results
+	cd "${S}/t"
+	git_emake aggregate-results
+
+	# And exit
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use python && python_mod_optimize git_remote_helpers
+		einfo "Please read /usr/share/bash-completion/git for Git bash completion"
+	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
+	use python && python_mod_cleanup git_remote_helpers
+}