Git 1.6 requires that daemon been an argument not part of the name.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc6-00443-g435eb77 x86_64

4 files changed, 12 insertions, 8 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 227fd2ce0477..40cc6f4da02f 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.294 2008/08/30 03:32:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.295 2008/09/16 17:52:15 robbat2 Exp $
+
+  16 Sep 2008; Robin H. Johnson <robbat2@gentoo.org> files/git-daemon.initd,
+  files/git-daemon.xinetd:
+  Git 1.6 requires that daemon been an argument not part of the name.
 
 *git-1.6.0.1 (30 Aug 2008)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 4ec9a3fddcc6..a557e860548a 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -9,8 +9,8 @@ AUX git-1.5.3-symlinks.patch 645 RMD160 24fc6002042e67611f337cae3867bb400fd8c7d6
 AUX git-1.5.3.8-t9101.patch 878 RMD160 8202afb8f1b8a7ac763ffa0e575aed3feb8a6847 SHA1 6d9c1ed47cec9713ec2e4c6c26f19ede673b8fce SHA256 8f16f4c811010eb4f20e643c9a0c303470bb76451dd729154a1f20d01453bc0e
 AUX git-1.5.3.8-t9106.patch 897 RMD160 5651dc89e42066b91e525dcbc367f42fa4db79a4 SHA1 e306f87501e98caf587d1e6a86ceef7b9e35139e SHA256 ede8da4f5eb3b9f4824b8db1cdb4d4bd9a1d854ca0676241c2509856dbd49f98
 AUX git-daemon.confd 376 RMD160 70cbd0b87cbd2ce6b494f07ead732f33f7ea623f SHA1 3a00fa3af96d83bec1589d7ef53eff01ea838ea1 SHA256 266045958a3a4072529f25208d1f84a178bbb10aa0b6fa19543f7a62f9a5e3fe
-AUX git-daemon.initd 528 RMD160 9786bd637bc6d58dd3cce07bb7a4442d318acd1e SHA1 aafe9b7b642f0e8ae634e6ae8488777a4588300b SHA256 741e904e20d307e05edd545a30acaf9f50c2ff152a68d32e65495fb6f0d63858
-AUX git-daemon.xinetd 260 RMD160 9c1abde72ac5064e1fc86afd29c2a74079db91a4 SHA1 4763c4595ae65e38c189366fca35f73f18c9a03a SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a
+AUX git-daemon.initd 529 RMD160 103a512e58076b7c3672c1286c1d220bb57ac19f SHA1 c04d47b0f59ba0e7cfa83b85362e78a56aa93a7c SHA256 cb6ec265ff4a2f43ab4336b594c7f68c6055555b4b489ca5eec270f01e6e81d8
+AUX git-daemon.xinetd 260 RMD160 5bfeca2541488bb955ca349474c1fa3e80913aef SHA1 88d6fc44644c88ed6f2ce54a936f41dc15d2268e SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67
 AUX vim-ftdetect-gitcommit.vim 261 RMD160 9abf9cb8443082820b978d4890caa021f6da6342 SHA1 6f179228555a6316281db247653ec930877741e4 SHA256 ada04f0d5a61ca71ca50b01cd92f010e906f1ae19ecb263ac38e714b087515fe
 DIST git-1.5.1.6.tar.bz2 1130713 RMD160 20279c817da53d3bc6d5f58121bfe73e8a25e8a1 SHA1 c1e34ce6a6a9a81bb16f158ef84b4576e6be1b0c SHA256 4429ca98c0789b0f564cdbf76e8e8ad4db928b7c7ac94f116e4a0729e4253a21
 DIST git-1.5.3.7.tar.bz2 1361540 RMD160 74bfccd50c895e22d10b9e25f481f00a20617077 SHA1 95c3b64d34f28db8122e30f28dc5758ebbc8469b SHA256 f4f03dd1a5255019c2d771a04b8a647509b4c6cf51728acc50e8f26d99e62fec
@@ -65,5 +65,5 @@ EBUILD git-1.5.6.4.ebuild 7900 RMD160 8a00990147131d0ad0f2d65b7f8acc74e18fc582 S
 EBUILD git-1.5.6.5.ebuild 7907 RMD160 48427ce54da57ebdaa6bf5c325937e71d3c51049 SHA1 ea3ebf1d1e6ec06e9d73c8b2d16d9cf43e602bae SHA256 c5afe2c913730751e2329745c4afd4cac12358ace5ffb539a6ddb1059ce38912
 EBUILD git-1.6.0.1.ebuild 8365 RMD160 dcac5bc1627e259b8756fd21e1079b70ccd615c3 SHA1 7fea89a0b44dd596bec3c1805e109a09861f38c8 SHA256 1682cb5438e3ffdb0eff61e15d8bcd463fd1fab87ea2e2d45140488b471aa99b
 EBUILD git-1.6.0.ebuild 8363 RMD160 b3ed9f9be4177be9990248981abd869fcd4b0896 SHA1 5794f858ad0deb991c437d345283d71823b08f11 SHA256 cd605608d7bad32fdaa6a3572c619a8a8626a44ba5baca58d485e1cfdc14dc30
-MISC ChangeLog 43683 RMD160 610585c2b352efc8ca89f9f7965868ff2d7df7b9 SHA1 e3b3825d24bbd12844ab88b7aa661b7ff2c38678 SHA256 4385b3ccd426fcf02faf5bfc1e1ab32ee2f1057d10d6867789b2b4d352485497
+MISC ChangeLog 43858 RMD160 3b438c1a6df50f71cf5dd197081db7850ca09f77 SHA1 8fe3a6ef9d61dc5989f6053a17b98fece5ef53bf SHA256 2fdc5f1cf3e530dc508b2f0fa16439555533a1459bb842c0293da4fdc1f415c4
 MISC metadata.xml 1480 RMD160 06494b78bc4f5da7c5b377e48e8a38e6a61e71b6 SHA1 382259eed96d57835f30304b751540bc8c4a807e SHA256 347f2853546bdfc23b5c17a5d3cd6449a6e533a39fd4647dae2a653d17694b5a
diff --git a/dev-util/git/files/git-daemon.initd b/dev-util/git/files/git-daemon.initd
index beb2fc34a7c2..60ccba02d2d9 100644
--- a/dev-util/git/files/git-daemon.initd
+++ b/dev-util/git/files/git-daemon.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/files/git-daemon.initd,v 1.2 2008/03/20 12:11:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/files/git-daemon.initd,v 1.3 2008/09/16 17:52:15 robbat2 Exp $
 
 depend() {
 	need net
@@ -11,7 +11,7 @@ depend() {
 start() {
 	ebegin "Starting git-daemon"
 		start-stop-daemon --start --quiet --background \
-		--exec /usr/bin/git-daemon -- ${GITDAEMON_OPTS}
+		--exec /usr/bin/git -- daemon ${GITDAEMON_OPTS}
 	eend $?
 }
 
diff --git a/dev-util/git/files/git-daemon.xinetd b/dev-util/git/files/git-daemon.xinetd
index a0748b20ccf4..02c938d4bd6c 100644
--- a/dev-util/git/files/git-daemon.xinetd
+++ b/dev-util/git/files/git-daemon.xinetd
@@ -8,6 +8,6 @@ service git-daemon
 	protocol	= tcp
 	log_on_failure	+= USERID
 	port		= 9418
-	server		= /usr/bin/git-daemon
-	server_args	= --inetd --syslog --export-all --base-path=/var/git
+	server		= /usr/bin/git
+	server_args	= daemon --inetd --syslog --export-all --base-path=/var/git
 }