Install the git-p4 tool and the import-tars tool.

Package-Manager: portage-2.1.4_rc10

4 files changed, 27 insertions, 15 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 2dd66b7d8d43..05a7f210ee4c 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.238 2007/12/17 05:23:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.239 2007/12/25 08:39:00 robbat2 Exp $
+
+  25 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.3.7-r1.ebuild,
+  git-1.5.4_rc0.ebuild:
+  Install the git-p4 tool and the import-tars tool.
 
   17 Dec 2007; Robin H. Johnson <robbat2@gentoo.org> git-1.5.1.6.ebuild,
   git-1.5.2.5.ebuild, git-1.5.3.2.ebuild, git-1.5.3.3.ebuild,
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 57b8bead5b5c..24c4d332dc56 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -93,22 +93,22 @@ EBUILD git-1.5.3.6.ebuild 4886 RMD160 3040e1749ee59fa5e45c3f8207920993e99a25e9 S
 MD5 7c7e091dc139c2403d51e880baab42cf git-1.5.3.6.ebuild 4886
 RMD160 3040e1749ee59fa5e45c3f8207920993e99a25e9 git-1.5.3.6.ebuild 4886
 SHA256 22d7677645a2127bdb545ef0ff454d05996a2ff6cfd7626f663c236f540a7673 git-1.5.3.6.ebuild 4886
-EBUILD git-1.5.3.7-r1.ebuild 6197 RMD160 ad09c795a73b86ab28b3d91339ae851a2cf2c991 SHA1 823a83a1a6a28cb1fdba83b3666204fab57bfcb3 SHA256 d63f9bc498fc7fe4f9d6842d64cc77b81a4911e1a144b3de2a1f7b32a494ecaf
-MD5 a5ef1a9a398ab9af94597532b805525c git-1.5.3.7-r1.ebuild 6197
-RMD160 ad09c795a73b86ab28b3d91339ae851a2cf2c991 git-1.5.3.7-r1.ebuild 6197
-SHA256 d63f9bc498fc7fe4f9d6842d64cc77b81a4911e1a144b3de2a1f7b32a494ecaf git-1.5.3.7-r1.ebuild 6197
+EBUILD git-1.5.3.7-r1.ebuild 6327 RMD160 6ac43a1865fd603023495dcffaab2d11f04b319b SHA1 1644ba188c5aa9c34fe8473d05bc5736de433ce6 SHA256 c7eb9c200d9ff99235a71b28b7b357d0b5fd72c95730f1c0aa33bbd147e14c9d
+MD5 bf94ce873921dbbc86f20d67ff4d5e1e git-1.5.3.7-r1.ebuild 6327
+RMD160 6ac43a1865fd603023495dcffaab2d11f04b319b git-1.5.3.7-r1.ebuild 6327
+SHA256 c7eb9c200d9ff99235a71b28b7b357d0b5fd72c95730f1c0aa33bbd147e14c9d git-1.5.3.7-r1.ebuild 6327
 EBUILD git-1.5.3.7.ebuild 5627 RMD160 111a9cf04f5edbdd7d6bc3456569ee344f75f932 SHA1 d9cd33fb633ba6d79a07ff5d9d78c6f1cc987380 SHA256 50b14e256fa9c46e71dea5cc0332b6441c49dee899f6f11ba3de21f411101f9c
 MD5 1994de8b269ed1c296fe261d6f6f3580 git-1.5.3.7.ebuild 5627
 RMD160 111a9cf04f5edbdd7d6bc3456569ee344f75f932 git-1.5.3.7.ebuild 5627
 SHA256 50b14e256fa9c46e71dea5cc0332b6441c49dee899f6f11ba3de21f411101f9c git-1.5.3.7.ebuild 5627
