New upstream versions. Remove old ones.

Package-Manager: portage-2.1.2.2

13 files changed, 91 insertions, 407 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 1bcfaf80a5b5..e69938414d83 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,15 @@
 # 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.192 2007/05/19 08:12:33 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.193 2007/05/20 13:39:17 ferdy Exp $
+
+*git-1.5.2 (20 May 2007)
+*git-1.5.1.6 (20 May 2007)
+
+  20 May 2007; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/git-1.5.2-tempfile.patch, -git-1.5.1.2.ebuild, -git-1.5.1.3.ebuild,
+  -git-1.5.1.4.ebuild, -git-1.5.1.5.ebuild, +git-1.5.1.6.ebuild,
+  +git-1.5.2.ebuild:
+  New upstream versions. Remove old ones.
 
 *git-1.5.1.5 (19 May 2007)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 5252e120faad..8680e71a5d6c 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -9,6 +9,10 @@ AUX git-1.5.0-symlinks.patch 652 RMD160 248ec978bd7aece96b0a9b27b2da00f5a6fa400b
 MD5 532e02bd8bfc22e803d4295b0890e5cd files/git-1.5.0-symlinks.patch 652
 RMD160 248ec978bd7aece96b0a9b27b2da00f5a6fa400b files/git-1.5.0-symlinks.patch 652
 SHA256 52f7e1394f41b0138682b196fd12a5acd0a04e524317a815dd464e67d9e0bd09 files/git-1.5.0-symlinks.patch 652
+AUX git-1.5.2-tempfile.patch 798 RMD160 7bcbf1f52d8d23c83aa93c47c0a78453c4325f99 SHA1 20c6f98daf1627bcc334e28c1f73202e7dcf0e24 SHA256 f156d7b0b4726f341dea268edec962236f833efb4329f5341bfc9f2255c34902
+MD5 9cad5c873ebcb607bb6a4e04a27d8412 files/git-1.5.2-tempfile.patch 798
+RMD160 7bcbf1f52d8d23c83aa93c47c0a78453c4325f99 files/git-1.5.2-tempfile.patch 798
+SHA256 f156d7b0b4726f341dea268edec962236f833efb4329f5341bfc9f2255c34902 files/git-1.5.2-tempfile.patch 798
 AUX git-daemon.confd 376 RMD160 70cbd0b87cbd2ce6b494f07ead732f33f7ea623f SHA1 3a00fa3af96d83bec1589d7ef53eff01ea838ea1 SHA256 266045958a3a4072529f25208d1f84a178bbb10aa0b6fa19543f7a62f9a5e3fe
 MD5 5c96e23fef078682e648254d9197f618 files/git-daemon.confd 376
 RMD160 70cbd0b87cbd2ce6b494f07ead732f33f7ea623f files/git-daemon.confd 376
@@ -22,44 +26,30 @@ MD5 ceec7fba7a2c00fd6d8d46dd39c9b721 files/git-daemon.xinetd 260
 RMD160 9c1abde72ac5064e1fc86afd29c2a74079db91a4 files/git-daemon.xinetd 260
 SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a files/git-daemon.xinetd 260
 DIST git-1.5.0.7.tar.bz2 1053367 RMD160 c8ad03381005152d2513e0d12099d976ccad42a9 SHA1 1e0d09f27cd8eb3ac96590ed4c1baba459d5359e SHA256 6fae7d1de3f4ec2b04423d6af194bf75c9262785997c80fc4e1cd5e62b1b7ada
-DIST git-1.5.1.2.tar.bz2 1120779 RMD160 91019f417972162b2e14d1ddb607522390f68d75 SHA1 d49e6ae0aecd9cff403a110c67041b3c0dbd7a1f SHA256 629a6bd89b226f20cc21c954bd695c91e284b664c05b7d66b706866112b7f628
-DIST git-1.5.1.3.tar.bz2 1122617 RMD160 2f1e7e9c0a9dd7745086d9da1478a8fd0be65de0 SHA1 673bbd457e713251a7fbf54369150dd760c5606d SHA256 876c0902e71a87bb59dae5224f094e484269f0f140dab62c2670878625da65d7
-DIST git-1.5.1.4.tar.bz2 1126258 RMD160 dd8af6da7e8e99e229cf9798a71543136e0f1b35 SHA1 6ab0e784ca9ab499718103179576fb890e61c06e SHA256 3d65197647592779c8932a44f6e390412492d350aa637af5d097ab46e429bbf0
-DIST git-1.5.1.5.tar.bz2 1129538 RMD160 2a1b44dae95c718c986c06e740e698a1e08c5fe1 SHA1 18b60d4622bf458e47d736b56f58c090e4931ed9 SHA256 b2543e990219a88f3bf1004dc35c150b3db53c7a7b22951a4965090cf33acbd2
+DIST git-1.5.1.6.tar.bz2 1130713 RMD160 20279c817da53d3bc6d5f58121bfe73e8a25e8a1 SHA1 c1e34ce6a6a9a81bb16f158ef84b4576e6be1b0c SHA256 4429ca98c0789b0f564cdbf76e8e8ad4db928b7c7ac94f116e4a0729e4253a21
+DIST git-1.5.2.tar.bz2 1180424 RMD160 5e9064bdceadcac779112e8c677a6236de75ed7d SHA1 f60d8dbf0926a3c12a1658bac177b383939d8e54 SHA256 26e30a20a6ee659018a863f743803811535042454f1edad8727b375fefac6ff5
 DIST git-htmldocs-1.5.0.7.tar.bz2 450009 RMD160 0292aa6e166b5ccc3dd89eaeb0b56ab9a98b25f8 SHA1 4767bc6c617d1b5906acc3cc869b870c9743d294 SHA256 9f9dd3beb5b267080a556239bb0a99b5d2ac396cdd15b38c932976a0ec24b823
