New upstream version. Remove old (1.4.0-r1) and buggy (1.4.2.3) ones.

Package-Manager: portage-2.1.1

5 files changed, 24 insertions, 341 deletions

diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index ef978bee9cc4..7e0b3755d883 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70git-gentoo.el 88 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd SHA1 332f9cbf5a1dbb176e54646fa23aa140aee917f7 SHA256 7589206de5ea91e912e0332f7dc503689d348cb752e17ba84a724987c4bbe04a
 MD5 626503da08b9af48199596c83d6f49b3 files/70git-gentoo.el 88
 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd files/70git-gentoo.el 88
@@ -15,37 +18,30 @@ MD5 ceec7fba7a2c00fd6d8d46dd39c9b721 files/git-daemon.xinetd 260
 RMD160 9c1abde72ac5064e1fc86afd29c2a74079db91a4 files/git-daemon.xinetd 260
 SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a files/git-daemon.xinetd 260
 DIST git-1.1.6.tar.bz2 478466 RMD160 c88fb437ff78955cc54256488c18125adfc6ddef SHA1 c1170da256d125912e8dc7c8e4f068b21e5fcb06 SHA256 87eedea8af9dec73ea9648e2983d20fe058003bf703f18f90125bafe398bf8af
-DIST git-1.4.0.tar.bz2 717181 RMD160 1010a0818efd5309f1a0ba1228f953f97d575038 SHA1 77745c27ffb2af6e4f43e0f800436799b633f1a2 SHA256 abdb48005e7b2f8988498a6c6724e2e6f6162f30915f591be6586df57dd3f2fa
 DIST git-1.4.1.1.tar.bz2 752419 RMD160 1e8c8cc2ee0685fb0ece9e0ee0720cb608140c05 SHA1 376a96ecf68cf90fa0b29fde700e5e947967531a SHA256 e4a9ef8403c3716f7494d4865ee6c3e862b93012df41522237ace91f68a6d6ce
-DIST git-1.4.2.3.tar.bz2 787480 RMD160 096f4d8a4119f858c47b3975af01a0d6a2327c3c SHA1 ace89476c6e7ca2721e38289076378470f99f5ec SHA256 9103f7fb921b9415077375e65a5482ea3ce378e6863276970630f39247f3ef8c
+DIST git-1.4.2.4.tar.bz2 787793 RMD160 03664bb1c98c7d9dc8c6f1dfa56149d807fd5164 SHA1 ff80a407cbad5b759adaecf434b37b293a167096 SHA256 1efbbee0e3e8704b25ef6fbc9519ba6f94a21aee48a231b986408627a4017632
 DIST git-html-1.1.6.tar.bz2 214805 RMD160 4a4cb45ae7ec212a15c63e6f5554b52e14797d1a SHA1 6ad1937ee897d517357c2a506b04325ebe0f424d SHA256 ae097fdd46d236e4897dc16a6fdec897b77ebd4c2f9d69b5c97814704aa31eac
-DIST git-htmldocs-1.4.0.tar.bz2 262492 RMD160 b98ce629edc28cf8933e0a6f4d59df07d68cf636 SHA1 b9f9b535304b5dc5c9fd11d106a28680bf62d4b5 SHA256 c8d8dffefe3dfc7ec190ee7502d20aa36f150ea633d5621b4a55156672a2ea97
 DIST git-htmldocs-1.4.1.1.tar.bz2 263120 RMD160 4a50c2cec7ecd612690ee5dd0f7fbe69f11fe1bf SHA1 6a22f41064f1db29e69a65ad2177e9f6e18aea77 SHA256 8e4ccf995645fe08f7644b62535c4054515355942b5f3551fcbebd3f5ec36d1d