-EBUILD git-1.5.4_rc0.ebuild 6442 RMD160 17e27558bdcf6e97aa698cb108b7886ea9782f7a SHA1 28621fdbfa81b186dadf3bd2d28bf4708f3ec617 SHA256 713a60970e81c4ca341654ebc84854802cf8457f9754a0d2a2a9b27cb08842fc
-MD5 de744a72d382679eefd946d1d1657cef git-1.5.4_rc0.ebuild 6442
-RMD160 17e27558bdcf6e97aa698cb108b7886ea9782f7a git-1.5.4_rc0.ebuild 6442
-SHA256 713a60970e81c4ca341654ebc84854802cf8457f9754a0d2a2a9b27cb08842fc git-1.5.4_rc0.ebuild 6442
-MISC ChangeLog 34569 RMD160 df9be04be5db149233781eb42e52b299ff7961f7 SHA1 c1cf031c70951d66404be9cbd781628b40cce31c SHA256 986376a18162ff0af7a67f491fa4766f03b8f75ec75479feb863e8c25ce25bad
-MD5 5b2b13aed0d059ba7276f95c8baf7d92 ChangeLog 34569
-RMD160 df9be04be5db149233781eb42e52b299ff7961f7 ChangeLog 34569
-SHA256 986376a18162ff0af7a67f491fa4766f03b8f75ec75479feb863e8c25ce25bad ChangeLog 34569
+EBUILD git-1.5.4_rc0.ebuild 6572 RMD160 43843dc24bc1cd78f74f7dd8b03e4e2d0dfed2ec SHA1 3972688d905196ca287d34c89d828b654de738f7 SHA256 44864a1e092c384267a370a497559cb36abb9169b925da184a5c590b57bb2935
+MD5 dcfbc5fb35c054e04d202464568d346b git-1.5.4_rc0.ebuild 6572
+RMD160 43843dc24bc1cd78f74f7dd8b03e4e2d0dfed2ec git-1.5.4_rc0.ebuild 6572
+SHA256 44864a1e092c384267a370a497559cb36abb9169b925da184a5c590b57bb2935 git-1.5.4_rc0.ebuild 6572
+MISC ChangeLog 34722 RMD160 059ad886b8646efa752e81736041b8e5add016e5 SHA1 889f4a1a5dcb353f592b7c60f2cc8115d94c31ac SHA256 8785f3c004279b61f977e668f07aff5b5630c32508849386ff1ee739617489ff
+MD5 5bb28cf9be4ca4f06673f27e307e6786 ChangeLog 34722
+RMD160 059ad886b8646efa752e81736041b8e5add016e5 ChangeLog 34722
+SHA256 8785f3c004279b61f977e668f07aff5b5630c32508849386ff1ee739617489ff ChangeLog 34722
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
 MD5 c205afae129e41ba63cf04be7f56c7ab metadata.xml 1029
 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 metadata.xml 1029
diff --git a/dev-util/git/git-1.5.3.7-r1.ebuild b/dev-util/git/git-1.5.3.7-r1.ebuild
index 505f32839854..83328466e706 100644
--- a/dev-util/git/git-1.5.3.7-r1.ebuild
+++ b/dev-util/git/git-1.5.3.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3.7-r1.ebuild,v 1.4 2007/12/17 05:23:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3.7-r1.ebuild,v 1.5 2007/12/25 08:39:00 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -139,6 +139,10 @@ src_install() {
 		newdoc "${S}"/contrib/blameview/README README.blameview
 	fi
 
+	dobin contrib/fast-import/git-p4
+	dodoc contrib/fast-import/git-p4.txt
+	newbin contrib/fast-import/import-tars.perl import-tars
+
 	dodir /usr/share/${PN}/contrib
 	for i in continuous fast-import hg-to-git \
 		hooks remotes2config.sh vim stats \
diff --git a/dev-util/git/git-1.5.4_rc0.ebuild b/dev-util/git/git-1.5.4_rc0.ebuild
index 7d610daf7a22..39c29eeac10a 100644
--- a/dev-util/git/git-1.5.4_rc0.ebuild
+++ b/dev-util/git/git-1.5.4_rc0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4_rc0.ebuild,v 1.2 2007/12/17 05:23:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4_rc0.ebuild,v 1.3 2007/12/25 08:39:00 robbat2 Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -139,6 +139,10 @@ src_install() {
 		newdoc "${S}"/contrib/blameview/README README.blameview
 	fi
 
+	dobin contrib/fast-import/git-p4
+	dodoc contrib/fast-import/git-p4.txt
+	newbin contrib/fast-import/import-tars.perl import-tars
+
 	dodir /usr/share/${PN}/contrib
 	# The following are excluded:
 	# p4import - excluded because fast-import has a better one