-DIST git-htmldocs-1.5.1.2.tar.bz2 471266 RMD160 9c739f6b4d7e1ba79148d610e3fa0accf14e08a7 SHA1 2684caa9c0a1392dfd0a97b6d0568f82c0b02ec8 SHA256 6ec2942ab5dd90db19324d39a3307f67a471dd41af6bb9749555f3c21aefd94b
-DIST git-htmldocs-1.5.1.3.tar.bz2 474857 RMD160 892f5e1f03bc23c617bfd00c88734f3b221f3f35 SHA1 ba316ca8f3166af98065606c36f84da744b5fcc8 SHA256 14156a2245c36bf6b68f98c715bcf4577a3b45daa2b10eae88d5a017e4baf5f2
-DIST git-htmldocs-1.5.1.4.tar.bz2 477746 RMD160 d61eb662d07c0c9eab33f9502c4a29ccb9ee9cd2 SHA1 11092d4c1241fed051ac387512d1c94886c45e72 SHA256 27949fc878330bb29458ee56b7ac15efb0dbe64543a41b6010a528bac45cf596
-DIST git-htmldocs-1.5.1.5.tar.bz2 485411 RMD160 19fbca8a148e7b156a0442327a062119156717c7 SHA1 6ed265ed42308b03fddd310f4af3a30580275ecd SHA256 a896bbaf323719db4998f92d474e2bae5de047218f989066f7ec6a7d2ab75cce
+DIST git-htmldocs-1.5.1.6.tar.bz2 489138 RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 SHA1 907749b4eba99c696589be750bc9432b9818954b SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685
+DIST git-htmldocs-1.5.2.tar.bz2 499796 RMD160 bef6b3b51896019430039475662a046e69075917 SHA1 e2c22fc9c5c0325b4c658a6034177b2ebfeed991 SHA256 8ba238a066a4ffde51dd1aaa04b8d9757d0b7ad3793a20289d9ddcf1d54368e2
 DIST git-manpages-1.5.0.7.tar.bz2 126927 RMD160 37028035ea1aca310c79bd079ae1d1e65ca9fe32 SHA1 66de3c514b1942920b66f434350f55e2ff70f90e SHA256 df6879361c0e671e3a228e3bd9954d9f712a7c74e9e151e4ca89bb6037d4dbba
-DIST git-manpages-1.5.1.2.tar.bz2 132716 RMD160 f835da9dcf54860eaabc3c861c9013ee9f717f6d SHA1 08b61944669a6c4260a29281d3e62f127142e942 SHA256 bc5b6514c0bedfecc81ec7221a1e4bece967e0bed33aeaaa90a7c6823b541dec
-DIST git-manpages-1.5.1.3.tar.bz2 133667 RMD160 ac64a5c16c35cf6feb86fa68361124e25f0186a5 SHA1 3a5ecaa36fb5b7c3dba9a96240016fcccac6cfc0 SHA256 7b21d618b3b14120cf0c3c3385fa572c4dc95d780b92166ccdc5503d2eef5879
-DIST git-manpages-1.5.1.4.tar.bz2 133741 RMD160 cadc6c3be2e9878d91cd885303b900ac8433aaf5 SHA1 c112ddccf99b22088959a5b3c7b9edae23fef6c2 SHA256 51caf75f8d31c478f88801caa3094876f4f3cd663d24f99a5b91e7d1fe6088c7
-DIST git-manpages-1.5.1.5.tar.bz2 133906 RMD160 2293b0468c1835db100ab3e47a0e346ecf0901a0 SHA1 971f082ce8140bf9d092e626b786ea2e6329bc54 SHA256 6d906c3945d8a739ec180315ecd07ef6857b372f04bb53cae4ea3ce8d6b592c8
+DIST git-manpages-1.5.1.6.tar.bz2 133945 RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 SHA1 f4eeb116aaeeabf329c9de8d49421af42e4a6f51 SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d
+DIST git-manpages-1.5.2.tar.bz2 138905 RMD160 90520407c8338eda4e9ab2ad573490b06acc01df SHA1 025a4a65e6a1c9aa1abfd64007ba3559655bb629 SHA256 5822714d1847a1d44f3d93286a60e45c375f521c07ce06794636afe187d0680b
 EBUILD git-1.5.0.7.ebuild 4344 RMD160 773db02bbcab8cba9b903e7ddd4dfabdb757e454 SHA1 98c145b5d1e8a4b38b002e6040d146d4c5621980 SHA256 2fdd37d31b701843d2a941a6610939c94de2431c4d4c4088ef83b8719a105681
 MD5 4514af684d0a13883a77a9baadb47724 git-1.5.0.7.ebuild 4344
 RMD160 773db02bbcab8cba9b903e7ddd4dfabdb757e454 git-1.5.0.7.ebuild 4344
 SHA256 2fdd37d31b701843d2a941a6610939c94de2431c4d4c4088ef83b8719a105681 git-1.5.0.7.ebuild 4344
