New upstream version. Remove old ones.

Package-Manager: portage-2.1.2.2

7 files changed, 34 insertions, 202 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index f1bfb06ebb56..826d2eb680b4 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.173 2007/03/11 23:10:55 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.174 2007/03/16 15:39:11 ferdy Exp $
+
+*git-1.5.0.4 (16 Mar 2007)
+
+  16 Mar 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.3.ebuild,
+  -git-1.5.0.3-r1.ebuild, +git-1.5.0.4.ebuild:
+  New upstream version. Remove old ones.
 
 *git-1.5.0.3-r1 (11 Mar 2007)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 3d359651ba63..1eb6d33a0eb7 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -25,17 +25,17 @@ DIST git-1.4.1.1.tar.bz2 752419 RMD160 1e8c8cc2ee0685fb0ece9e0ee0720cb608140c05
 DIST git-1.4.2.4.tar.bz2 787793 RMD160 03664bb1c98c7d9dc8c6f1dfa56149d807fd5164 SHA1 ff80a407cbad5b759adaecf434b37b293a167096 SHA256 1efbbee0e3e8704b25ef6fbc9519ba6f94a21aee48a231b986408627a4017632
 DIST git-1.4.4.3.tar.bz2 888091 RMD160 06184ee7e16c12687b4a644c38d23ff7732e4c54 SHA1 d41b8e62b2c0b5f3ea994bed4618a44cbcfb319e SHA256 5485e66a811f8a047124f1358ded268916fcf07ecccb9345f429b4ea8b76603e
 DIST git-1.4.4.4.tar.bz2 888482 RMD160 a507e7d636e771fb3ed03054d3d70e6758385c28 SHA1 b9243da9071d28f616b530eff94a46fb223cc368 SHA256 b2117774fb96d53f4b07d89df389ee0097f29637c859ec8fecc020cf37622657
-DIST git-1.5.0.3.tar.bz2 1047037 RMD160 763d78af5f8e394fa38a0a8ab702472a440eca47 SHA1 b061b7cfa4fec5591a58362ae96ff596a3d399c5 SHA256 950be95ece89a4c03aa22cd93626a27619536d1b9d40631b4369c339d63c120a
+DIST git-1.5.0.4.tar.bz2 1047995 RMD160 72124710fc26caa463f6b830275c1be8fdc160ff SHA1 42109178c0eb4f08fd6655163714e58228556f86 SHA256 031fb2eedab90b62c6bdcdcc88d5008fbb66945fc8895f35a5d8c506a9c0743f
 DIST git-htmldocs-1.4.1.1.tar.bz2 263120 RMD160 4a50c2cec7ecd612690ee5dd0f7fbe69f11fe1bf SHA1 6a22f41064f1db29e69a65ad2177e9f6e18aea77 SHA256 8e4ccf995645fe08f7644b62535c4054515355942b5f3551fcbebd3f5ec36d1d
 DIST git-htmldocs-1.4.2.4.tar.bz2 283907 RMD160 6aaa9e601cc16d4e45176e58fbbc87a332afb243 SHA1 e05b2ef0a5354b8c6ff4d043d620e0b229cda7a9 SHA256 90f3ad4bced74bbadfc6f02a1c3d222a6bcf13d940b9aef368b7cbae083c1f86
 DIST git-htmldocs-1.4.4.3.tar.bz2 325744 RMD160 52c8f9088ca969255ff93f719563b65f43a59a9f SHA1 1ab02de5bae511f07b19c6048626160d99ff145c SHA256 cca1f7dec9dd063d78920e4d2f7a9a47fa57cfd883b872883b60795541c2c585
 DIST git-htmldocs-1.4.4.4.tar.bz2 325718 RMD160 cf55f807769e8aa731d512b654e847089d25ea0e SHA1 66192a27b74aef8e673252174dda8c9be23dcd7a SHA256 196e901cd416f48b8068a10914455a27aa542bc821f677a705a69fb950145975