-DIST git-htmldocs-1.4.2.3.tar.bz2 284058 RMD160 8efbf6c47c0ae4f5870a744accd12aa886cb99d4 SHA1 16c2e935c58fa34c62649c8d9659b1999993d659 SHA256 8bd698b2e346679f483b2cdf22d0f25c2430511d54e6d9a7e665654c113f5f51
+DIST git-htmldocs-1.4.2.4.tar.bz2 283907 RMD160 6aaa9e601cc16d4e45176e58fbbc87a332afb243 SHA1 e05b2ef0a5354b8c6ff4d043d620e0b229cda7a9 SHA256 90f3ad4bced74bbadfc6f02a1c3d222a6bcf13d940b9aef368b7cbae083c1f86
 DIST git-man-1.1.6.tar.bz2 69088 RMD160 4e8bc8067c903caa8ed9b9a6a04c89ab15483aab SHA1 d90dee09b0d52067fc4ebe8a1855d31ea0378815 SHA256 68042818e789b08a2f8c913c5d7deb5f6f41f6a5c9b989898a98eed61c6e5c72
-DIST git-manpages-1.4.0.tar.bz2 83698 RMD160 6bfb8fa2e1ae34fd4576e84fee720a239323a65d SHA1 bed6974f210dac70f85bf18f2e3c5f7097d0eeed SHA256 f275b1a3fb1eab0368dbb704628e76a4c34a0724ddece1de11b2f53ee327d5d4
 DIST git-manpages-1.4.1.1.tar.bz2 83956 RMD160 894b8717e9e4099f7aacb97a3673e81c09e23daf SHA1 c899fbdef72bdfdb29c03e3372ee736781d58289 SHA256 2b2759a15eb9432e972743846c7299518e542e99a23a7318c540f0086e746ee4
-DIST git-manpages-1.4.2.3.tar.bz2 90422 RMD160 d82dfea6381f282505b548b2d424de1f1dbad6f0 SHA1 328bee9bb84cad6be8970ffe3773999e6a0f8aaa SHA256 42e2ff53e00b5f091bc6dffad92b7a746f54b80eb4445c7b143b666087f131c8
+DIST git-manpages-1.4.2.4.tar.bz2 90375 RMD160 0b3d486d04a5a64aab273c75823c603f307fcd02 SHA1 961b3981f074663ec64bbbc5b82fdab0c45b7919 SHA256 6e0520fd779225e79957871d981ddfc9e93f157374de88f654d4f20958557518
 EBUILD git-1.1.6.ebuild 3137 RMD160 584d887c6e5cc38ebd6ca3dfbcef49b9e137f427 SHA1 fea6a0f5a17d07b02fcd632f4c7da0367de69bac SHA256 4694703db2a72d2c5ad323e61385757db6fd503312cb3a4367edf0ccdc2cb45a
 MD5 55400bb7b60d88d4be30abca34925de4 git-1.1.6.ebuild 3137
 RMD160 584d887c6e5cc38ebd6ca3dfbcef49b9e137f427 git-1.1.6.ebuild 3137
 SHA256 4694703db2a72d2c5ad323e61385757db6fd503312cb3a4367edf0ccdc2cb45a git-1.1.6.ebuild 3137
-EBUILD git-1.4.0-r1.ebuild 4270 RMD160 b984cb49065118fa5885799e74939da8c967e359 SHA1 3eef43555509eb85ceb1f0ff394284b6efc6c60a SHA256 a342d9fcbc9d5a99a3e47504c7c0cc646a482f08d3fd6851e97116538033cec2
-MD5 347a40105fd3ab583e9c641e81cc7fed git-1.4.0-r1.ebuild 4270
-RMD160 b984cb49065118fa5885799e74939da8c967e359 git-1.4.0-r1.ebuild 4270
-SHA256 a342d9fcbc9d5a99a3e47504c7c0cc646a482f08d3fd6851e97116538033cec2 git-1.4.0-r1.ebuild 4270
 EBUILD git-1.4.1.1.ebuild 4360 RMD160 8e8e54c393253adde1589c94208702a373a81259 SHA1 413652cd5c1c901778fdf3dc6dc1d10d64d31c83 SHA256 7e3ded56b642fc7dcf52b54a768cbf3f7adcb5527044cb44a99ac9c04844c997
 MD5 2c27b231d4e7f5dda4eb4a9ed1f6bb32 git-1.4.1.1.ebuild 4360
 RMD160 8e8e54c393253adde1589c94208702a373a81259 git-1.4.1.1.ebuild 4360
 SHA256 7e3ded56b642fc7dcf52b54a768cbf3f7adcb5527044cb44a99ac9c04844c997 git-1.4.1.1.ebuild 4360