-EBUILD git-1.5.1.2.ebuild 4354 RMD160 56903aed6cdbaffd569d2a8f6b46d24f150a44b9 SHA1 ed3c8a4cd6359ade366be92217e48d296733dfe9 SHA256 a80c6e4cc48d164f6377cdeabcb0ac99eccc5e86a6d5a43dce147f16f100d945
-MD5 c424fb8f99535e87101cffc97859821a git-1.5.1.2.ebuild 4354
-RMD160 56903aed6cdbaffd569d2a8f6b46d24f150a44b9 git-1.5.1.2.ebuild 4354
-SHA256 a80c6e4cc48d164f6377cdeabcb0ac99eccc5e86a6d5a43dce147f16f100d945 git-1.5.1.2.ebuild 4354
-EBUILD git-1.5.1.3.ebuild 4356 RMD160 7a85aca3939a5d0032074f84bdefd87e68fff545 SHA1 331df49d0e4eab854037357f51535969382fd972 SHA256 ec6af37b27278466e283ee28730ae8845150a8829f8cb57b89c567286dfaafa1
-MD5 142f039af51151ee1fd927250945b1e7 git-1.5.1.3.ebuild 4356
-RMD160 7a85aca3939a5d0032074f84bdefd87e68fff545 git-1.5.1.3.ebuild 4356
-SHA256 ec6af37b27278466e283ee28730ae8845150a8829f8cb57b89c567286dfaafa1 git-1.5.1.3.ebuild 4356
-EBUILD git-1.5.1.4.ebuild 4356 RMD160 46e8c5ebec29d8b37995d4a1c80331741ab1a9c8 SHA1 63c814622c97ce7c042c3548d035c8babe99b2de SHA256 a9a77390e883f620ed6dd1a421fbb3302cfa4681dbba4406ec98f43789e71e30
-MD5 c09fb151916ef48b722a46653a96b037 git-1.5.1.4.ebuild 4356
-RMD160 46e8c5ebec29d8b37995d4a1c80331741ab1a9c8 git-1.5.1.4.ebuild 4356
-SHA256 a9a77390e883f620ed6dd1a421fbb3302cfa4681dbba4406ec98f43789e71e30 git-1.5.1.4.ebuild 4356
-EBUILD git-1.5.1.5.ebuild 4354 RMD160 54f7fec5e168249cb6c8c4c90b4d24609e9a59b1 SHA1 34d7860ee567fea80e548e204eb8888db08e9c5d SHA256 336870fe5ffe35ec950aabae2e5010c0f1c48a94b5bafbaa696d9aad2701ea86
-MD5 0a90fbb23cbadd15bb262ed1bc713cdf git-1.5.1.5.ebuild 4354
-RMD160 54f7fec5e168249cb6c8c4c90b4d24609e9a59b1 git-1.5.1.5.ebuild 4354
-SHA256 336870fe5ffe35ec950aabae2e5010c0f1c48a94b5bafbaa696d9aad2701ea86 git-1.5.1.5.ebuild 4354
-MISC ChangeLog 27277 RMD160 eff90a0a1aaf2022b64dac27f8a5b797ddd32e8a SHA1 09df5a9b5fa1371991a30138cd1b28341c3ba703 SHA256 df5087fd091be61a5bd2d250e0feb51f19ae1a428057a2091d9f16ef136f9380
-MD5 56f41b6e102993427e24839a180ae7af ChangeLog 27277
-RMD160 eff90a0a1aaf2022b64dac27f8a5b797ddd32e8a ChangeLog 27277
-SHA256 df5087fd091be61a5bd2d250e0feb51f19ae1a428057a2091d9f16ef136f9380 ChangeLog 27277
+EBUILD git-1.5.1.6.ebuild 4354 RMD160 f35948d34533526a91575669029224855f16a261 SHA1 19256fc6baafb27ff749edc06aa90e1d771869b0 SHA256 18678ed07ecbcf586bb8c608c95a81fdba0f0b38e66daabd957aef1383fdc599
+MD5 7b3274e54be2d86e5be2846adc898d81 git-1.5.1.6.ebuild 4354
+RMD160 f35948d34533526a91575669029224855f16a261 git-1.5.1.6.ebuild 4354
+SHA256 18678ed07ecbcf586bb8c608c95a81fdba0f0b38e66daabd957aef1383fdc599 git-1.5.1.6.ebuild 4354
+EBUILD git-1.5.2.ebuild 4394 RMD160 308c9e9e3bf5668dff33b2de68bb6bf8718fb2fe SHA1 58aad186d9f8036dc6c87a92b4873573e0d50fe7 SHA256 fc1338c17e826e7207eb562e483cc392d408b180ce29d8b5c0dfc563b0a9173b
+MD5 c1ac73fac7c9ff53ebc37247e1f6c6a2 git-1.5.2.ebuild 4394
+RMD160 308c9e9e3bf5668dff33b2de68bb6bf8718fb2fe git-1.5.2.ebuild 4394
+SHA256 fc1338c17e826e7207eb562e483cc392d408b180ce29d8b5c0dfc563b0a9173b git-1.5.2.ebuild 4394
+MISC ChangeLog 27589 RMD160 2c27009533a6b36a13c4c7984d0beab0e3ca2a54 SHA1 b38c8a8f0bb2d87313f8d2c518d4f095c5a2727c SHA256 9e74715905f431efa9596686c95baa4c09e0f35e2213cf181f04dfcf66e8bc26
+MD5 dd99f53651c3b988e64419086cbadb83 ChangeLog 27589
+RMD160 2c27009533a6b36a13c4c7984d0beab0e3ca2a54 ChangeLog 27589
+SHA256 9e74715905f431efa9596686c95baa4c09e0f35e2213cf181f04dfcf66e8bc26 ChangeLog 27589
 MISC metadata.xml 392 RMD160 da59e9305bc7e87b945795cdd7725b8c4130dc84 SHA1 d00357fdc17b861721ae37474801fba87d1dc6a7 SHA256 790671f0af52b6c259869673a58dcaac9dee62dc57e4afd9807f61c0790f1dc5
 MD5 0aa7e069436908b95b80ded3a3178a4b metadata.xml 392
 RMD160 da59e9305bc7e87b945795cdd7725b8c4130dc84 metadata.xml 392
