Added myself to metadata. Version bump, added init script and its conf.d file. Fixed USE=doc. Removed not needed deps and rephrased pkg_postinst. Removed old version

(Portage version: 2.0.51.22-r2)

8 files changed, 81 insertions, 17 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 436461b36d28..9a6e7b3444a3 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.28 2005/10/03 21:49:43 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.29 2005/10/05 15:05:04 ferdy Exp $
+
+*git-0.99.8a (05 Oct 2005)
+
+  05 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/git-daemon.confd, +files/git-daemon.initd, metadata.xml,
+  -git-0.99.8.ebuild, +git-0.99.8a.ebuild:
+  Added myself to metadata. Version bump, added init script and its conf.d
+  file. Fixed USE=doc. Removed not needed deps and rephrased pkg_postinst.
+  Removed old version
 
 *git-0.99.8 (03 Oct 2005)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 7a0ef926ac49..5b7aa721daa5 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,6 +1,10 @@
+MD5 cb92516a4f4e59615dd3d74f490f17be git-0.99.8a.ebuild 2834
 MD5 edebd592261315b29a6b903b414573d2 git-0.7.ebuild 1312
 MD5 5a9441e2c8c13f73aad083182dad8db3 ChangeLog 3809
-MD5 78c1b34edd1399c24d7d9e59212bc17a metadata.xml 221
+MD5 3526aab52e4319669bc1064d4d4ac83a metadata.xml 316
 MD5 f3fc475df00a89961fbfa98a747e8022 git-0.99.8.ebuild 2313
+MD5 5c96e23fef078682e648254d9197f618 files/git-daemon.confd 376
+MD5 aae542e7d891aca39f417ad1a5468ce6 files/git-daemon.initd 430
 MD5 9b4b7bbed0f6c0d1aee9459feb18a42b files/digest-git-0.99.8 68
+MD5 62316f61a79143fdaf1e9f747d1ddf03 files/digest-git-0.99.8a 69
 MD5 8ebc37d29c321b95a3c0ae51ebee4d4d files/digest-git-0.7 59
diff --git a/dev-util/git/files/digest-git-0.99.8 b/dev-util/git/files/digest-git-0.99.8
deleted file mode 100644
index 75f86651825c..000000000000
--- a/dev-util/git/files/digest-git-0.99.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0fb209de06352923b66ef1ca50e1b3b7 git-core-0.99.8.tar.bz2 365608
diff --git a/dev-util/git/files/digest-git-0.99.8a b/dev-util/git/files/digest-git-0.99.8a
new file mode 100644
index 000000000000..faa2710dff94
--- /dev/null
+++ b/dev-util/git/files/digest-git-0.99.8a
@@ -0,0 +1 @@
+MD5 bea60a4e5394a3288a5c7d3d15a11c25 git-core-0.99.8a.tar.bz2 366070
diff --git a/dev-util/git/files/git-daemon.confd b/dev-util/git/files/git-daemon.confd
new file mode 100644
index 000000000000..ace9cbd85bfd
--- /dev/null
+++ b/dev-util/git/files/git-daemon.confd
@@ -0,0 +1,12 @@
+# conf.d file for git-daemon
+#
+# Please check man 1 git-daemon for more information about the options
+# git-daemon accepts.
+#
+# Meaningful options are:
+#   --syslog      --- Enables syslog logging
+#   --verbose     --- Enables verbose logging
+#   --export-all  --- Exports all repositories
+#   --port=XXXX   --- Starts in port XXXX instead of 9418
+#
+GITDAEMON_OPTS="--syslog"
diff --git a/dev-util/git/files/git-daemon.initd b/dev-util/git/files/git-daemon.initd
new file mode 100644
index 000000000000..2563c41483c7
--- /dev/null
+++ b/dev-util/git/files/git-daemon.initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2005 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.1 2005/10/05 15:05:04 ferdy Exp $
+
+depend() {
+	need net
+	use logger
+}
+
+start() {
+	ebegin "Starting git-daemon"
+		start-stop-daemon --start --quiet --background \
+		--exec /usr/bin/git-daemon -- ${GITDAEMON_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stoping git-daemon"
+		start-stop-daemon --stop --quiet --name git-daemon
+	eend $?
+}
diff --git a/dev-util/git/git-0.99.8.ebuild b/dev-util/git/git-0.99.8a.ebuild
index b1ea051fb80a..5224e15a9c34 100644
--- a/dev-util/git/git-0.99.8.ebuild
+++ b/dev-util/git/git-0.99.8a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-0.99.8.ebuild,v 1.1 2005/10/03 21:49:43 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-0.99.8a.ebuild,v 1.1 2005/10/05 15:05:04 ferdy Exp $
 
 inherit python
 
@@ -24,7 +24,6 @@ RDEPEND="${DEPEND}
 		>=dev-lang/python-2.3
 		tcltk? ( dev-lang/tk )
 		curl? ( net-misc/curl )
-		>=dev-util/cvsps-2.1
 		dev-perl/String-ShellQuote
 		gitsendemail? ( dev-perl/Mail-Sendmail )"
 
@@ -43,9 +42,9 @@ src_compile() {
 	python_version()
 	[[ $PYVER < 2.4 ]] && export WITH_OWN_SUBPROCESS_PY=yes
 
-	if use mozsha1; then
+	if use mozsha1 ; then
 		export MOZILLA_SHA1=yes
-	elif use ppcsha1; then
+	elif use ppcsha1 ; then
 		export PPC_SHA1=yes
 	fi
 
@@ -59,16 +58,18 @@ src_compile() {
 
 	emake prefix=/usr || die "make failed"
 
-	if use doc; then
-		cd ${S}/Documentation
-		emake || die "make documentation failed"
+	if use doc ; then
+		sed -i \
+			-e "s:^\(WEBDOC_DEST = \).*$:\1${D}/usr/share/doc/${PF}/html/:g" \
+			${S}/Documentation/Makefile || die "sed failed (Documentation)"
+		emake -C Documentation/ || die "make documentation failed"
 	fi
 }
 
 src_install() {
 	make DESTDIR=${D} prefix=/usr install || die "make install failed"
 
-	if use gitsendemail; then
+	if use gitsendemail ; then
 		exeinto /usr/bin
 		doexe git-send-email.perl
 	fi
@@ -76,16 +77,28 @@ src_install() {
 	use tcltk || rm ${D}/usr/bin/gitk
 
 	dodoc README COPYING
-	use doc && doman Documentation/*.1 Documentation/*.7
+	if use doc ; then
+		doman Documentation/*.1 Documentation/*.7
+		make install-webdoc -C Documentation/
+	fi
+
+	newinitd "${FILESDIR}/git-daemon.initd" git-daemon
+	newconfd "${FILESDIR}/git-daemon.confd" git-daemon
 }
 
 pkg_postinst() {
+	echo
+	ewarn "Some commands will be renamed before the final 1.0. Use the git"
+	ewarn "wrapper in your scripts to avoid compatibility problems. Check the"
+	ewarn "changes table at:"
+	echo
+	echo "http://dev.gentoo.org/~r3pek/git-new-command-list.txt"
+	echo
 	einfo
-	einfo "This version still have the links between the old command names and"
-	einfo "the new command names. Anyway, if you haven't already see the new"
-	einfo "commands, take a look at:"
-	einfo "http://dev.gentoo.org/~r3pek/git-new-command-list.txt"
+	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 "This will be removed in any version before the final 1.0"
+	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"
 	einfo
 }
diff --git a/dev-util/git/metadata.xml b/dev-util/git/metadata.xml
index 315619c8272f..4dd048a90f73 100644
--- a/dev-util/git/metadata.xml
+++ b/dev-util/git/metadata.xml
@@ -5,4 +5,8 @@
 <maintainer>
   <email>r3pek@gentoo.org</email>
 </maintainer>
+<maintainer>
+  <email>ferdy@gentoo.org</email>
+  <name>Fernando J. Pereda</name>
+</maintainer>
 </pkgmetadata>