More missing emacs blame bits, and include a credit for some of the git-scm work that the 9999 build is based on.

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

4 files changed, 16 insertions, 10 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 7a10eafafa8a..3854dc37f443 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.328 2009/04/05 00:04:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.329 2009/04/05 21:17:42 robbat2 Exp $
+
+  05 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-9999.ebuild:
+  Forgot a bit.
 
   05 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> git-1.6.2.2-r1.ebuild:
   Refix bug #237210, missed a part.
@@ -11,7 +14,8 @@
   03 Apr 2009; Robin H. Johnson <robbat2@gentoo.org> +git-1.6.2.2-r1.ebuild,
   +git-9999.ebuild:
   Bug #238023 - add an scm-capable ebuild for Git, use it to tidy up the
-  ebuild a bit too.
+  ebuild a bit too. Based on the work by Sebastian Pipping
+  <webmaster@hartwork.org>.
 
 *git-1.6.2.2 (03 Apr 2009)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 8e24aaee9bc4..2a1514bf8d2d 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -110,8 +110,8 @@ EBUILD git-1.6.1.2.ebuild 8604 RMD160 d250ff4edad7746b3e06e6a2816e166a373ab1dd S
 EBUILD git-1.6.1.3.ebuild 8605 RMD160 a6478e8eb4afb5dfa6b4b8d99a7c4e97f5704e99 SHA1 8b0e0f5a4c7453cfd5bb5e9a1c78eb930d2c3b54 SHA256 7de1be388d359f7cb81a91f54cd343e04ae6f2ee188de7e142a07c5f64d85407
 EBUILD git-1.6.1.ebuild 8669 RMD160 260375314513971c695787b4da9c2b172419bdf2 SHA1 848d8e40359b93dd596e243899b675b6d8b82a16 SHA256 4f56c7055b75064ea7ea7248d0da213e2fe6a6e08cfb2c3e63ca6139238da5f1
 EBUILD git-1.6.2.2-r1.ebuild 9386 RMD160 965dee7418f4c368ba68ced5f05d88422c69b10a SHA1 0277acb2f8b0c0935929706dd0ca2f3d86bcf280 SHA256 8f50d93bd429d3abd9f15e8b0bb0a8eaaedc0215e46b7bf527deee79f04f2401
-EBUILD git-1.6.2.2.ebuild 8509 RMD160 e595b7a5b6d619b217542fad544d3a3e3bc6332b SHA1 79bcabf53dc1e1afe9a07bd5b5d524cf84c87ce9 SHA256 d04f4d9e809c3bfd66a6939e0fc9e4892771a7256ba9a4efbc9ae4d88f440849
+EBUILD git-1.6.2.2.ebuild 8528 RMD160 aae037fc6b4af9cba28048c770138691ac607d03 SHA1 3b72b7eb7aa8bf8266c2f64c262552b07c670f02 SHA256 151a6c06c5f13ada3d57629aa4ac46284995950279c11b7928be5cea9adda06d
 EBUILD git-1.6.2.ebuild 8443 RMD160 0138c4f89eed7055664bb2a84d6e41bc1be60e2d SHA1 7bc2abe4a18f4150792724e6550817f2802ef48a SHA256 a2c7e4858f2bd21973d818d059023cfd2c98177a0bae2aa1c31fff1e7309ec13
-EBUILD git-9999.ebuild 9281 RMD160 60dacff460c5d8b4d93f6a93f2e760fcb41e6841 SHA1 1abf90f237c98a81cccf6cbc90cf70ff36fb159e SHA256 bb07fcacd550f3ba1755c265d3985056b57ee3cada9bb470958f0f1bf54df9ea
-MISC ChangeLog 49437 RMD160 e5e0ca4e7e4fc93c9caad573d1e93825dabfa945 SHA1 dd97134a08687c66cf8ba00b963db197ec7a92c9 SHA256 269525e707567776315cbb9f56e3ca63cb557697f2beaf1d0da2372e1fb59643
+EBUILD git-9999.ebuild 9288 RMD160 8cee0d3d3ec2099e1b29e2f3e66ea257e19f50c4 SHA1 c6dd865b19c649ce590719ba3e03477d2b7ab75d SHA256 d2e282eb0ddb2bde62571e796c949c9b46afb9b0cbc94d5785918a86261c4d74
+MISC ChangeLog 49591 RMD160 ce9c0a5c047f04ff06e021ea37f64ddf52ba2892 SHA1 ad28596a2c4133692536f5c00967b777bf0e8608 SHA256 b5db1c77f1bc830d183ffa7591e5bbc95f46014db19cac5a7a85f42ff52eee25
 MISC metadata.xml 1535 RMD160 1117b90f1e7550ce3a47f844ac17db78ed803cc3 SHA1 223d8e6b2faf20bf290d90d0d6322473daa49b0c SHA256 58d9f467528fee5c7062d0a2344a3b61ff0b8b7a0a84dffc9f56557f7eadd70b
diff --git a/dev-util/git/git-1.6.2.2.ebuild b/dev-util/git/git-1.6.2.2.ebuild
index 0d7cf561691a..223a973522c2 100644
--- a/dev-util/git/git-1.6.2.2.ebuild
+++ b/dev-util/git/git-1.6.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.2.2.ebuild,v 1.1 2009/04/03 06:15:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.2.2.ebuild,v 1.2 2009/04/05 21:17:42 robbat2 Exp $
 
 EAPI=2
 
@@ -129,11 +129,13 @@ src_compile() {
 	git_emake || die "emake failed"
 
 	if use emacs ; then
-		elisp-compile contrib/emacs/git.el || die "emacs modules failed"
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
 	fi
 	if use perl && use cgi ; then
 		git_emake \
-			gitweb/gitweb.cgi || die "emake gitweb/gitweb.cgi failed"
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
 	fi
 }
 
diff --git a/dev-util/git/git-9999.ebuild b/dev-util/git/git-9999.ebuild
index de08b2d1f271..59fb6766f96a 100644
--- a/dev-util/git/git-9999.ebuild
+++ b/dev-util/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-9999.ebuild,v 1.2 2009/04/03 15:23:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-9999.ebuild,v 1.3 2009/04/05 21:17:42 robbat2 Exp $
 
 EAPI=2
 
@@ -160,7 +160,7 @@ src_compile() {
 	git_emake || die "emake failed"
 
 	if use emacs ; then
-		elisp-compile contrib/emacs/git.el \
+		elisp-compile contrib/emacs/git{,-blame}.el \
 			|| die "emacs modules failed"
 	fi