@@ -67,22 +57,16 @@ SHA256 790671f0af52b6c259869673a58dcaac9dee62dc57e4afd9807f61c0790f1dc5 metadata
 MD5 dc48de444cac0305323585a3b55cb359 files/digest-git-1.5.0.7 771
 RMD160 9d6355dc9876a80e62294620d7a60bd2614dbdca files/digest-git-1.5.0.7 771
 SHA256 e83d17bc0cecaec146675934ca0ee7f15d8996c16e587954dc9d6c627772581c files/digest-git-1.5.0.7 771
-MD5 8fef28f020c2339cfd39fb0d8787bc97 files/digest-git-1.5.1.2 771
-RMD160 5a83b7eaa433212099c4c019f26ff80de3d84fb4 files/digest-git-1.5.1.2 771
-SHA256 422de6b7613fb6c9c368344ed6aa566e9ce90b2ae3144a00fedff563be4629c9 files/digest-git-1.5.1.2 771
-MD5 ec7a764b3772a893a5ec1dc9655de6a5 files/digest-git-1.5.1.3 771
-RMD160 c2230959dfff21ae45cdd2d3ec4d9bac71f480e1 files/digest-git-1.5.1.3 771
-SHA256 9fc0f9f6393c969010cce84eb93594eba826988748306c9560616c21d8b63bce files/digest-git-1.5.1.3 771
-MD5 3d4e419b4f9b25eb15a9432129507227 files/digest-git-1.5.1.4 771
-RMD160 d4eef412db4c46688929b770d9d489dff023738b files/digest-git-1.5.1.4 771
-SHA256 949b115307a605a17042aba0afb36aedb906226508fab90da4625204d6922837 files/digest-git-1.5.1.4 771
-MD5 c29a1db2f8b1bffe9c5f94b0f67af598 files/digest-git-1.5.1.5 771
-RMD160 7ce806c481077825b03b6451842fac9357af6b66 files/digest-git-1.5.1.5 771
-SHA256 bc3ef3463cee51c033d125ca66008e23cfd6c5dade9d650995e4d2ad2685ee5f files/digest-git-1.5.1.5 771
+MD5 67e4f04dbe4f6061c043fe5a65a27b5b files/digest-git-1.5.1.6 771
+RMD160 e3b41e798284818bd741214a152f361426666ab9 files/digest-git-1.5.1.6 771
+SHA256 301643b4303f5c172513408004ef342288e1faa91aaef68d4ccdbae7ab8ff919 files/digest-git-1.5.1.6 771
+MD5 fc95dcbb33042e9903d05295e8391ccd files/digest-git-1.5.2 753
+RMD160 9b3265f51d11bc20aca1a047f09dec3e1741bfb1 files/digest-git-1.5.2 753
+SHA256 b23f701b5266db2abd4d519994c42e71f196b62b82c1be8baced52e96557bccf files/digest-git-1.5.2 753
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGTrF+ViELBEf1JB0RAvbVAJ9JO0yOADavbcPjRNs1ETH6QjAxywCeI4Qi
-DUDUjaKyEBqWkgd+gMzIcoY=
-=FTL8
+iD8DBQFGUE+RViELBEf1JB0RAmorAJ4yAjLxx44MFrsFymUaB2LCZFzz/QCfdFDn
+q0WmsnI5LVZQgA5f9BgUiL0=
+=FQdt
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.5.1.2 b/dev-util/git/files/digest-git-1.5.1.2
deleted file mode 100644
index 89b676fac021..000000000000
--- a/dev-util/git/files/digest-git-1.5.1.2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 d017c48085e07f24b8459f6f5fbaf918 git-1.5.1.2.tar.bz2 1120779
-RMD160 91019f417972162b2e14d1ddb607522390f68d75 git-1.5.1.2.tar.bz2 1120779
-SHA256 629a6bd89b226f20cc21c954bd695c91e284b664c05b7d66b706866112b7f628 git-1.5.1.2.tar.bz2 1120779
-MD5 5455264cec20da5d556707a6b7ec9f0f git-htmldocs-1.5.1.2.tar.bz2 471266
-RMD160 9c739f6b4d7e1ba79148d610e3fa0accf14e08a7 git-htmldocs-1.5.1.2.tar.bz2 471266
-SHA256 6ec2942ab5dd90db19324d39a3307f67a471dd41af6bb9749555f3c21aefd94b git-htmldocs-1.5.1.2.tar.bz2 471266
-MD5 64cd60f6ea1344def2b7ea00aee6e170 git-manpages-1.5.1.2.tar.bz2 132716
-RMD160 f835da9dcf54860eaabc3c861c9013ee9f717f6d git-manpages-1.5.1.2.tar.bz2 132716
-SHA256 bc5b6514c0bedfecc81ec7221a1e4bece967e0bed33aeaaa90a7c6823b541dec git-manpages-1.5.1.2.tar.bz2 132716
diff --git a/dev-util/git/files/digest-git-1.5.1.3 b/dev-util/git/files/digest-git-1.5.1.3
deleted file mode 100644
index 7d2619620dd6..000000000000
--- a/dev-util/git/files/digest-git-1.5.1.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 38eb5e41f0b20e601ea4a10b70553147 git-1.5.1.3.tar.bz2 1122617
-RMD160 2f1e7e9c0a9dd7745086d9da1478a8fd0be65de0 git-1.5.1.3.tar.bz2 1122617
-SHA256 876c0902e71a87bb59dae5224f094e484269f0f140dab62c2670878625da65d7 git-1.5.1.3.tar.bz2 1122617
-MD5 b49f3f3a77c15ab67d2189d6772cdb5a git-htmldocs-1.5.1.3.tar.bz2 474857
-RMD160 892f5e1f03bc23c617bfd00c88734f3b221f3f35 git-htmldocs-1.5.1.3.tar.bz2 474857
-SHA256 14156a2245c36bf6b68f98c715bcf4577a3b45daa2b10eae88d5a017e4baf5f2 git-htmldocs-1.5.1.3.tar.bz2 474857
-MD5 da2cd75092a454205cafdeddc3b1c319 git-manpages-1.5.1.3.tar.bz2 133667
-RMD160 ac64a5c16c35cf6feb86fa68361124e25f0186a5 git-manpages-1.5.1.3.tar.bz2 133667
-SHA256 7b21d618b3b14120cf0c3c3385fa572c4dc95d780b92166ccdc5503d2eef5879 git-manpages-1.5.1.3.tar.bz2 133667
diff --git a/dev-util/git/files/digest-git-1.5.1.4 b/dev-util/git/files/digest-git-1.5.1.4
deleted file mode 100644
index 614feae2734d..000000000000
--- a/dev-util/git/files/digest-git-1.5.1.4
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 ed4c3b6678bde5a4e09c2206430242df git-1.5.1.4.tar.bz2 1126258
-RMD160 dd8af6da7e8e99e229cf9798a71543136e0f1b35 git-1.5.1.4.tar.bz2 1126258
-SHA256 3d65197647592779c8932a44f6e390412492d350aa637af5d097ab46e429bbf0 git-1.5.1.4.tar.bz2 1126258
-MD5 c21bd3b274ba44864d10cf792a0dd6e5 git-htmldocs-1.5.1.4.tar.bz2 477746
-RMD160 d61eb662d07c0c9eab33f9502c4a29ccb9ee9cd2 git-htmldocs-1.5.1.4.tar.bz2 477746
-SHA256 27949fc878330bb29458ee56b7ac15efb0dbe64543a41b6010a528bac45cf596 git-htmldocs-1.5.1.4.tar.bz2 477746
-MD5 bba3d2716555307e8773a00ab2d16a56 git-manpages-1.5.1.4.tar.bz2 133741
-RMD160 cadc6c3be2e9878d91cd885303b900ac8433aaf5 git-manpages-1.5.1.4.tar.bz2 133741
-SHA256 51caf75f8d31c478f88801caa3094876f4f3cd663d24f99a5b91e7d1fe6088c7 git-manpages-1.5.1.4.tar.bz2 133741
diff --git a/dev-util/git/files/digest-git-1.5.1.5 b/dev-util/git/files/digest-git-1.5.1.5
deleted file mode 100644
index 240d48a32267..000000000000
--- a/dev-util/git/files/digest-git-1.5.1.5
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 138047b3ef4bc2da3f64ec514969e1d7 git-1.5.1.5.tar.bz2 1129538
-RMD160 2a1b44dae95c718c986c06e740e698a1e08c5fe1 git-1.5.1.5.tar.bz2 1129538
-SHA256 b2543e990219a88f3bf1004dc35c150b3db53c7a7b22951a4965090cf33acbd2 git-1.5.1.5.tar.bz2 1129538
-MD5 27c0a486f400f841daa499c8f8d0dcaf git-htmldocs-1.5.1.5.tar.bz2 485411
-RMD160 19fbca8a148e7b156a0442327a062119156717c7 git-htmldocs-1.5.1.5.tar.bz2 485411
-SHA256 a896bbaf323719db4998f92d474e2bae5de047218f989066f7ec6a7d2ab75cce git-htmldocs-1.5.1.5.tar.bz2 485411
-MD5 86a1c634214cfc88b2b6b5dbb70ef5cd git-manpages-1.5.1.5.tar.bz2 133906
-RMD160 2293b0468c1835db100ab3e47a0e346ecf0901a0 git-manpages-1.5.1.5.tar.bz2 133906
-SHA256 6d906c3945d8a739ec180315ecd07ef6857b372f04bb53cae4ea3ce8d6b592c8 git-manpages-1.5.1.5.tar.bz2 133906
diff --git a/dev-util/git/files/digest-git-1.5.1.6 b/dev-util/git/files/digest-git-1.5.1.6
new file mode 100644
index 000000000000..bdbb7b118f7d
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.1.6
@@ -0,0 +1,9 @@
+MD5 41b9e7855a633d45e201c05c20dac57d git-1.5.1.6.tar.bz2 1130713
+RMD160 20279c817da53d3bc6d5f58121bfe73e8a25e8a1 git-1.5.1.6.tar.bz2 1130713
+SHA256 4429ca98c0789b0f564cdbf76e8e8ad4db928b7c7ac94f116e4a0729e4253a21 git-1.5.1.6.tar.bz2 1130713
+MD5 051aec8a4ab1bcd9e12a85a68c1c2f05 git-htmldocs-1.5.1.6.tar.bz2 489138
+RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 git-htmldocs-1.5.1.6.tar.bz2 489138
+SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685 git-htmldocs-1.5.1.6.tar.bz2 489138
+MD5 1e1e8be037c6c685de1b804b85c86669 git-manpages-1.5.1.6.tar.bz2 133945
+RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 git-manpages-1.5.1.6.tar.bz2 133945
+SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d git-manpages-1.5.1.6.tar.bz2 133945
diff --git a/dev-util/git/files/digest-git-1.5.2 b/dev-util/git/files/digest-git-1.5.2
new file mode 100644
index 000000000000..1d404824d0a9
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.2
@@ -0,0 +1,9 @@
+MD5 79c749b720c29c024d948163fdc47dac git-1.5.2.tar.bz2 1180424
+RMD160 5e9064bdceadcac779112e8c677a6236de75ed7d git-1.5.2.tar.bz2 1180424
+SHA256 26e30a20a6ee659018a863f743803811535042454f1edad8727b375fefac6ff5 git-1.5.2.tar.bz2 1180424
+MD5 b2f0bab66212c61761c250b03f8e7222 git-htmldocs-1.5.2.tar.bz2 499796
+RMD160 bef6b3b51896019430039475662a046e69075917 git-htmldocs-1.5.2.tar.bz2 499796
+SHA256 8ba238a066a4ffde51dd1aaa04b8d9757d0b7ad3793a20289d9ddcf1d54368e2 git-htmldocs-1.5.2.tar.bz2 499796
+MD5 4ff6dc447e6336189a94add85e156aec git-manpages-1.5.2.tar.bz2 138905
+RMD160 90520407c8338eda4e9ab2ad573490b06acc01df git-manpages-1.5.2.tar.bz2 138905
+SHA256 5822714d1847a1d44f3d93286a60e45c375f521c07ce06794636afe187d0680b git-manpages-1.5.2.tar.bz2 138905
diff --git a/dev-util/git/files/git-1.5.2-tempfile.patch b/dev-util/git/files/git-1.5.2-tempfile.patch
new file mode 100644
index 000000000000..bd8ad085cbcf
--- /dev/null
+++ b/dev-util/git/files/git-1.5.2-tempfile.patch
@@ -0,0 +1,28 @@
+diff --git a/diff.c b/diff.c
+index 33297aa..b23e190 100644
+--- a/diff.c
++++ b/diff.c
+@@ -186,13 +186,11 @@ static const char *external_diff(void)
+ 	return external_diff_cmd;
+ }
+ 
+-#define TEMPFILE_PATH_LEN		50
+-
+ static struct diff_tempfile {
+ 	const char *name; /* filename external diff should read from */
+ 	char hex[41];
+ 	char mode[10];
+-	char tmp_path[TEMPFILE_PATH_LEN];
++	char tmp_path[PATH_MAX];
+ } diff_temp[2];
+ 
+ static int count_lines(const char *data, int size)
+@@ -1561,7 +1559,7 @@ static void prep_temp_blob(struct diff_tempfile *temp,
+ {
+ 	int fd;
+ 
+-	fd = git_mkstemp(temp->tmp_path, TEMPFILE_PATH_LEN, ".diff_XXXXXX");
++	fd = git_mkstemp(temp->tmp_path, PATH_MAX, ".diff_XXXXXX");
+ 	if (fd < 0)
+ 		die("unable to create temp-file");
+ 	if (write_in_full(fd, blob, size) != size)
diff --git a/dev-util/git/git-1.5.1.3.ebuild b/dev-util/git/git-1.5.1.3.ebuild
deleted file mode 100644
index 05b2813289dc..000000000000
--- a/dev-util/git/git-1.5.1.3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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.1.3.ebuild,v 1.1 2007/05/01 03:17:06 robbat2 Exp $
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker"
-HOMEPAGE="http://git.or.cz/"
-SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-		mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-		doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="curl doc elibc_uclibc emacs gtk mozsha1 perl ppcsha1 tk webdav"
-
-DEPEND="dev-libs/openssl
-		sys-libs/zlib
-		!app-misc/git
-		curl? ( net-misc/curl )
-		webdav? ( dev-libs/expat )
-		emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}
-		dev-lang/perl
-		perl? ( dev-perl/Error )
-		tk? ( dev-lang/tk )
-		gtk? ( >=dev-python/pygtk-2.6 )"
-
-S="${WORKDIR}/${MY_P}"
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use mozsha1 ; then
-		myopts="${myopts} MOZILLA_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts="${myopts} PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
-	else
-		myopts="${myopts} NO_CURL=YesPlease"
-		use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring."
-	fi
-
-	myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
-
-	use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
-
-	export MY_MAKEOPTS=${myopts}
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}"/${PN}-1.5.0-symlinks.patch
-
-	sed -i \
-		-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
-		-e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \
-		-e "s:^\(CC = \).*$:\1$(tc-getCC):" \
-		-e "s:^\(AR = \).*$:\1$(tc-getAR):" \
-		-e 's:ln :ln -s :g' \
-		Makefile || die "sed failed"
-
-	exportmakeopts
-}
-
-src_compile() {
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed"
-	fi
-}
-
-src_install() {
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || die "make install failed"
-
-	use tk || rm "${D}"/usr/bin/gitk
-
-	doman "${WORKDIR}"/man?/*
-
-	dodoc README COPYING Documentation/SubmittingPatches
-	if use doc ; then
-		dodoc Documentation/technical/*
-		dodir /usr/share/doc/${PF}/html
-		cp -r "${WORKDIR}"/{*.html,howto} "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-	if use emacs ; then
-		insinto "${SITELISP}"
-		doins contrib/emacs/{,vc-}git.el*
-		elisp-site-file-install "${FILESDIR}"/70git-gentoo.el
-	fi
-
-	if use gtk ; then
-		dobin contrib/gitview/gitview
-		use doc && dodoc contrib/gitview/gitview.txt
-	fi
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-
-	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-	fixlocalpod
-}
-
-src_test() {
-	cd "${S}"
-	has_version dev-util/subversion || \
-		MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease"
-	has_version app-arch/unzip || \
-		rm "${S}"/t/t5000-tar-tree.sh
-	# Stupid CVS won't let some people commit as root
-	rm "${S}"/t/t9200-git-cvsexportcommit.sh
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-archimport "dev-util/tla"
-	showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1"
-	showpkgdeps git-svnimport "dev-util/subversion(USE=perl)"
-	showpkgdeps git-svn "dev-util/subversion(USE=perl)" "dev-perl/libwww-perl"
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )"
-	showpkgdeps git-send-email "USE=perl"
-	showpkgdeps git-remote "USE=perl"
-	echo
-}
-
-pkg_postrm() {
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.5.1.4.ebuild b/dev-util/git/git-1.5.1.4.ebuild
deleted file mode 100644
index 0e6ea2014886..000000000000
--- a/dev-util/git/git-1.5.1.4.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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.1.4.ebuild,v 1.1 2007/05/09 08:40:02 robbat2 Exp $
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker"
-HOMEPAGE="http://git.or.cz/"
-SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
-		mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
-		doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="curl doc elibc_uclibc emacs gtk mozsha1 perl ppcsha1 tk webdav"
-
-DEPEND="dev-libs/openssl
-		sys-libs/zlib
-		!app-misc/git
-		curl? ( net-misc/curl )
-		webdav? ( dev-libs/expat )
-		emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}
-		dev-lang/perl
-		perl? ( dev-perl/Error )
-		tk? ( dev-lang/tk )
-		gtk? ( >=dev-python/pygtk-2.6 )"
-
-S="${WORKDIR}/${MY_P}"
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use mozsha1 ; then
-		myopts="${myopts} MOZILLA_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts="${myopts} PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
-	else
-		myopts="${myopts} NO_CURL=YesPlease"
-		use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring."
-	fi
-
-	myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
-
-	use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
-
-	export MY_MAKEOPTS=${myopts}
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}"/${PN}-1.5.0-symlinks.patch
-
-	sed -i \
-		-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
-		-e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \
-		-e "s:^\(CC = \).*$:\1$(tc-getCC):" \
-		-e "s:^\(AR = \).*$:\1$(tc-getAR):" \
-		-e 's:ln :ln -s :g' \
-		Makefile || die "sed failed"
-
-	exportmakeopts
-}
-
-src_compile() {
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed"
-	fi
-}
-
-src_install() {
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || die "make install failed"
-
-	use tk || rm "${D}"/usr/bin/gitk
-
-	doman "${WORKDIR}"/man?/*
-
-	dodoc README COPYING Documentation/SubmittingPatches
-	if use doc ; then
-		dodoc Documentation/technical/*
-		dodir /usr/share/doc/${PF}/html
-		cp -r "${WORKDIR}"/{*.html,howto} "${D}"/usr/share/doc/${PF}/html
-	fi
-
-	dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-	if use emacs ; then
-		insinto "${SITELISP}"
-		doins contrib/emacs/{,vc-}git.el*
-		elisp-site-file-install "${FILESDIR}"/70git-gentoo.el
-	fi
-
-	if use gtk ; then
-		dobin contrib/gitview/gitview
-		use doc && dodoc contrib/gitview/gitview.txt
-	fi
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-
-	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
-	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-
-	fixlocalpod
-}
-
-src_test() {
-	cd "${S}"
-	has_version dev-util/subversion || \
-		MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease"
-	has_version app-arch/unzip || \
-		rm "${S}"/t/t5000-tar-tree.sh
-	# Stupid CVS won't let some people commit as root
-	rm "${S}"/t/t9200-git-cvsexportcommit.sh
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-archimport "dev-util/tla"
-	showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1"
-	showpkgdeps git-svnimport "dev-util/subversion(USE=perl)"
-	showpkgdeps git-svn "dev-util/subversion(USE=perl)" "dev-perl/libwww-perl"
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )"
-	showpkgdeps git-send-email "USE=perl"
-	showpkgdeps git-remote "USE=perl"
-	echo
-}
-
-pkg_postrm() {
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.5.1.5.ebuild b/dev-util/git/git-1.5.1.6.ebuild
index 46469b30b116..66c8cebd5d97 100644
--- a/dev-util/git/git-1.5.1.5.ebuild
+++ b/dev-util/git/git-1.5.1.6.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.1.5.ebuild,v 1.1 2007/05/19 08:12:33 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.1.6.ebuild,v 1.1 2007/05/20 13:39:17 ferdy Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
diff --git a/dev-util/git/git-1.5.1.2.ebuild b/dev-util/git/git-1.5.2.ebuild
index 9bb9605339a2..25f496117f22 100644
--- a/dev-util/git/git-1.5.1.2.ebuild
+++ b/dev-util/git/git-1.5.2.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.1.2.ebuild,v 1.1 2007/04/23 18:53:42 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.2.ebuild,v 1.1 2007/05/20 13:39:17 ferdy Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}
 		dev-lang/perl
 		perl? ( dev-perl/Error )
 		tk? ( dev-lang/tk )
-		gtk? ( >=dev-python/pygtk-2.6 )"
+		gtk? ( >=dev-python/pygtk-2.8 )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -70,6 +70,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch "${FILESDIR}"/${PN}-1.5.0-symlinks.patch
+	epatch "${FILESDIR}"/${P}-tempfile.patch
 
 	sed -i \
 		-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \