New upstream version.

(Portage version: 2.0.53)

5 files changed, 21 insertions, 25 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 21ad17de898d..750f9384be5c 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,12 @@
 # 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.56 2005/12/24 12:52:55 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.57 2005/12/27 18:16:25 ferdy Exp $
+
+*git-1.0.5 (27 Dec 2005)
+
+  27 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> -git-1.0.4.ebuild,
+  +git-1.0.5.ebuild:
+  New upstream version.
 
 *git-1.0.4 (24 Dec 2005)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 60441f450b9d..8ba0ac867932 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 05cd712425eeb6685f169414d5e4a5f5 ChangeLog 8805
 MD5 8ebc37d29c321b95a3c0ae51ebee4d4d files/digest-git-0.7 59
 MD5 62316f61a79143fdaf1e9f747d1ddf03 files/digest-git-0.99.8a 69
 MD5 ede5785dc3531d89fe224f16c233e8d2 files/digest-git-0.99.9n 64
 MD5 609a488c1b011e218271fdc8d3e2ae31 files/digest-git-1.0.4 62
+MD5 c8dcd0083fffe8085da9a336162a935c files/digest-git-1.0.5 194
 MD5 5c96e23fef078682e648254d9197f618 files/git-daemon.confd 376
 MD5 ad6b9193f41375013fad4455bf1acda7 files/git-daemon.initd 526
 MD5 edebd592261315b29a6b903b414573d2 git-0.7.ebuild 1312
 MD5 d35a0c0793dbfc65191588d2eca405d1 git-0.99.8a.ebuild 2835
 MD5 836fd3f0a31e670e7cdb6350d38f5323 git-0.99.9n.ebuild 3342
 MD5 ab22f62504aacafad9e43ac32d286688 git-1.0.4.ebuild 3247
+MD5 8eab3d6c18a691dac56c69b06d50dc82 git-1.0.5.ebuild 3162
 MD5 3526aab52e4319669bc1064d4d4ac83a metadata.xml 316
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDrUS5ViELBEf1JB0RAigUAJ9R6vlBzxxGswvWwHtro7HcqiKWPgCggufH
-3asNnscfkA/eNcCwrBS2bOg=
-=waZW
------END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.0.4 b/dev-util/git/files/digest-git-1.0.4
deleted file mode 100644
index 41a0e1a818ea..000000000000
--- a/dev-util/git/files/digest-git-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ec74d33f6288d6291510ea8358500d5 git-1.0.4.tar.bz2 475482
diff --git a/dev-util/git/files/digest-git-1.0.5 b/dev-util/git/files/digest-git-1.0.5
new file mode 100644
index 000000000000..a56573e1f927
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.0.5
@@ -0,0 +1,3 @@
+MD5 11cbfd47a1e764da2f7a9d8931281e3f git-1.0.5.tar.bz2 475516
+MD5 39ee22936b2372f4fba43f82929a94ac git-html-1.0.5.tar.bz2 201581
+MD5 4e5659f6a3f50e49387bc478479847a9 git-man-1.0.5.tar.bz2 65523
diff --git a/dev-util/git/git-1.0.4.ebuild b/dev-util/git/git-1.0.5.ebuild
index 2121d05a4702..f0f374b8151d 100644
--- a/dev-util/git/git-1.0.4.ebuild
+++ b/dev-util/git/git-1.0.5.ebuild
@@ -1,12 +1,14 @@
 # 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-1.0.4.ebuild,v 1.1 2005/12/24 12:52:55 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.0.5.ebuild,v 1.1 2005/12/27 18:16:25 ferdy Exp $
 
 inherit python toolchain-funcs eutils
 
 DESCRIPTION="GIT - the stupid content tracker"
 HOMEPAGE="http://kernel.org/pub/software/scm/git/"
-SRC_URI="http://kernel.org/pub/software/scm/git/${P}.tar.bz2"
+SRC_URI="http://kernel.org/pub/software/scm/git/${P}.tar.bz2
+		http://kernel.org/pub/software/scm/git/${PN}-man-${PV}.tar.bz2
+		doc? ( http://kernel.org/pub/software/scm/git/${PN}-html-${PV}.tar.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,8 +19,7 @@ DEPEND="dev-libs/openssl
 		sys-libs/zlib
 		!app-misc/git
 		curl? ( net-misc/curl )
-		webdav? ( dev-libs/expat )
-		doc? ( >=app-text/asciidoc-7.0.1 app-text/xmlto )"
+		webdav? ( dev-libs/expat )"
 RDEPEND="${DEPEND}
 		dev-lang/perl
 		>=dev-lang/python-2.3
@@ -70,13 +71,6 @@ src_unpack() {
 
 src_compile() {
 	emake ${MY_MAKEOPTS} prefix=/usr || die "make 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() {
@@ -84,11 +78,13 @@ src_install() {
 
 	use tcltk || rm ${D}/usr/bin/gitk
 
+	doman ${WORKDIR}/${PN}-man-${PV}/man?/*
+
 	dodoc README COPYING Documentation/SubmittingPatches
 	if use doc ; then
-		doman Documentation/*.1 Documentation/*.7
-		make install-webdoc -C Documentation/
 		dodoc Documentation/technical/*
+		dodir /usr/share/doc/${PF}/html
+		cp -r ${WORKDIR}/${PN}-html-${PV}/* ${D}/usr/share/doc/${PF}/html
 	fi
 
 	newinitd "${FILESDIR}/git-daemon.initd" git-daemon