Version bump. Applied the patches found in bug #106998

(Portage version: 2.0.51.22-r2)

5 files changed, 29 insertions, 24 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index f61effa085db..be8af11aa5c4 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.25 2005/09/22 17:57:08 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.26 2005/09/25 23:51:10 r3pek Exp $
+
+*git-0.99.7d (25 Sep 2005)
+
+  25 Sep 2005; Carlos Silva <r3pek@gentoo.org> -git-0.99.7a-r1.ebuild,
+  +git-0.99.7d.ebuild:
+  Version bump. Applied the patches found in bug #106998
 
 *git-0.99.7a-r1 (22 Sep 2005)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 92b0f1303cab..c02bfd6364db 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -1,8 +1,8 @@
+MD5 fb3e337851cfb6c6a27927721e8839ec git-0.99.7d.ebuild 2347
 MD5 edebd592261315b29a6b903b414573d2 git-0.7.ebuild 1312
 MD5 9bbe3abc3061ff033cb32ccef8a86446 git-0.99.6.ebuild 1175
-MD5 c169a83b51ed1784bbd3104732355c70 git-0.99.7a-r1.ebuild 2375
-MD5 3cebca3a3b6cadc81700d6093fef1485 ChangeLog 3372
+MD5 b6955301d896a57b2e693ce74409ac16 ChangeLog 3552
 MD5 78c1b34edd1399c24d7d9e59212bc17a metadata.xml 221
 MD5 c55b80b4ca5f800615642ce40266738f files/digest-git-0.99.6 68
+MD5 cf6e548e45e0bfd7fbf2c55c2da7a3ee files/digest-git-0.99.7d 69
 MD5 8ebc37d29c321b95a3c0ae51ebee4d4d files/digest-git-0.7 59
-MD5 3da76472c3f2012be938c7c386896045 files/digest-git-0.99.7a-r1 69
diff --git a/dev-util/git/files/digest-git-0.99.7a-r1 b/dev-util/git/files/digest-git-0.99.7a-r1
deleted file mode 100644
index e75787b496a3..000000000000
--- a/dev-util/git/files/digest-git-0.99.7a-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba2531e31bc47c12a065180a90645b98 git-core-0.99.7a.tar.bz2 356597
diff --git a/dev-util/git/files/digest-git-0.99.7d b/dev-util/git/files/digest-git-0.99.7d
new file mode 100644
index 000000000000..dc478127805c
--- /dev/null
+++ b/dev-util/git/files/digest-git-0.99.7d
@@ -0,0 +1 @@
+MD5 b712405d794ac1716441d503f3625c65 git-core-0.99.7d.tar.bz2 356830
diff --git a/dev-util/git/git-0.99.7a-r1.ebuild b/dev-util/git/git-0.99.7d.ebuild
index 5b486b2f61cb..de2d6f7eec47 100644
--- a/dev-util/git/git-0.99.7a-r1.ebuild
+++ b/dev-util/git/git-0.99.7d.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.7a-r1.ebuild,v 1.1 2005/09/22 17:57:08 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-0.99.7d.ebuild,v 1.1 2005/09/25 23:51:10 r3pek Exp $
 
 inherit python
 
@@ -11,7 +11,7 @@ SRC_URI="http://kernel.org/pub/software/scm/git/${PN}-core-${PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="mozsha1 ppcsha1 doc nocurl tcltk gitsendemail"
+IUSE="mozsha1 ppcsha1 doc curl tcltk gitsendemail"
 S="${WORKDIR}/${PN}-core-${PV}"
 
 DEPEND="dev-libs/openssl
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 		dev-lang/perl
 		>=dev-lang/python-2.3
 		tcltk? ( dev-lang/tk )
-		!nocurl? ( net-misc/curl )
+		curl? ( net-misc/curl )
 		>=dev-util/cvsps-2.1
 		dev-perl/String-ShellQuote
 		gitsendemail? ( dev-perl/Mail-Sendmail )"
@@ -47,19 +47,21 @@ src_compile() {
 		export MOZILLA_SHA1=yes
 	elif use ppcsha1; then
 		export PPC_SHA1=yes
-	elif use nocurl; then
+	fi
+
+	if ! use curl; then
 		export NO_CURL=yes
-		ewarn "git-http-pull will not be built because you are using the nocurl
-			use flag"
-	elif use gitsendemail; then
-		export WITH_SEND_EMAIL=yes
+		ewarn "git-http-pull will not be built because you are not"
+		ewarn "using the curl use flag"
 	fi
 
-	make prefix=/usr || die "make failed"
+	use gitsendemail && export WITH_SEND_EMAIL=yes
+
+	emake prefix=/usr || die "make failed"
 
 	if use doc; then
 		cd ${S}/Documentation
-		make || die "make documentation failed"
+		emake || die "make documentation failed"
 	fi
 }
 
@@ -70,23 +72,20 @@ src_install() {
 		exeinto /usr/bin
 		doexe git-send-email.perl
 	fi
-	if !(use tcltk); then
-		rm ${D}/usr/bin/gitk
-	fi
+
+	use tcltk || rm ${D}/usr/bin/gitk
 
 	dodoc README COPYING
-	if use doc; then
-		doman Documentation/*.1 Documentation/*.7
-	fi
+	use doc && doman Documentation/*.1 Documentation/*.7
 }
 
 pkg_postinst() {
 	einfo
-	einfo "This version of GIT has changed some command names. It this version"
-	einfo "The old commands will still be present but linked to the new ones."
+	einfo "This version of GIT has changed some command names. It this version,"
+	einfo "the old commands will still be present but linked to the new ones."
 	einfo "The future 0.99.8 version of GIT will NOT have this feature."
 	einfo
 	einfo "For the complete list of commands that got changed, visist:"
-	einfo "http://dev.gentoo.org/~r3pek/git-new-command-list.htm"
+	einfo "http://dev.gentoo.org/~r3pek/git-new-command-list.txt"
 	einfo
 }