-EBUILD git-1.4.2.3.ebuild 4400 RMD160 03a6532f2adc9419c3adc8ab2bdd316c43a7bb5b SHA1 39c04da6dabbb37ae8befce0919397ff08d3d2b3 SHA256 7e0764d7e86858b9e80bda36348e3dfbd79a2aa3f0534312f9a2cd406c46c07b
-MD5 7aa210ada4d2ad007843fd4581aebb7c git-1.4.2.3.ebuild 4400
-RMD160 03a6532f2adc9419c3adc8ab2bdd316c43a7bb5b git-1.4.2.3.ebuild 4400
-SHA256 7e0764d7e86858b9e80bda36348e3dfbd79a2aa3f0534312f9a2cd406c46c07b git-1.4.2.3.ebuild 4400
-MISC ChangeLog 18633 RMD160 4ba5ae446457cfa6b11443d64c330ee2cd3da79f SHA1 79c14ae856b2bccde7c708344ce7808a4290a04a SHA256 c444e51166883ed5d23b0e0b6616b6b762cd85ff7acd24ec7bd216080735632d
-MD5 2851d5fa670bde0bf7279e1a29eb6701 ChangeLog 18633
-RMD160 4ba5ae446457cfa6b11443d64c330ee2cd3da79f ChangeLog 18633
-SHA256 c444e51166883ed5d23b0e0b6616b6b762cd85ff7acd24ec7bd216080735632d ChangeLog 18633
+EBUILD git-1.4.2.4.ebuild 4398 RMD160 a0916eed7640e357c9278ca1e3ab6d686e4fab75 SHA1 4c902101554bc46216ed9000c85654e044981dae SHA256 757040583ec0e9eeb303ac212e263d14f619afe72fe00450663fd8e351e10eda
+MD5 5dc1dc9eb29f5bb32e8b6ad62c77eadd git-1.4.2.4.ebuild 4398
+RMD160 a0916eed7640e357c9278ca1e3ab6d686e4fab75 git-1.4.2.4.ebuild 4398
+SHA256 757040583ec0e9eeb303ac212e263d14f619afe72fe00450663fd8e351e10eda git-1.4.2.4.ebuild 4398
+MISC ChangeLog 18851 RMD160 3cca36c797ad37200074e52fa42213236660b35e SHA1 257e1e931013764b9caaefdbcf7438a60834aa43 SHA256 cc53279f7608d22ff1430cd20b47b6e4fd32d5535747f08bffb818d0a6342238
+MD5 8b1eaeb4c6c4c56fd59af8b26b2baf69 ChangeLog 18851
+RMD160 3cca36c797ad37200074e52fa42213236660b35e ChangeLog 18851
+SHA256 cc53279f7608d22ff1430cd20b47b6e4fd32d5535747f08bffb818d0a6342238 ChangeLog 18851
 MISC metadata.xml 255 RMD160 db414d29c445e388d486f826b368b5359b74f72d SHA1 0317bb4c83bba580ddb586efe8a929b85759d0d2 SHA256 45f65b01b99f13e87c53843765ab287065988ab80e675287cdcc81ce3e22f9a2
 MD5 c2a7223a6caa6908d13db012ce74b388 metadata.xml 255
 RMD160 db414d29c445e388d486f826b368b5359b74f72d metadata.xml 255
@@ -53,12 +49,16 @@ SHA256 45f65b01b99f13e87c53843765ab287065988ab80e675287cdcc81ce3e22f9a2 metadata
 MD5 c39ed36e4e2546481eed2de6d87042bc files/digest-git-1.1.6 720
 RMD160 2f63f76d9d8a7614b0ddc8580196a0bbaec84300 files/digest-git-1.1.6 720
 SHA256 9508083e0013b2db36714bc648dfe233d85286b61fa75ca27648c457256ac8ff files/digest-git-1.1.6 720
-MD5 35a2e70f5779dac88ed463374151c14e files/digest-git-1.4.0-r1 747
-RMD160 36c511ba4963f5bc211b46878fa36344f42f2551 files/digest-git-1.4.0-r1 747
-SHA256 e3f751c0ad994c4f8b7d2b93d6628b1ba94ba03dc34252ff58a59ad5285ebc37 files/digest-git-1.4.0-r1 747
 MD5 43cefb6f4dfa6dc58ada3c40a898c127 files/digest-git-1.4.1.1 765
 RMD160 b55a303812b93075ee95e067dc6047c542caf8d2 files/digest-git-1.4.1.1 765
 SHA256 c4659a8be91474f1005a6c0fec5ea794c5f406dd9b74ffe047ceef76517891a4 files/digest-git-1.4.1.1 765
-MD5 2b87dd94067a1da574e7f86741c65b46 files/digest-git-1.4.2.3 765
-RMD160 2192545337e203fe7772143bd7ff94b24eff5f4f files/digest-git-1.4.2.3 765
-SHA256 025c6ef2fceb2a60bfb56b944d06044e22813a6f81cf5b2ea32f77b51968b496 files/digest-git-1.4.2.3 765
+MD5 9fb07bda15a4aab8cfe357e7c558d1aa files/digest-git-1.4.2.4 765
+RMD160 174be578a6d9b7fe8b580b1ab1e77d1842a9f151 files/digest-git-1.4.2.4 765
+SHA256 d48ebc25dd2dcb75d72f633f74f2754ddb2fd25894abe15cb0159e429dccb7a5 files/digest-git-1.4.2.4 765
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFFNIEuViELBEf1JB0RAtWJAJ9TmTpTWJgfzEynqAPsNL85C1hhqwCeOfNf
+ScuTMNuehe9G3huDI7pWesY=
+=Hv3Q
+-----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.4.0-r1 b/dev-util/git/files/digest-git-1.4.0-r1
deleted file mode 100644
index 5823e7cdd1ad..000000000000
--- a/dev-util/git/files/digest-git-1.4.0-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 923fa60aca74db3ce175c9a2c665f240 git-1.4.0.tar.bz2 717181
-RMD160 1010a0818efd5309f1a0ba1228f953f97d575038 git-1.4.0.tar.bz2 717181
-SHA256 abdb48005e7b2f8988498a6c6724e2e6f6162f30915f591be6586df57dd3f2fa git-1.4.0.tar.bz2 717181
-MD5 10e0736ed8bcb35d639caf6f86ea8b99 git-htmldocs-1.4.0.tar.bz2 262492
-RMD160 b98ce629edc28cf8933e0a6f4d59df07d68cf636 git-htmldocs-1.4.0.tar.bz2 262492
-SHA256 c8d8dffefe3dfc7ec190ee7502d20aa36f150ea633d5621b4a55156672a2ea97 git-htmldocs-1.4.0.tar.bz2 262492
-MD5 87900e25961bf7bab51a1efe9c335d10 git-manpages-1.4.0.tar.bz2 83698
-RMD160 6bfb8fa2e1ae34fd4576e84fee720a239323a65d git-manpages-1.4.0.tar.bz2 83698
-SHA256 f275b1a3fb1eab0368dbb704628e76a4c34a0724ddece1de11b2f53ee327d5d4 git-manpages-1.4.0.tar.bz2 83698
diff --git a/dev-util/git/files/digest-git-1.4.2.3 b/dev-util/git/files/digest-git-1.4.2.3
deleted file mode 100644
index 35e083cf3193..000000000000
--- a/dev-util/git/files/digest-git-1.4.2.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 95edf080ae94c62ca454f79f9ad31b42 git-1.4.2.3.tar.bz2 787480
-RMD160 096f4d8a4119f858c47b3975af01a0d6a2327c3c git-1.4.2.3.tar.bz2 787480
-SHA256 9103f7fb921b9415077375e65a5482ea3ce378e6863276970630f39247f3ef8c git-1.4.2.3.tar.bz2 787480
-MD5 a45c703b7115e55061ce4064c5e202a0 git-htmldocs-1.4.2.3.tar.bz2 284058
-RMD160 8efbf6c47c0ae4f5870a744accd12aa886cb99d4 git-htmldocs-1.4.2.3.tar.bz2 284058
-SHA256 8bd698b2e346679f483b2cdf22d0f25c2430511d54e6d9a7e665654c113f5f51 git-htmldocs-1.4.2.3.tar.bz2 284058
-MD5 5df63737c0d238a7ca74c97d097729d1 git-manpages-1.4.2.3.tar.bz2 90422
-RMD160 d82dfea6381f282505b548b2d424de1f1dbad6f0 git-manpages-1.4.2.3.tar.bz2 90422
-SHA256 42e2ff53e00b5f091bc6dffad92b7a746f54b80eb4445c7b143b666087f131c8 git-manpages-1.4.2.3.tar.bz2 90422
diff --git a/dev-util/git/git-1.4.0-r1.ebuild b/dev-util/git/git-1.4.0-r1.ebuild
deleted file mode 100644
index d7a176dd5081..000000000000
--- a/dev-util/git/git-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.4.0-r1.ebuild,v 1.5 2006/10/04 17:48:13 grobian Exp $
-
-inherit python toolchain-funcs eutils elisp-common
-
-DOC_VER=${PV}
-
-DESCRIPTION="GIT - the stupid content tracker"
-HOMEPAGE="http://kernel.org/pub/software/scm/git/"
-SRC_URI="mirror://kernel/software/scm/git/${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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="curl doc emacs gtk mozsha1 ppcsha1 tk webdav"
-
-DEPEND="dev-libs/openssl
-		sys-libs/zlib
-		!app-misc/git
-		curl? ( net-misc/curl )
-		webdav? ( dev-libs/expat )"
-RDEPEND="${DEPEND}
-		dev-lang/perl
-		>=dev-lang/python-2.3
-		app-text/rcs
-		tk? ( dev-lang/tk )
-		gtk? ( >=dev-python/pygtk-2.6 )"
-
-# 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"
-		use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring."
-	fi
-
-	myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
-
-	# Older python versions need own subproccess.py
-	python_version
-	[[ ${PYVER} < 2.4 ]] && myopts="${myopts} WITH_OWN_SUBPROCESS_PY=YesPlease"
-
-	use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
-
-	export MY_MAKEOPTS=${myopts}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i \
-		-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
-		-e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \
-		-e "s:^\(CC = \).*$:\1$(tc-getCC):" \
-		-e "s:^\(AR = \).*$:\1$(tc-getAR):" \
-		Makefile || die "sed failed"
-
-	exportmakeopts
-}
-
-src_compile() {
-	emake ${MY_MAKEOPTS} prefix=/usr || die "make failed"
-	emake -C contrib/git-svn/ git-svn || die "make git-svn failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed"
-	fi
-}
-
-src_install() {
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || die "make install failed"
-
-	use tk || rm "${D}"/usr/bin/gitk
-
-	doman "${WORKDIR}"/man?/*
-
-	dodoc README COPYING Documentation/SubmittingPatches
-	if use doc ; then
-		dodoc Documentation/technical/*
-		dodir /usr/share/doc/${PF}/html
-		cp -r "${WORKDIR}"/{*.html,howto} "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	if use emacs ; then
-		insinto "${SITELISP}"
-		doins contrib/emacs/{,vc-}git.el*
-		elisp-site-file-install "${FILESDIR}"/70git-gentoo.el
-	fi
-
-	if use gtk ; then
-		dobin contrib/gitview/gitview
-		use doc && dodoc contrib/gitview/gitview.txt
-	fi
-
-	dobin contrib/git-svn/git-svn
-	dodoc contrib/git-svn/git-svn.txt
-
-	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-}
-
-src_test() {
-	cd "${S}"
-	emake ${MY_MAKEOPTS} test || die "tests failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo
-	einfo "If you want to import arch repositories into git, consider using the"
-	einfo "git-archimport command. You should install dev-util/tla before"
-	einfo
-	einfo "If you want to import cvs repositories into git, consider using the"
-	einfo "git-cvsimport command. You should install >=dev-util/cvsps-2.1 before"
-	einfo
-	einfo "If you want to import svn repositories into git, consider using the"
-	einfo "git-svnimport command. You should install dev-util/subversion before"
-	einfo
-	einfo "If you want to manage subversion repositories using git, consider"
-	einfo "using git-svn. You should install dev-util/subversion before"
-	einfo
-	einfo "If you want to import a quilt series into git, donsider using the"
-	einfo "git-quiltimport command. You should install dev-util/quilt before"
-	einfo
-	einfo "If you want to use the included CVS server you will need to install"
-	einfo "dev-perl/DBI and dev-perl/DBD-SQLite"
-	einfo
-}
-
-pkg_postrm() {
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.4.2.3.ebuild b/dev-util/git/git-1.4.2.3.ebuild
deleted file mode 100644
index e9f9535565a5..000000000000
--- a/dev-util/git/git-1.4.2.3.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.4.2.3.ebuild,v 1.2 2006/10/04 17:48:13 grobian Exp $
-
-inherit python toolchain-funcs eutils elisp-common
-
-DOC_VER=${PV}
-
-DESCRIPTION="GIT - the stupid content tracker"
-HOMEPAGE="http://kernel.org/pub/software/scm/git/"
-SRC_URI="mirror://kernel/software/scm/git/${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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="curl doc emacs gtk mozsha1 ppcsha1 tk webdav"
-
-DEPEND="dev-libs/openssl
-		sys-libs/zlib
-		!app-misc/git
-		curl? ( net-misc/curl )
-		webdav? ( dev-libs/expat )
-		emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}
-		dev-lang/perl
-		>=dev-lang/python-2.3
-		app-text/rcs
-		tk? ( dev-lang/tk )
-		gtk? ( >=dev-python/pygtk-2.6 )"
-
-# 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"
-		use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring."
-	fi
-
-	myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
-
-	# Older python versions need own subproccess.py
-	python_version
-	[[ ${PYVER} < 2.4 ]] && myopts="${myopts} WITH_OWN_SUBPROCESS_PY=YesPlease"
-
-	use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
-
-	export MY_MAKEOPTS=${myopts}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i \
-		-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
-		-e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \
-		-e "s:^\(CC = \).*$:\1$(tc-getCC):" \
-		-e "s:^\(AR = \).*$:\1$(tc-getAR):" \
-		Makefile || die "sed failed"
-
-	exportmakeopts
-}
-
-src_compile() {
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed"
-	fi
-}
-
-src_install() {
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || die "make install failed"
-
-	use tk || rm "${D}"/usr/bin/gitk
-
-	doman "${WORKDIR}"/man?/*
-
-	dodoc README COPYING Documentation/SubmittingPatches
-	if use doc ; then
-		dodoc Documentation/technical/*
-		dodir /usr/share/doc/${PF}/html
-		cp -r "${WORKDIR}"/{*.html,howto} "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	if use emacs ; then
-		insinto "${SITELISP}"
-		doins contrib/emacs/{,vc-}git.el*
-		elisp-site-file-install "${FILESDIR}"/70git-gentoo.el
-	fi
-
-	if use gtk ; then
-		dobin contrib/gitview/gitview
-		use doc && dodoc contrib/gitview/gitview.txt
-	fi
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-
-	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-}
-
-src_test() {
-	cd "${S}"
-
-	has_version dev-util/subversion || \
-		MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease"
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo
-	einfo "If you want to import arch repositories into git, consider using the"
-	einfo "git-archimport command. You should install dev-util/tla before."
-	einfo
-	einfo "If you want to import cvs repositories into git, consider using the"
-	einfo "git-cvsimport command. You should install >=dev-util/cvsps-2.1 before."
-	einfo
-	einfo "If you want to import svn repositories into git, consider using the"
-	einfo "git-svnimport command. You should install dev-util/subversion before."
-	einfo
-	einfo "If you want to manage subversion repositories using git, consider"
-	einfo "using git-svn. You should install dev-util/subversion and dev-perl/libwww-perl."
-	einfo
-	einfo "If you want to import a quilt series into git, consider using the"
-	einfo "git-quiltimport command. You should install dev-util/quilt before."
-	einfo
-	einfo "If you want to use the included CVS server you will need to install"
-	einfo "dev-perl/DBI and dev-perl/DBD-SQLite."
-	einfo
-}
-
-pkg_postrm() {
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}