Version bump.

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

3 files changed, 526 insertions, 2 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 2740ba8f92a1..fb5afefc7f38 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.84 2011/01/24 23:45:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.85 2011/02/01 01:24:33 robbat2 Exp $
+
+*git-1.7.4 (01 Feb 2011)
+
+  01 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.4.ebuild:
+  Version bump.
 
 *git-1.7.4_rc3 (24 Jan 2011)
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index cc53057cc200..a2f4c78bd628 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -26,6 +26,7 @@ DIST git-1.7.3.5.tar.bz2 2635455 RMD160 3ad6eb187b7a901addb3ee5a2ade70ba550007f6
 DIST git-1.7.4.rc1.tar.bz2 2709984 RMD160 3e96a650d63c27bae10b14911de7035fe72f4410 SHA1 2057d6e0f48494dcbfc13d292e3eb0c67608fb45 SHA256 13fd63997191e2bfcc764d33d71530f61731067ed9e0b7abad06fcef3f8d5bb9
 DIST git-1.7.4.rc2.tar.bz2 2712364 RMD160 1107e4ea6bf4758b65341f9421cb3afd652b65c7 SHA1 4b0f6e7c78b3b486fc4532a937a5e08cbc3f7a72 SHA256 d4c875b4c5d6a2ab51fbd5af87e3fc0bfb743607434282d40664f566b3be6352
 DIST git-1.7.4.rc3.tar.bz2 2703193 RMD160 b199537aea83324f11e9ccfcb34eaaf82b29c0d9 SHA1 f6236da4b4e47cad68ec8f731a070f1ee3b15533 SHA256 fbc9c6ce117253be64144edcb20caf31fe5f13307e0fefeadf9e224e0b2a5512
+DIST git-1.7.4.tar.bz2 2703735 RMD160 a064d7a5b2d3fae6171ca91a03082eb46d7bb9b7 SHA1 57b783627d9a9515ce3ef8f79128074de6197b2e SHA256 8e260b9e5dfb46a35f26e3db450c2dabb4d1df254bfb2820779945a1ecbcef51
 DIST git-htmldocs-1.6.4.4.tar.bz2 756995 RMD160 a6d376213cfd442c046e8cce22c496e18c267ce9 SHA1 63a4e5d23f58bb76bba4630d176eca827f5273c0 SHA256 9adedf1d90fd2d9485a00d75c8c63bd6174c54faf1b99cedc5d8230a8f73d8c2
 DIST git-htmldocs-1.6.4.5.tar.bz2 772113 RMD160 64b3f689385334d9b101b4bb8647f0fed14bd1fc SHA1 4ac2ede0a3ed82dea9107ff5e4a4948b60282f49 SHA256 12c13ead869918d8470d68c7331675c56a192eae819c283a398aaf9f0f7555d2
 DIST git-htmldocs-1.7.2.2.tar.bz2 897657 RMD160 5318d7276a71c173fb16a1e7f503bf868e529654 SHA1 4b720a1b4614c2be5b969f728e5f3d5127a58e92 SHA256 564218c2b5b9dfd61ef974f2386c13555f01c9cab567f8d164327a5fdba54e3d
@@ -39,6 +40,7 @@ DIST git-htmldocs-1.7.3.5.tar.bz2 930432 RMD160 8ee1e22158d1d9585346e0bba965a60e
 DIST git-htmldocs-1.7.4.rc1.tar.bz2 939784 RMD160 53fd0f236bd2dc36d76b517dc16f3239d9337f96 SHA1 068e4bfcf5e9c60503babd220c5c7f0f15c53371 SHA256 d866167e2fdee56529d36dd49839aa65207714a7dd09886d5b05ef4681ba94d5
 DIST git-htmldocs-1.7.4.rc2.tar.bz2 940967 RMD160 730acc3fc31c90b8998a5b96a2f869a20d1da638 SHA1 f0a97081313f9565ba1422ef56dcda63af91fb62 SHA256 e7f1d6cc06dd69f0968dcd27188d9c72532763b3aff86da9c7b229fa7d7359bd
 DIST git-htmldocs-1.7.4.rc3.tar.bz2 940770 RMD160 ef1adcf8e1f80aa8d19c12b57d757ea9a3f11736 SHA1 69df3e8b1197e4ad9cddfb9bd91c4f4e55a2d6ea SHA256 2e5c334c823278d460ed46fac1c6b361ecaf15011512fb30d4cb9b438107a124