-DIST git-htmldocs-1.5.0.3.tar.bz2 442764 RMD160 69bbc0a67d05e907134f1acc02b76c819838501e SHA1 b9e7247d706aa5140d0f0058b372b8a8ebd253e3 SHA256 e9a0fb0d99fbd24419949e728c057ebe6e3e843630f39b2c5ae487d26ece9526
+DIST git-htmldocs-1.5.0.4.tar.bz2 445745 RMD160 582553edd2a6a60392c5788fc1bb07eb9340b220 SHA1 2751ce9c89868b7aa9c95ada15720cb918f08996 SHA256 7e67e35ccd42ef7173c60c558caee66736a649d03740e491a5cf66579c482a54
 DIST git-manpages-1.4.1.1.tar.bz2 83956 RMD160 894b8717e9e4099f7aacb97a3673e81c09e23daf SHA1 c899fbdef72bdfdb29c03e3372ee736781d58289 SHA256 2b2759a15eb9432e972743846c7299518e542e99a23a7318c540f0086e746ee4
 DIST git-manpages-1.4.2.4.tar.bz2 90375 RMD160 0b3d486d04a5a64aab273c75823c603f307fcd02 SHA1 961b3981f074663ec64bbbc5b82fdab0c45b7919 SHA256 6e0520fd779225e79957871d981ddfc9e93f157374de88f654d4f20958557518
 DIST git-manpages-1.4.4.3.tar.bz2 104756 RMD160 b10969ec6702606ea348d9a6fe05831e28fbcc00 SHA1 decdee44cca3f89843a290402c30422dde9edfa1 SHA256 7f11c3f55a86fc7e445e6bf97d049564e586902bb53e48c6048b7ce0ad90675e
 DIST git-manpages-1.4.4.4.tar.bz2 103840 RMD160 488e8ad8514180ed1d2d2d0d5e948351d4092f29 SHA1 17d7246560049ebcab7e7a67c2b82e8fb233e42e SHA256 73f136bd93683fa559b22c8770acaebce70699798f6797e840d23a2a5cffa3a4
-DIST git-manpages-1.5.0.3.tar.bz2 126643 RMD160 8bfbb22b4c78c264be743582c0988722e692a2a5 SHA1 b8303904e69fe5b20bcbe5f5348f51936c5e8f96 SHA256 4e36be729d14e93d26bb165e0888ed65ef8bb487df5f4f67160568fe9edeb3bb
+DIST git-manpages-1.5.0.4.tar.bz2 126918 RMD160 193e13bc5dd936d959ecfce3f966e7e6f19c901e SHA1 1c6b02507fccd44541f31cc81686edb01a0a916b SHA256 e1a1c851b47d2080bf7cfa1d5663c30628f81783eca0bbda76e19b6332a7ed0d
 EBUILD git-1.4.1.1.ebuild 4338 RMD160 c60faee4041943f56b2b64abde8b26bc7a9d1e17 SHA1 47c42f4ff8d3100a645226934fb9da442e07bae5 SHA256 d0435724636b6ff0749af989a7d493284df3eb38d2c0bcd1b0f29a33d726e606
 MD5 62bdf011ee3296485f8c8fbc2f3ecd35 git-1.4.1.1.ebuild 4338
 RMD160 c60faee4041943f56b2b64abde8b26bc7a9d1e17 git-1.4.1.1.ebuild 4338
@@ -52,18 +52,14 @@ EBUILD git-1.4.4.4.ebuild 4257 RMD160 5da21ba7d97aa3d0c9238b633c70c916445d8bcd S
 MD5 844bef7b02245814e4362aa29566e57b git-1.4.4.4.ebuild 4257
 RMD160 5da21ba7d97aa3d0c9238b633c70c916445d8bcd git-1.4.4.4.ebuild 4257
 SHA256 963f02c4077e2ca70a12f7300caa552a0bfccf76d57dc8b02a1ed3099efe3493 git-1.4.4.4.ebuild 4257