+DIST git-htmldocs-1.7.4.tar.bz2 940665 RMD160 19a20260259fca5d7898e7661ae2ce9af726e7a1 SHA1 e6d2b4f0cb2d43d9290793365f95def7038730b3 SHA256 8f2d9dea509b41149a888b2e524089008cc59d21dbef2d53e8016aa432db2b99
 DIST git-manpages-1.6.4.4.tar.bz2 248348 RMD160 fd1a267973373bc625336abe2b50545e12cc6fa4 SHA1 39b76f19751995ba3f093cac0b47900e22a5dbd2 SHA256 a2b2fb1aabdbb3e1e8ae9472523b9fef23c3e8a992bb8f68f17ad832a6e59c98
 DIST git-manpages-1.6.4.5.tar.bz2 254368 RMD160 7731d81631ec2c8c33ddc028667eaad79926754b SHA1 905d5e66db1b22b48c1b001d1f5dec830a75dde1 SHA256 f73ae98b0cea0ef6d8f7c8b599d6cad0bdae702b1fe58ad8ebab32a0bb7ba447
 DIST git-manpages-1.7.2.2.tar.bz2 287738 RMD160 bd2feb1f74530d44cba834a52adde10b773d8744 SHA1 0b63f30cfb6073746b298aa5584eb8321bcd66a9 SHA256 98fbdfcb884b3c0ea0e444417724cdd2baf49b70a400a3037dc87120d76ae8d9
@@ -52,6 +54,7 @@ DIST git-manpages-1.7.3.5.tar.bz2 294754 RMD160 2d360b820a7390d50954778f56e9eaf4
 DIST git-manpages-1.7.4.rc1.tar.bz2 299662 RMD160 0396ae70c45d4e21dcdbaf5dbbe53c7c6f11308f SHA1 d2f1aca9aefe71674111f4a10b8b230ab6c73344 SHA256 9a1eeaf96a486f0789d471c3cd5516fd53fdcf48d9ebeb52a23c7fbb1f61bd19
 DIST git-manpages-1.7.4.rc2.tar.bz2 299804 RMD160 9a31ae5c15865e02ff4bd39be4644abed0fdd30a SHA1 0b8f97f9a5872880a66977044be5ec6de324663b SHA256 247a7cd2eb407001cd4450eb221fee4b52a6bca321cd8979c48a80fdb4092f95
 DIST git-manpages-1.7.4.rc3.tar.bz2 300028 RMD160 cc25480fe46db1db521620e1bd0453602662f4ed SHA1 f8da22f2777ac78c7f79596a841f63fa9b07f3f3 SHA256 6ea0204db0117a0aba4e8d4d918430c918004ddec141fa3076fc2cb6baffd4d0
+DIST git-manpages-1.7.4.tar.bz2 300025 RMD160 ea82117f6150cead06373667054acabbfa9f4c0d SHA1 1bad24d225d39266b2b697bc68a4f02ff6677d41 SHA256 883781c0513dde0af30e32d319b34035fbf8e766eb39fbe9f715794c1049865a
 EBUILD git-1.6.4.4-r1.ebuild 10440 RMD160 e0208a0a7c177da950e31cfd8f219c677fe9d458 SHA1 c26fb4ecb219758cdfbf6f99e64cae96befe1f3e SHA256 864267fc81641adf198c21ea54a82ce745dee6047ceafe39d66714d00e800521
 EBUILD git-1.6.4.4.ebuild 10332 RMD160 e8872b64fb9852a20c54a84819875f20a4380099 SHA1 1166b73f011b63e7bbdff0b1866955b5fc0fe87a SHA256 33c1df7a6054c96e91bb08506a25e5e71401694e58e62d580c59ae58ffbeacb6
 EBUILD git-1.6.4.5.ebuild 10448 RMD160 2a8386e68ef7b9ef5b55387507a8f061d099d382 SHA1 05bcdbfaf23c21c11055e239e63006a1c8808439 SHA256 1746c657f152e67f97a42f1461a13274df75a4cc75ec783083e833f9055721b4
@@ -68,11 +71,12 @@ EBUILD git-1.7.3.4.ebuild 13532 RMD160 b379ddde309f7100100918e35ba2c3d01ca6ee91
 EBUILD git-1.7.3.5-r1.ebuild 14534 RMD160 830e9397783317f88a6d53a8f178e8bebf9ead31 SHA1 a78dd360518b95a43a9d43a12ccf1b068f66851f SHA256 09bd4d06eca685dfa2378e25f84264bf19f655e6c7881b7260bb8dff42fc3074
 EBUILD git-1.7.3.5-r2.ebuild 14838 RMD160 aa479228d40704cb6ceceea34214afbaeb1c03f9 SHA1 dd491e7175deefe880faf72304f3ae80ba35494d SHA256 83c92827534191a45dbbbe638ae89dffda191e0e6835e51063504ef83f233306
 EBUILD git-1.7.3.5.ebuild 14182 RMD160 8dcb114ed8fb7c69cab8fb6263017f1ee46beedd SHA1 9fc7f6836d795377040addf54d2a00135d9d1417 SHA256 fd834346ba9cd9def74cc77376143601610915bb82c686621bbba28b9e5867b7
+EBUILD git-1.7.4.ebuild 14944 RMD160 dcac1819a668946a855696ae82e1b212c7379c2d SHA1 58e4d930bbd9a5e2ae62a7dccf3fd8d02eda0289 SHA256 c4be5c7a73a9f2f53b8480c0a5e0c3ee902aabf143dc35dde66ec4db6888a225
 EBUILD git-1.7.4_rc1-r1.ebuild 14556 RMD160 d5beb088508abb9e7d61c9198a484078b71806a6 SHA1 c0648f35a92dfcf833b7e8383122c88b200abd93 SHA256 5f409709c3678a39d1e66229672d8d7790813c943c1b828e93c07da4162bd32b
 EBUILD git-1.7.4_rc1-r2.ebuild 14949 RMD160 33802fae2df34e03de121c880022095f62ed6392 SHA1 0566442df60dd61add4f70522f542657db5392ad SHA256 3e57e3f4763ca430210ded7ce9397583407331a41f21bc56443423a3bd3e4200
 EBUILD git-1.7.4_rc1.ebuild 14204 RMD160 90440a8dcb3c67814a58a150c05bfe28dc0aa2e7 SHA1 97cc1c2263e78c791a4a097a9b7c540efb67adc8 SHA256 3793d812083128b32cfc3a2c18628c5f4414690ddb6146eab6411459b15a8cd0
 EBUILD git-1.7.4_rc2.ebuild 14948 RMD160 276d22f35aa33ad56f932b6e757d44d2d208acd7 SHA1 90289b8924de95f7ff2b2c59685b58f22f7faaea SHA256 3c98576973b1efd1e607b8e2d9feba7eab5301cd82c95b1598c48f97e23a2302
 EBUILD git-1.7.4_rc3.ebuild 14948 RMD160 e42bbf1d936490cd23f6b893b5de91cff1fa43e0 SHA1 e802bdb7d7cb00cbfeb35ab93f07f6ba692ffe56 SHA256 61c0e38cc7bc981a394d9aa7303e28863a6605720a9eb1e2e67896ed9dc81493
 EBUILD git-9999.ebuild 14944 RMD160 854023542ad8c4726316db36b88a4409fb70b967 SHA1 84520807e5e20f75e4c0170c3de9d8ef063701e8 SHA256 22f0ccf1b2f5869a7ba9c94379ebfb713d2f00b05a97216fb74344f6b45b2df2
-MISC ChangeLog 78776 RMD160 10abe7cf3bc38d73c680704884303678141f982b SHA1 7a24909c2a35d758a37ec99882fa5edcda56ddba SHA256 cea29f476397508af8c9422362022421296768c162d8bdbf0292bc45ccb6ca8e
+MISC ChangeLog 78891 RMD160 1b9a775dad097bcce84e59149b882967df012bcd SHA1 4b72f7c21cff52009572177144535b4082889ae0 SHA256 b65c40fe7f32b67a8cb16ca3019ec38fd43c07ff7cc0a20d1f48af1e03af7981
 MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b
diff --git a/dev-vcs/git/git-1.7.4.ebuild b/dev-vcs/git/git-1.7.4.ebuild
new file mode 100644
index 000000000000..05c42eccb031
--- /dev/null
+++ b/dev-vcs/git/git-1.7.4.ebuild
@@ -0,0 +1,515 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4.ebuild,v 1.1 2011/02/01 01:24:33 robbat2 Exp $
+
+EAPI=3
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion python
+[ "$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 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~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=""
+	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 +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] )
+	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  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 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}"
+
+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-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" \
+		|| 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.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.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
+}
+
+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_PATH="${EPREFIX}/usr/bin/env perl" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		"$@"
+}
+
+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
+
+	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 "${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 \
+		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
+	if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then
+		ewarn "You must build dev-vcs/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
+	use python && python_mod_cleanup git_remote_helpers
+}