-EBUILD git-1.5.0.3-r1.ebuild 4379 RMD160 abd60430b4099190f528192013ca55e005e8c565 SHA1 935edfd395e573e708c6ee213a36b579b221148b SHA256 a4009050f396f3bbb095ad0b56823cc3805c7c5fac6d7efe16186f9e4dde3269
-MD5 5e2fe94b34ee01828346c163d73d8aea git-1.5.0.3-r1.ebuild 4379
-RMD160 abd60430b4099190f528192013ca55e005e8c565 git-1.5.0.3-r1.ebuild 4379
-SHA256 a4009050f396f3bbb095ad0b56823cc3805c7c5fac6d7efe16186f9e4dde3269 git-1.5.0.3-r1.ebuild 4379
-EBUILD git-1.5.0.3.ebuild 4326 RMD160 fbdd4e23ec76948cec7b20976bbb74343e6d5dc0 SHA1 d8dd5c6faeea0c99dc7c2a33136a77d82313f146 SHA256 38a71415fa2f485b771d5d9f1e39a3f27622d3de38e0ad9a9c1d234f9ebb3b3f
-MD5 d02282ef6bffa28c5e63a85f4f4630bb git-1.5.0.3.ebuild 4326
-RMD160 fbdd4e23ec76948cec7b20976bbb74343e6d5dc0 git-1.5.0.3.ebuild 4326
-SHA256 38a71415fa2f485b771d5d9f1e39a3f27622d3de38e0ad9a9c1d234f9ebb3b3f git-1.5.0.3.ebuild 4326
-MISC ChangeLog 24783 RMD160 faf85cbbc0db9c3ec1fd96c2a24ebd8ddbe137c8 SHA1 58468b00748bb4db8e74654b31f22d4a9375d959 SHA256 1e07d0b5a526637b33d3415a540bfcb8701f8d7c406c62beef2abdc53bc6c108
-MD5 ceca4c43237534ad273c51e46db85286 ChangeLog 24783
-RMD160 faf85cbbc0db9c3ec1fd96c2a24ebd8ddbe137c8 ChangeLog 24783
-SHA256 1e07d0b5a526637b33d3415a540bfcb8701f8d7c406c62beef2abdc53bc6c108 ChangeLog 24783
+EBUILD git-1.5.0.4.ebuild 4376 RMD160 212ecc81c0a4e02d75bd7741a6da8c0f9a1ce088 SHA1 26c6ac991342a2c13e144848aae2f1752ad238f7 SHA256 b08326ac9f644031be1ff6338a18715ecccd45be38218dfbd28be1936cc53ee6
+MD5 2932cda78e0b55f21bbf67b0311e2732 git-1.5.0.4.ebuild 4376
+RMD160 212ecc81c0a4e02d75bd7741a6da8c0f9a1ce088 git-1.5.0.4.ebuild 4376
+SHA256 b08326ac9f644031be1ff6338a18715ecccd45be38218dfbd28be1936cc53ee6 git-1.5.0.4.ebuild 4376
+MISC ChangeLog 24974 RMD160 5f382b4d1bf4557624c8cab46de5f7fc1413d97c SHA1 021f2d4fdeca167c819bed3fdc3911cf88ac350c SHA256 864056f3a77dd2dc11d00f8b87894845ffe0e4b1e708dbecd6c1a524e20453a1
+MD5 feb5fff1e7d18ee6d7f3d2339d9adca2 ChangeLog 24974
+RMD160 5f382b4d1bf4557624c8cab46de5f7fc1413d97c ChangeLog 24974
+SHA256 864056f3a77dd2dc11d00f8b87894845ffe0e4b1e708dbecd6c1a524e20453a1 ChangeLog 24974
 MISC metadata.xml 253 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a SHA1 7c2340e011ce57927ff31d7e3397ef4bb1c7ad27 SHA256 1f2e9f9f57e781c296ac5c39c54eabf82a47b7facd0698b296bc76f50799432c
 MD5 22c5a3ad567fa12332dab8687b9c2d1c metadata.xml 253
 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a metadata.xml 253
@@ -80,16 +76,13 @@ SHA256 666f5fe026723735f156653f2565168d6c3f902e176d9c009a4c75ae992e475b files/di
 MD5 0edc8e793ae211228a6b9b338d242566 files/digest-git-1.4.4.4 768
 RMD160 ade2fb97dffc61de86d80cffc0b4292ba9027bda files/digest-git-1.4.4.4 768
 SHA256 ace650aa865e2cbf70cf1e76a858085da178e9f98f58f28bbabbc972be98467e files/digest-git-1.4.4.4 768
-MD5 5df9ac9771897de5afc47fbc86c9784b files/digest-git-1.5.0.3 771
-RMD160 0ec0f01ccc0de507ffa3f5a607eaaf21cc99143e files/digest-git-1.5.0.3 771
-SHA256 9dcab354ddc419fa9998d1240a8bedef3cf497c26eb4443b176939aa5029c629 files/digest-git-1.5.0.3 771
-MD5 5df9ac9771897de5afc47fbc86c9784b files/digest-git-1.5.0.3-r1 771
-RMD160 0ec0f01ccc0de507ffa3f5a607eaaf21cc99143e files/digest-git-1.5.0.3-r1 771
-SHA256 9dcab354ddc419fa9998d1240a8bedef3cf497c26eb4443b176939aa5029c629 files/digest-git-1.5.0.3-r1 771
+MD5 0a0e489edcf38bc87c26ad8c2e555d0c files/digest-git-1.5.0.4 771
+RMD160 58f6a84b51ce32bb67cac1bf52a1d58f35517231 files/digest-git-1.5.0.4 771
+SHA256 114361bcd8f607650ecf6f90909bdfd0db6426579d68d7a933b3862ffd223b1e files/digest-git-1.5.0.4 771
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFF9IyNViELBEf1JB0RAn8EAJ9zyP6Rp0Q9gtU8AHkI+XvFk2Y9ZwCbBzou
-z24EF0c66mcPi7FpFnhxsUo=
-=/geO
+iD8DBQFF+rouViELBEf1JB0RAgTPAJ9PAy8bc0Yq8kvZYSffrv6+KSOhWgCghumh
+9C+NhqOGMD3qmDjshDHsoow=
+=TEo3
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.5.0.3 b/dev-util/git/files/digest-git-1.5.0.3
deleted file mode 100644
index c70d94fdf0d8..000000000000
--- a/dev-util/git/files/digest-git-1.5.0.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 ea7a01dbde1da8fce235dde689bfeeea git-1.5.0.3.tar.bz2 1047037
-RMD160 763d78af5f8e394fa38a0a8ab702472a440eca47 git-1.5.0.3.tar.bz2 1047037
-SHA256 950be95ece89a4c03aa22cd93626a27619536d1b9d40631b4369c339d63c120a git-1.5.0.3.tar.bz2 1047037
-MD5 3734c743f997db911a8d2bbb671b70de git-htmldocs-1.5.0.3.tar.bz2 442764
-RMD160 69bbc0a67d05e907134f1acc02b76c819838501e git-htmldocs-1.5.0.3.tar.bz2 442764
-SHA256 e9a0fb0d99fbd24419949e728c057ebe6e3e843630f39b2c5ae487d26ece9526 git-htmldocs-1.5.0.3.tar.bz2 442764
-MD5 94a9c3de6e1dea0e4498901b6a95c9ad git-manpages-1.5.0.3.tar.bz2 126643
-RMD160 8bfbb22b4c78c264be743582c0988722e692a2a5 git-manpages-1.5.0.3.tar.bz2 126643
-SHA256 4e36be729d14e93d26bb165e0888ed65ef8bb487df5f4f67160568fe9edeb3bb git-manpages-1.5.0.3.tar.bz2 126643
diff --git a/dev-util/git/files/digest-git-1.5.0.3-r1 b/dev-util/git/files/digest-git-1.5.0.3-r1
deleted file mode 100644
index c70d94fdf0d8..000000000000
--- a/dev-util/git/files/digest-git-1.5.0.3-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 ea7a01dbde1da8fce235dde689bfeeea git-1.5.0.3.tar.bz2 1047037
-RMD160 763d78af5f8e394fa38a0a8ab702472a440eca47 git-1.5.0.3.tar.bz2 1047037
-SHA256 950be95ece89a4c03aa22cd93626a27619536d1b9d40631b4369c339d63c120a git-1.5.0.3.tar.bz2 1047037
-MD5 3734c743f997db911a8d2bbb671b70de git-htmldocs-1.5.0.3.tar.bz2 442764
-RMD160 69bbc0a67d05e907134f1acc02b76c819838501e git-htmldocs-1.5.0.3.tar.bz2 442764
-SHA256 e9a0fb0d99fbd24419949e728c057ebe6e3e843630f39b2c5ae487d26ece9526 git-htmldocs-1.5.0.3.tar.bz2 442764
-MD5 94a9c3de6e1dea0e4498901b6a95c9ad git-manpages-1.5.0.3.tar.bz2 126643
-RMD160 8bfbb22b4c78c264be743582c0988722e692a2a5 git-manpages-1.5.0.3.tar.bz2 126643
-SHA256 4e36be729d14e93d26bb165e0888ed65ef8bb487df5f4f67160568fe9edeb3bb git-manpages-1.5.0.3.tar.bz2 126643
diff --git a/dev-util/git/files/digest-git-1.5.0.4 b/dev-util/git/files/digest-git-1.5.0.4
new file mode 100644
index 000000000000..548c2755ee82
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.0.4
@@ -0,0 +1,9 @@
+MD5 823996716e098fbe6ae88bd3ed2905d0 git-1.5.0.4.tar.bz2 1047995
+RMD160 72124710fc26caa463f6b830275c1be8fdc160ff git-1.5.0.4.tar.bz2 1047995
+SHA256 031fb2eedab90b62c6bdcdcc88d5008fbb66945fc8895f35a5d8c506a9c0743f git-1.5.0.4.tar.bz2 1047995
+MD5 d276edb557b47b0309394181c8d6342b git-htmldocs-1.5.0.4.tar.bz2 445745
+RMD160 582553edd2a6a60392c5788fc1bb07eb9340b220 git-htmldocs-1.5.0.4.tar.bz2 445745
+SHA256 7e67e35ccd42ef7173c60c558caee66736a649d03740e491a5cf66579c482a54 git-htmldocs-1.5.0.4.tar.bz2 445745
+MD5 da4b56ff806b62ca71170d9d7f3e0877 git-manpages-1.5.0.4.tar.bz2 126918
+RMD160 193e13bc5dd936d959ecfce3f966e7e6f19c901e git-manpages-1.5.0.4.tar.bz2 126918
+SHA256 e1a1c851b47d2080bf7cfa1d5663c30628f81783eca0bbda76e19b6332a7ed0d git-manpages-1.5.0.4.tar.bz2 126918
diff --git a/dev-util/git/git-1.5.0.3.ebuild b/dev-util/git/git-1.5.0.3.ebuild
deleted file mode 100644
index 79b2d1f419d1..000000000000
--- a/dev-util/git/git-1.5.0.3.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.0.3.ebuild,v 1.1 2007/03/09 18:42:09 ferdy Exp $
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker"
-HOMEPAGE="http://kernel.org/pub/software/scm/git/"
-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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="curl doc elibc_uclibc emacs gtk mozsha1 perl 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
-		perl? ( dev-perl/Error )
-		tk? ( dev-lang/tk )
-		gtk? ( >=dev-python/pygtk-2.6 )"
-
-S="${WORKDIR}/${MY_P}"
-
-# 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"
-
-	use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
-
-	export MY_MAKEOPTS=${myopts}
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-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):" \
-		-e 's:ln :ln -s :g' \
-		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
-
-	dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-	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
-
-	fixlocalpod
-}
-
-src_test() {
-	cd "${S}"
-	has_version dev-util/subversion || \
-		MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease"
-	has_version app-arch/unzip || \
-		rm "${S}"/t/t5000-tar-tree.sh
-	# Stupid CVS won't let some people commit as root
-	rm "${S}"/t/t9200-git-cvsexportcommit.sh
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-archimport "dev-util/tla"
-	showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1"
-	showpkgdeps git-svnimport "dev-util/subversion(USE=perl)"
-	showpkgdeps git-svn "dev-util/subversion(USE=perl)" "dev-perl/libwww-perl"
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )"
-	showpkgdeps git-send-email "USE=perl"
-	showpkgdeps git-remote "USE=perl"
-	echo
-}
-
-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.5.0.3-r1.ebuild b/dev-util/git/git-1.5.0.4.ebuild
index 4ac4332fa900..1fb9f96e154e 100644
--- a/dev-util/git/git-1.5.0.3-r1.ebuild
+++ b/dev-util/git/git-1.5.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.0.3-r1.ebuild,v 1.1 2007/03/11 23:10:55 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.0.4.ebuild,v 1.1 2007/03/16 15:39:11 ferdy Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion