Version bump. Fix some bugs and style nits. Remove unneeded verbosity. Remove unused versions.

Package-Manager: portage-2.1.3.19
author: Fernando J. Pereda <ferdy@gentoo.org> 2008-01-10 11:51:49 +0000
committer: Fernando J. Pereda <ferdy@gentoo.org> 2008-01-10 11:51:49 +0000
commit: 97998b8c13b0a13cedc72d3cf5e8d24599ad2ce5 (patch)
tree: 60ce967981a32ec6f987c17785ee009db012bbe3 /dev-util
parent: Stable on sparc (diff)
download: historical-97998b8c13b0a13cedc72d3cf5e8d24599ad2ce5.tar.gz
historical-97998b8c13b0a13cedc72d3cf5e8d24599ad2ce5.tar.bz2
historical-97998b8c13b0a13cedc72d3cf5e8d24599ad2ce5.zip
25 files changed, 85 insertions, 1861 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 39ff2aab243f..bbd9c23c91a8 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.247 2008/01/01 19:51:52 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.248 2008/01/10 11:51:48 ferdy Exp $
+
+*git-1.5.3.8 (10 Jan 2008)
+
+  10 Jan 2008; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/git-1.5.3.8-t9106.patch, -git-1.5.3.2.ebuild, -git-1.5.3.3.ebuild,
+  -git-1.5.3.4.ebuild, -git-1.5.3.4-r1.ebuild, -git-1.5.3.5.ebuild,
+  -git-1.5.3.6.ebuild, -git-1.5.3.6-r1.ebuild, -git-1.5.3.7.ebuild,
+  +git-1.5.3.8.ebuild, -git-1.5.4_rc0.ebuild, -git-1.5.4_rc1.ebuild,
+  git-1.5.4_rc2.ebuild:
+  Version bump. Fix some bugs and style nits. Remove unneeded verbosity.
+  Remove unused versions.
 
 *git-1.5.4_rc2 (01 Jan 2008)
 
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index a749191af5e6..b845f97d8509 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -21,6 +21,10 @@ AUX git-1.5.3-symlinks.patch 645 RMD160 24fc6002042e67611f337cae3867bb400fd8c7d6
 MD5 cae1a7f7e4d1bf7095d2b88616a0a4b5 files/git-1.5.3-symlinks.patch 645
 RMD160 24fc6002042e67611f337cae3867bb400fd8c7d6 files/git-1.5.3-symlinks.patch 645
 SHA256 dc8786302f5806eff376f3d1921c85d4907fda0318aa20c2c4a73ca8aea58340 files/git-1.5.3-symlinks.patch 645
+AUX git-1.5.3.8-t9106.patch 897 RMD160 5651dc89e42066b91e525dcbc367f42fa4db79a4 SHA1 e306f87501e98caf587d1e6a86ceef7b9e35139e SHA256 ede8da4f5eb3b9f4824b8db1cdb4d4bd9a1d854ca0676241c2509856dbd49f98
+MD5 7ef4e8d7debe3a2faa8d19019cd0ddc9 files/git-1.5.3.8-t9106.patch 897
+RMD160 5651dc89e42066b91e525dcbc367f42fa4db79a4 files/git-1.5.3.8-t9106.patch 897
+SHA256 ede8da4f5eb3b9f4824b8db1cdb4d4bd9a1d854ca0676241c2509856dbd49f98 files/git-1.5.3.8-t9106.patch 897
 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
@@ -35,36 +39,18 @@ RMD160 9c1abde72ac5064e1fc86afd29c2a74079db91a4 files/git-daemon.xinetd 260
 SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a files/git-daemon.xinetd 260
 DIST git-1.5.1.6.tar.bz2 1130713 RMD160 20279c817da53d3bc6d5f58121bfe73e8a25e8a1 SHA1 c1e34ce6a6a9a81bb16f158ef84b4576e6be1b0c SHA256 4429ca98c0789b0f564cdbf76e8e8ad4db928b7c7ac94f116e4a0729e4253a21
 DIST git-1.5.2.5.tar.bz2 1192416 RMD160 e4d7165521e1fbe35feab48bbf54ca08ffe571b5 SHA1 5c145b98dbd7b8695e8dcc18ca661454775c869b SHA256 b0b8016a77ed2ef1ab33cf5b82d960025bdbaaf9142c2fb0a01558e8ad017fb9
-DIST git-1.5.3.2.tar.bz2 1344171 RMD160 ef5436d8e95080415dc968c45b2e8f480a1d66c7 SHA1 7e28fd6b0cc2c9c4e6afc9b2dc79c4f804db86f3 SHA256 e39b5492f3982a4f935e48294c775ddd0e63fdd2ba75b675f882479d29329d45
-DIST git-1.5.3.3.tar.bz2 1347290 RMD160 d47a9adc4069b26888fe7ddd63b4e45d272ca49e SHA1 59f5630db147e0a8fdde3604daf280bde68900cd SHA256 e064142312d340feb6b09426e5c7ee4ec15ff3404350ed3275f159bbe5826ea6
-DIST git-1.5.3.4.tar.bz2 1349196 RMD160 739153affbb5e5372bf5ccd8ea502bf3b6126903 SHA1 f2dfad11c396d4e06c4d1a34cb09b47e86faf2b0 SHA256 3f2954c68cc6463924a0af7ccb684db0332e3db31258e993830521532a7aa764
-DIST git-1.5.3.5.tar.bz2 1351433 RMD160 188cdbf40fe841cd5a59f8f11a621a135a61f406 SHA1 2e48624e88400637c7063225c23d5e2ecdfe6ced SHA256 92abf9ccaf3e32d8fcf92a32a0308db21fa6ca9f7e9d6b63a1ba7e5e841e6629
-DIST git-1.5.3.6.tar.bz2 1356739 RMD160 dbda09ada993a9835f9f403d7fa5c54ed3598b46 SHA1 35f2df92046996a3b72a708e9408eb4d6d4d0e6f SHA256 95a5f9d8a9174277b539296901561fff6dbbba20dbdd4cfe5595c22a5a4d2221
 DIST git-1.5.3.7.tar.bz2 1361540 RMD160 74bfccd50c895e22d10b9e25f481f00a20617077 SHA1 95c3b64d34f28db8122e30f28dc5758ebbc8469b SHA256 f4f03dd1a5255019c2d771a04b8a647509b4c6cf51728acc50e8f26d99e62fec
-DIST git-1.5.4.rc0.tar.bz2 1539299 RMD160 5bd261e7b1bd312e6e7b55674c5cb9e22678c127 SHA1 daea8267ffd6cd1f4003809949d327d6fc1a4100 SHA256 d1d952e06f8112c0b217cde3a9bbb9352b116d2002fec1b71e9c61e30a2ea7c8
-DIST git-1.5.4.rc1.tar.bz2 1548134 RMD160 a0d64bd1f8981922be35ecc0350879af587ffe3b SHA1 bd41a8d1af5d9667501e558cabccea3ca4c99713 SHA256 4f1c45574a16bd66fcfa370c5f7acc0e2fd20217fd200ad55371071c3c8038a8
+DIST git-1.5.3.8.tar.bz2 1363259 RMD160 8e35e67cc94152c681849e14cb4aec86f1b316cf SHA1 acca91988e674c5976e15a290be65f2775296162 SHA256 f98c6b900c9f3b87a1fbbe0c5f466e9d981cb9f1d193066b6d371df4b8066b77
 DIST git-1.5.4.rc2.tar.bz2 1550103 RMD160 96b857d72d10287366a634a63294caa336850c6d SHA1 7ccae071e31aa43a0ae3ed562664f2ef69312d93 SHA256 48f86c8be2f5315b7a178f74a0d01a120be5119eeeee465fd7ef60c1740d6014
 DIST git-htmldocs-1.5.1.6.tar.bz2 489138 RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 SHA1 907749b4eba99c696589be750bc9432b9818954b SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685
 DIST git-htmldocs-1.5.2.5.tar.bz2 505906 RMD160 000a0c5226866812766fc3c45bcafbc5fe35fb9a SHA1 974a1317078dc5159ef1eafb3937d3c651b4efbc SHA256 74f154b3d8f6dfc6582702f37197a37fd0f498f1ea7ef030d5ea0c999e8f9532
-DIST git-htmldocs-1.5.3.2.tar.bz2 537124 RMD160 e2d0423ab2eaa11fbb61365445ace3d1427c76dc SHA1 f60ff1733938ae110a01bee0fd8daccfd2cf897c SHA256 c424e7b43d753b50e07e836d569233a545eacae5485b7dc562b492676db516c6
-DIST git-htmldocs-1.5.3.3.tar.bz2 541175 RMD160 02e26a8f1a84fdff3808285fada3a49dbff1af85 SHA1 ac185fdfc7af459f104de426b5b977c5749b177b SHA256 ad86390dfef6c44ab777bd2d7394770aa12008c7f1f9e1d1368b2f7b17fc24bc
-DIST git-htmldocs-1.5.3.4.tar.bz2 542116 RMD160 3a899140806b02413661cc5bad9e23c7ce683bfd SHA1 008adec5416b3f96aee87ad2572af06dd7773b24 SHA256 1be968219cdac1ce6035bf81d42e24973ca6d4841f5d1775e6adebb52d44bbf8
-DIST git-htmldocs-1.5.3.5.tar.bz2 542940 RMD160 3597521cee89eb538db7ead2c49108522c9f674e SHA1 3eb1d6f7ad5385a4e6b25ad0f3ef9fb545d6d291 SHA256 0e7d9a59930a08c644fdf37deca1f36d36fe5cfb559f4bea38901bec6094e45b
-DIST git-htmldocs-1.5.3.6.tar.bz2 545021 RMD160 4174428f3d37d3c32776137390bb46d3667a47a9 SHA1 6539d9481e5e53400d8c9f8ad89ccde5f0deb340 SHA256 893b72beed877cca84de11f941807441685666016994bf83cbd28cf07b8144c9
 DIST git-htmldocs-1.5.3.7.tar.bz2 549391 RMD160 18d01c803fd529ac897ae249ce4e05193ee9850a SHA1 926fb29604d69ce45ecf7b57d1b8feeb6c356f9b SHA256 e28c7e149e0f5adb66093af287dffe0caef83926ae08c6cdb6a2d35bc9148d04
-DIST git-htmldocs-1.5.4.rc0.tar.bz2 571372 RMD160 7da3cdce5aeccf8e423ac9141c025409944f151f SHA1 f2c0a2fcaca63da298d06551349f975ef534aa2b SHA256 2248d40a2acdb85fed5355ab135a98a6ab658c4f73511fc347aa0a6a1656614f
-DIST git-htmldocs-1.5.4.rc1.tar.bz2 600054 RMD160 6c0570d9a4d81a61445c795247758d84d451b947 SHA1 c309024457cfd22530f7b63d727da902ddc787f3 SHA256 66aad13fc1768a2b57dd76100535d997d58f3731159d6cb568d7bd4b6887b107
+DIST git-htmldocs-1.5.3.8.tar.bz2 549444 RMD160 f4df777094158beea16bd2f0783ef846198e2c36 SHA1 d822887c45437daebf08c7cfe6e93a4ce5136fd3 SHA256 200a7231d6a594aeb5cb0c0e1cf25513c086f53b84170c7c5376199b2659b874
 DIST git-htmldocs-1.5.4.rc2.tar.bz2 603097 RMD160 b530069db8852d78a373c5eb1874ac189f624502 SHA1 ff76bc79172ef3bc2d4ade7f16389ca132f0e36c SHA256 03516a441af5f0881a1064e44acf3638a083a23c650b13ba24036facd5b8b712
 DIST git-manpages-1.5.1.6.tar.bz2 133945 RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 SHA1 f4eeb116aaeeabf329c9de8d49421af42e4a6f51 SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d
 DIST git-manpages-1.5.2.5.tar.bz2 139885 RMD160 6c5e3b1bdf22638adcd914349d307a1934ec8c22 SHA1 47a2f330581c9e4dcb5e8c25d7508c5e8d7d7997 SHA256 c793bc76451cee39b92d173d33e6e33f2b74c8b6b9ac74ecd23031d236722fc4
-DIST git-manpages-1.5.3.2.tar.bz2 147283 RMD160 9d8d9ae79f50b838f22a82ed71ee831ebc83ce98 SHA1 26fd2eedd5803afdf7ccc5bedd31306eea05d95e SHA256 b6c6c444e8c1a7f4d5b3a1307739f583cf90e58f4ddfb8156005958f087e904f
-DIST git-manpages-1.5.3.3.tar.bz2 147278 RMD160 3f8c51922b01aeb9aa518c86611b528a8d389868 SHA1 df14dd849c3f4d00170a207f2fa087c9a765291f SHA256 fe57dc04e6e9c7ea3e6b28d04c355740b73639aa880d6b1dd64c71d009942410
-DIST git-manpages-1.5.3.4.tar.bz2 147392 RMD160 49acd94b911b61b2581539985fad6723c56282e1 SHA1 2701e152773df821f3e334ab3b7f4562237fe84f SHA256 08861a12a0abb37e9156f5942154fe103db3232dc70e980152b61c197dcbce96
-DIST git-manpages-1.5.3.5.tar.bz2 147502 RMD160 9ee059e372c7dc6660de5c77d27b5e559bb47018 SHA1 492024f5736132d7c96e3ff1c7af359924696312 SHA256 e75de44c08f7dc2026d38c62855ff0895cbe640785042f89918e6f0475da5f51
-DIST git-manpages-1.5.3.6.tar.bz2 147732 RMD160 4080488cd65b82b2459b373c3d8eb6d3024b24e9 SHA1 0db0722b5da956db18c2639fd710c72bf5916fd9 SHA256 ec03a96deb343267d34801bb20f18d296c693da19280910cf3e68f5acc89de07
 DIST git-manpages-1.5.3.7.tar.bz2 147932 RMD160 fd4b45c221cbc63f580a32595c59eb52da1baa2f SHA1 7cc45f156298d0fbd4ead4a9b2096ed2143287b8 SHA256 870e68ef57f4175152b9b8decc721d8cbc9850ed8eda73919fc9e060f3968ffa
-DIST git-manpages-1.5.4.rc0.tar.bz2 153501 RMD160 746e9e0d09ad462ab6c3684032bfb09629ed10dd SHA1 fbc771fa552746d337fe71084b30dcb3c1833f18 SHA256 ad184fdf2e430610cb60562bc9b302cf2c9cc6c2edfcfa2a4dfcaed5df98c376
-DIST git-manpages-1.5.4.rc1.tar.bz2 153363 RMD160 b754f0c74bf0059e0811eea2b41d6a88f73a279f SHA1 486d17465451c54b730f875c89408d8045840e76 SHA256 2121a9c28214f4285e4004c321fa6b2a50a13e3a281def775eda978b192f58cd
+DIST git-manpages-1.5.3.8.tar.bz2 147875 RMD160 c2a15b7a0742f14a70d0bf06d4d14fe9cf2b329b SHA1 15b9ece73c28897affb5da187835d19ff20e9962 SHA256 73a7cc2c0473694d454a6b7cb311ccdeb82f350bc8e652229d361592ea0a482f
 DIST git-manpages-1.5.4.rc2.tar.bz2 154985 RMD160 4c3d8eb5e907a56c6a3f6f8eafc247ab3201bd6e SHA1 42634edd7dbb66b060a10be7e2e51541575216d2 SHA256 6e4bcdb992c710ac2b6b698a68cca2ada050db85979fb31e59015c0718686c39
 EBUILD git-1.5.1.6.ebuild 4399 RMD160 6ffd38687bfca4241034a3047d24c1794829b34d SHA1 7561cdb0a648991103fc6cc89c4583c0218caa18 SHA256 3dd2ba27e7e85fb08e5f81a6752c83a30b1624fcaa2070bd93d8feae027bfe4e
 MD5 1e901aac703feaa5c47587dbbe31d717 git-1.5.1.6.ebuild 4399
@@ -74,58 +60,22 @@ EBUILD git-1.5.2.5.ebuild 4391 RMD160 80d62714d8b2bd98340354ecc014494c08486d6a S
 MD5 dda61b03bb082ed6e69f37bd9178c208 git-1.5.2.5.ebuild 4391
 RMD160 80d62714d8b2bd98340354ecc014494c08486d6a git-1.5.2.5.ebuild 4391
 SHA256 9bd0d59242fb292b716e737edd31b85eaaaa37aa0b95c2abb97ff000b1bbe173 git-1.5.2.5.ebuild 4391
-EBUILD git-1.5.3.2.ebuild 4413 RMD160 a2e93dcdb7acdf85c25837f575f7c83b193c0243 SHA1 531b7196c790d1f2aacdfb2801894dcb20b834e2 SHA256 053eaa8272e6db988d239637b4445443f54c2e489d0294af15e38ace03389960
-MD5 0ce6c7a8ae4c853fff6f9cb27f3b5f32 git-1.5.3.2.ebuild 4413
-RMD160 a2e93dcdb7acdf85c25837f575f7c83b193c0243 git-1.5.3.2.ebuild 4413
-SHA256 053eaa8272e6db988d239637b4445443f54c2e489d0294af15e38ace03389960 git-1.5.3.2.ebuild 4413
-EBUILD git-1.5.3.3.ebuild 4413 RMD160 acc570eaa26b2c7d3bcfffb2b3d0800c45e97477 SHA1 9d88c6bee16cb19c304b507a6678f1b74bc3b806 SHA256 049e0334a3d458d65b93cd0a5d6a0073d0c38dc4ec6f5318f33f56e8993a3c6b
-MD5 44928872562b1b21b2505531305f8f47 git-1.5.3.3.ebuild 4413
-RMD160 acc570eaa26b2c7d3bcfffb2b3d0800c45e97477 git-1.5.3.3.ebuild 4413
-SHA256 049e0334a3d458d65b93cd0a5d6a0073d0c38dc4ec6f5318f33f56e8993a3c6b git-1.5.3.3.ebuild 4413
-EBUILD git-1.5.3.4-r1.ebuild 4889 RMD160 8d6d453f063ea8d8271e4b4bde9df569965c76e4 SHA1 77216c5b7c77f0fbeee0153d07badd3e97e9624c SHA256 58a0a0f9a5d182001362454295b64592ca4da5ed40de1c53d213a26bdae037a6
-MD5 d69a4a0cfabcc3ee6232dd8ba7109545 git-1.5.3.4-r1.ebuild 4889
-RMD160 8d6d453f063ea8d8271e4b4bde9df569965c76e4 git-1.5.3.4-r1.ebuild 4889
-SHA256 58a0a0f9a5d182001362454295b64592ca4da5ed40de1c53d213a26bdae037a6 git-1.5.3.4-r1.ebuild 4889
-EBUILD git-1.5.3.4.ebuild 4729 RMD160 20b4563aafb7e912f3867c84781bf57cb0feb686 SHA1 47baafdd8452c766bdf89ec3fba4e60b85965356 SHA256 391aa1cca3c5836470fffeddcef8298f7d39e28ac91db4d62d9ac02511f7d4d7
-MD5 16c8a14332d80bca435c6b1a5d366e71 git-1.5.3.4.ebuild 4729
-RMD160 20b4563aafb7e912f3867c84781bf57cb0feb686 git-1.5.3.4.ebuild 4729
-SHA256 391aa1cca3c5836470fffeddcef8298f7d39e28ac91db4d62d9ac02511f7d4d7 git-1.5.3.4.ebuild 4729
-EBUILD git-1.5.3.5.ebuild 4886 RMD160 7a0d9cbb78c5d1cf7c6e573fa670837083eb2990 SHA1 5b71167da9230da7c01baa88aac46c6f80a5c21a SHA256 a32c40d8d76e8bf4e7294b779ffc932df33995a64e9157fe9674276f2a6a7b1e
-MD5 f03d3b90b0d9f1a0b4f57ad6c36f465b git-1.5.3.5.ebuild 4886
-RMD160 7a0d9cbb78c5d1cf7c6e573fa670837083eb2990 git-1.5.3.5.ebuild 4886
-SHA256 a32c40d8d76e8bf4e7294b779ffc932df33995a64e9157fe9674276f2a6a7b1e git-1.5.3.5.ebuild 4886
-EBUILD git-1.5.3.6-r1.ebuild 5329 RMD160 dee1b74ade9c3f962d48a1ce760486d057506641 SHA1 33aa7fc29ee679673c9e4a970df6b559c031b914 SHA256 330730d206d0b5a26027b81028b853f47741e815d27cd6944d7409016f2bea0d
-MD5 11dd7cffcb46a101bbf21bd6db08c949 git-1.5.3.6-r1.ebuild 5329
-RMD160 dee1b74ade9c3f962d48a1ce760486d057506641 git-1.5.3.6-r1.ebuild 5329
-SHA256 330730d206d0b5a26027b81028b853f47741e815d27cd6944d7409016f2bea0d git-1.5.3.6-r1.ebuild 5329
-EBUILD git-1.5.3.6.ebuild 4886 RMD160 3040e1749ee59fa5e45c3f8207920993e99a25e9 SHA1 3999893556cef2a2a26ea52ed3dbb1158e89526d SHA256 22d7677645a2127bdb545ef0ff454d05996a2ff6cfd7626f663c236f540a7673
-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 6325 RMD160 a323cac529d12d715563a242ecbb33f2ee7f709f SHA1 8ac1ab9dcc7f03ae8f712c0dad8ac5395828432c SHA256 b6044b01d5e506c02c797af17f5853988cda6a59614364faddb051dd21493195
 MD5 562c0f104a7eb68cfc72d5bca6a132da git-1.5.3.7-r1.ebuild 6325
 RMD160 a323cac529d12d715563a242ecbb33f2ee7f709f git-1.5.3.7-r1.ebuild 6325
 SHA256 b6044b01d5e506c02c797af17f5853988cda6a59614364faddb051dd21493195 git-1.5.3.7-r1.ebuild 6325
-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 6579 RMD160 3eea31759b006acc962f8c51e39ca9ba9ff860fb SHA1 fbd61e7cf4838688a26056c006882f466e324d73 SHA256 a23563d52fef8d84bd3e69f8735a4ac6279087f7af8138a17098d7bc5ea823fb
-MD5 4e927362deb331cbdd0b375e2dff6aaa git-1.5.4_rc0.ebuild 6579
-RMD160 3eea31759b006acc962f8c51e39ca9ba9ff860fb git-1.5.4_rc0.ebuild 6579
-SHA256 a23563d52fef8d84bd3e69f8735a4ac6279087f7af8138a17098d7bc5ea823fb git-1.5.4_rc0.ebuild 6579
-EBUILD git-1.5.4_rc1.ebuild 6588 RMD160 b6d1b0cf7a65edbd50bc82d28540da65320a6fff SHA1 ed91a440289fa23740ce5c320b90a82b4cf2c1d8 SHA256 f9aa15665aa5a2408c410ddd50953cb59933399de9798f9bdfc0227c3cdbdbad
-MD5 ee91e4e2a12ff09dfdb726671417a78f git-1.5.4_rc1.ebuild 6588
-RMD160 b6d1b0cf7a65edbd50bc82d28540da65320a6fff git-1.5.4_rc1.ebuild 6588
-SHA256 f9aa15665aa5a2408c410ddd50953cb59933399de9798f9bdfc0227c3cdbdbad git-1.5.4_rc1.ebuild 6588
-EBUILD git-1.5.4_rc2.ebuild 6577 RMD160 d1dd122eb586d9f33d883e42aa2819f31842485b SHA1 e933cb21879984bef5b8dc8eb38e7210446f4197 SHA256 59efe6e6d078d4a28e1a680c8e48a92dceacc31a0b82b3931566dd5a7e9feab9
-MD5 3de7bebc63d10a57c9ab83ff891641fe git-1.5.4_rc2.ebuild 6577
-RMD160 d1dd122eb586d9f33d883e42aa2819f31842485b git-1.5.4_rc2.ebuild 6577
-SHA256 59efe6e6d078d4a28e1a680c8e48a92dceacc31a0b82b3931566dd5a7e9feab9 git-1.5.4_rc2.ebuild 6577
-MISC ChangeLog 35767 RMD160 8bc4d9138d15000b258375d0fbec0535cbe42804 SHA1 f6e7d8a56dd081cab31e5e9c712be33b4b4d1ae2 SHA256 31b7989b2520ab615e3529ac1d4b56146f498ea8358eb6515e105b6c9187e6cc
-MD5 4471606f9da7ea0df8abe1a28c6fd05d ChangeLog 35767
-RMD160 8bc4d9138d15000b258375d0fbec0535cbe42804 ChangeLog 35767
-SHA256 31b7989b2520ab615e3529ac1d4b56146f498ea8358eb6515e105b6c9187e6cc ChangeLog 35767
+EBUILD git-1.5.3.8.ebuild 6301 RMD160 b652facce8c88d73b11036a2a1cb0c083dd7344b SHA1 d197b2705bdb15e6cbd85775479f7b9f43aa1e07 SHA256 2357c7a36d3fb178717bd397294b52d1b0ac722e61fcd351dfed553af106910c
+MD5 22027da1f287dac4370fdc8e605d49d6 git-1.5.3.8.ebuild 6301
+RMD160 b652facce8c88d73b11036a2a1cb0c083dd7344b git-1.5.3.8.ebuild 6301
+SHA256 2357c7a36d3fb178717bd397294b52d1b0ac722e61fcd351dfed553af106910c git-1.5.3.8.ebuild 6301
+EBUILD git-1.5.4_rc2.ebuild 6522 RMD160 6b303428d7caeece9a6fffabb5d9e445f5ac90e9 SHA1 33ca586b3d0f74b8ad0e7886cd8bdf8acdbde9dd SHA256 d2b2eeb6ec2241a65af8329e944ac582f978bac3f812efe13164dc90bd9dc8f9
+MD5 4305be9cc311ad946b72dc341d29c886 git-1.5.4_rc2.ebuild 6522
+RMD160 6b303428d7caeece9a6fffabb5d9e445f5ac90e9 git-1.5.4_rc2.ebuild 6522
+SHA256 d2b2eeb6ec2241a65af8329e944ac582f978bac3f812efe13164dc90bd9dc8f9 git-1.5.4_rc2.ebuild 6522
+MISC ChangeLog 36253 RMD160 4e1de22ca457db08e40d7256d310a79278403cff SHA1 6bae5a174b09c3d2f34315a0991fdb0a4b9a69ac SHA256 1563ecb97b842771437872424be81c62529c774f2dc632b50e24f705e4c5d9d3
+MD5 f04a3baac72c438fb2f4734dbc760c65 ChangeLog 36253
+RMD160 4e1de22ca457db08e40d7256d310a79278403cff ChangeLog 36253
+SHA256 1563ecb97b842771437872424be81c62529c774f2dc632b50e24f705e4c5d9d3 ChangeLog 36253
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
 MD5 c205afae129e41ba63cf04be7f56c7ab metadata.xml 1029
 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 metadata.xml 1029
@@ -136,46 +86,19 @@ SHA256 301643b4303f5c172513408004ef342288e1faa91aaef68d4ccdbae7ab8ff919 files/di
 MD5 64276a745b68cfa7123ecba383657cde files/digest-git-1.5.2.5 771
 RMD160 554d48bbc7c2e10ee8c64f31046cfe8a8251c708 files/digest-git-1.5.2.5 771
 SHA256 90cff61fb313217b7cc600adb70c46789882d898f1ddd8e378e54ae7dc3bdae7 files/digest-git-1.5.2.5 771
-MD5 dc55082a57dd68127735b0bbad6e10ec files/digest-git-1.5.3.2 771
-RMD160 eadd468c29b62ee34683b7feaff9056988d556a1 files/digest-git-1.5.3.2 771
-SHA256 6fc2d60518112a009528d040478ab64a2441c52dd2412b3dd308185f5ac8501b files/digest-git-1.5.3.2 771
-MD5 a33cbd611b6eac99c6d48f7e9f5f4ddf files/digest-git-1.5.3.3 771
-RMD160 6f43c135e124038245d0ff19139c1e6129c8dff6 files/digest-git-1.5.3.3 771
-SHA256 fdc6cb8052b3b33a382383c4b57099edecad881653b7e62379f8d5c4bf94b6ed files/digest-git-1.5.3.3 771
-MD5 eb6e09309e913a90581f516b62c5c58e files/digest-git-1.5.3.4 771
-RMD160 6137903269de1d64e6aa9141ecc2f74331bd5e6f files/digest-git-1.5.3.4 771
-SHA256 dd8f0ddae692ce8ce4a5299cf93b1c0bc965873ae8b51cd5651954f4b49253de files/digest-git-1.5.3.4 771
-MD5 eb6e09309e913a90581f516b62c5c58e files/digest-git-1.5.3.4-r1 771
-RMD160 6137903269de1d64e6aa9141ecc2f74331bd5e6f files/digest-git-1.5.3.4-r1 771
-SHA256 dd8f0ddae692ce8ce4a5299cf93b1c0bc965873ae8b51cd5651954f4b49253de files/digest-git-1.5.3.4-r1 771
-MD5 22ba0bc78009adc3b12e6ea1553b5442 files/digest-git-1.5.3.5 771
-RMD160 e15c99675a54ea5cbffb3d67e3b88c00c61b54f3 files/digest-git-1.5.3.5 771
-SHA256 c89f8ffb9718b262a537f810b70edf3274136fd3ceb0e93fe4068acd03d8c8ab files/digest-git-1.5.3.5 771
-MD5 8468dcf87c9077e2d1a4bcf0ca8aa817 files/digest-git-1.5.3.6 771
-RMD160 e0e65df9fb77c7b8499b5ffea80db0d3a280c34c files/digest-git-1.5.3.6 771
-SHA256 e273c5d3c6c88334e5f627b9e340e9f8f743c7f4ebbdb04d13ee9d375793d02f files/digest-git-1.5.3.6 771
-MD5 8468dcf87c9077e2d1a4bcf0ca8aa817 files/digest-git-1.5.3.6-r1 771
-RMD160 e0e65df9fb77c7b8499b5ffea80db0d3a280c34c files/digest-git-1.5.3.6-r1 771
-SHA256 e273c5d3c6c88334e5f627b9e340e9f8f743c7f4ebbdb04d13ee9d375793d02f files/digest-git-1.5.3.6-r1 771
-MD5 2f894351f75a120bc4cf1f0fb96fff8b files/digest-git-1.5.3.7 771
-RMD160 ec677e428d602acb3c595ac0d7ba309bbb23e353 files/digest-git-1.5.3.7 771
-SHA256 58c658fd0f1660c20f6c637ff6c1aad20489ade95b1c2b4a0abaabd9d2feb858 files/digest-git-1.5.3.7 771
 MD5 2f894351f75a120bc4cf1f0fb96fff8b files/digest-git-1.5.3.7-r1 771
 RMD160 ec677e428d602acb3c595ac0d7ba309bbb23e353 files/digest-git-1.5.3.7-r1 771
 SHA256 58c658fd0f1660c20f6c637ff6c1aad20489ade95b1c2b4a0abaabd9d2feb858 files/digest-git-1.5.3.7-r1 771
-MD5 cd1d61fd309be4341ba9d31b19f4cb03 files/digest-git-1.5.4_rc0 789
-RMD160 b3fafa7e21ef5f603ce9fd7af2aff8474c91b514 files/digest-git-1.5.4_rc0 789
-SHA256 ae81fa0f6650efd1ad1081ac655bfcf803d459088f25402caf165f9dfe4d26fb files/digest-git-1.5.4_rc0 789
-MD5 c91c14718766b5d4c612571bd48d19f1 files/digest-git-1.5.4_rc1 789
-RMD160 4fc1bbe780a5457aff6facc63b51107b896afb28 files/digest-git-1.5.4_rc1 789
-SHA256 f6f0eba281cfb9eb9f00a4f0895014bba7838205fb51134059c9168a5a8e3e72 files/digest-git-1.5.4_rc1 789
+MD5 8711660307324257835b982a5dacee87 files/digest-git-1.5.3.8 771
+RMD160 f7cfb25f9a6abab036d8776eb2319344bb7bc4ec files/digest-git-1.5.3.8 771
+SHA256 219c46860726039d89eac7c09ee4b01492db88eb27d6c4cf4bddd81f88b4bcbf files/digest-git-1.5.3.8 771
 MD5 12d31c3934484779438ae3032978629c files/digest-git-1.5.4_rc2 789
 RMD160 5130d6992e7341a156d4cb753d86ca4f1c3f60e3 files/digest-git-1.5.4_rc2 789
 SHA256 09317a222dc430ff24f128ac881d5b0a38101f9094ff612aab59c9d36d7d3922 files/digest-git-1.5.4_rc2 789
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iEYEARECAAYFAkeF47AACgkQj9hvisErhMIStACZASZW7pCNqRRgkEfvOoL4TEPs
-TJIAoKvr3KHyg5fc77QrOkYdKMUPjRzg
-=BSwP
+iD8DBQFHhgbsViELBEf1JB0RAgAoAJ0Vl4DkU+AvWgZ35s/CgixL9PqypgCcCQ+5
+1p+1mJ7Gqvn3dCBQ838PPtE=
+=sujZ
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.5.3.2 b/dev-util/git/files/digest-git-1.5.3.2
deleted file mode 100644
index af179b362f7e..000000000000
--- a/dev-util/git/files/digest-git-1.5.3.2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 2113337dd27141a6890ff84f25164901 git-1.5.3.2.tar.bz2 1344171
-RMD160 ef5436d8e95080415dc968c45b2e8f480a1d66c7 git-1.5.3.2.tar.bz2 1344171
-SHA256 e39b5492f3982a4f935e48294c775ddd0e63fdd2ba75b675f882479d29329d45 git-1.5.3.2.tar.bz2 1344171
-MD5 8f04afcd5c6d5b8a245bfb213ce1a35d git-htmldocs-1.5.3.2.tar.bz2 537124
-RMD160 e2d0423ab2eaa11fbb61365445ace3d1427c76dc git-htmldocs-1.5.3.2.tar.bz2 537124
-SHA256 c424e7b43d753b50e07e836d569233a545eacae5485b7dc562b492676db516c6 git-htmldocs-1.5.3.2.tar.bz2 537124
-MD5 375183e7370877f752674063e4336dfa git-manpages-1.5.3.2.tar.bz2 147283
-RMD160 9d8d9ae79f50b838f22a82ed71ee831ebc83ce98 git-manpages-1.5.3.2.tar.bz2 147283
-SHA256 b6c6c444e8c1a7f4d5b3a1307739f583cf90e58f4ddfb8156005958f087e904f git-manpages-1.5.3.2.tar.bz2 147283
diff --git a/dev-util/git/files/digest-git-1.5.3.3 b/dev-util/git/files/digest-git-1.5.3.3
deleted file mode 100644
index d5fbf2e0d5ef..000000000000
--- a/dev-util/git/files/digest-git-1.5.3.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 49ab93f99a11925789602da3ac87feed git-1.5.3.3.tar.bz2 1347290
-RMD160 d47a9adc4069b26888fe7ddd63b4e45d272ca49e git-1.5.3.3.tar.bz2 1347290
-SHA256 e064142312d340feb6b09426e5c7ee4ec15ff3404350ed3275f159bbe5826ea6 git-1.5.3.3.tar.bz2 1347290
-MD5 10aebc1687b922aafded70960f790959 git-htmldocs-1.5.3.3.tar.bz2 541175
-RMD160 02e26a8f1a84fdff3808285fada3a49dbff1af85 git-htmldocs-1.5.3.3.tar.bz2 541175
-SHA256 ad86390dfef6c44ab777bd2d7394770aa12008c7f1f9e1d1368b2f7b17fc24bc git-htmldocs-1.5.3.3.tar.bz2 541175
-MD5 f5cb572ef8504561cbaf86400d7f0279 git-manpages-1.5.3.3.tar.bz2 147278
-RMD160 3f8c51922b01aeb9aa518c86611b528a8d389868 git-manpages-1.5.3.3.tar.bz2 147278
-SHA256 fe57dc04e6e9c7ea3e6b28d04c355740b73639aa880d6b1dd64c71d009942410 git-manpages-1.5.3.3.tar.bz2 147278
diff --git a/dev-util/git/files/digest-git-1.5.3.4 b/dev-util/git/files/digest-git-1.5.3.4
deleted file mode 100644
index 4f736f79b032..000000000000
--- a/dev-util/git/files/digest-git-1.5.3.4
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 b35fd5abba0e8655733c8e8c470f39cf git-1.5.3.4.tar.bz2 1349196
-RMD160 739153affbb5e5372bf5ccd8ea502bf3b6126903 git-1.5.3.4.tar.bz2 1349196
-SHA256 3f2954c68cc6463924a0af7ccb684db0332e3db31258e993830521532a7aa764 git-1.5.3.4.tar.bz2 1349196
-MD5 577f686fc8eed259e11e6d424134025a git-htmldocs-1.5.3.4.tar.bz2 542116
-RMD160 3a899140806b02413661cc5bad9e23c7ce683bfd git-htmldocs-1.5.3.4.tar.bz2 542116
-SHA256 1be968219cdac1ce6035bf81d42e24973ca6d4841f5d1775e6adebb52d44bbf8 git-htmldocs-1.5.3.4.tar.bz2 542116
-MD5 1cfaecc1e29cdccd6c595e2fca343ff9 git-manpages-1.5.3.4.tar.bz2 147392
-RMD160 49acd94b911b61b2581539985fad6723c56282e1 git-manpages-1.5.3.4.tar.bz2 147392
-SHA256 08861a12a0abb37e9156f5942154fe103db3232dc70e980152b61c197dcbce96 git-manpages-1.5.3.4.tar.bz2 147392
diff --git a/dev-util/git/files/digest-git-1.5.3.4-r1 b/dev-util/git/files/digest-git-1.5.3.4-r1
deleted file mode 100644
index 4f736f79b032..000000000000
--- a/dev-util/git/files/digest-git-1.5.3.4-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 b35fd5abba0e8655733c8e8c470f39cf git-1.5.3.4.tar.bz2 1349196
-RMD160 739153affbb5e5372bf5ccd8ea502bf3b6126903 git-1.5.3.4.tar.bz2 1349196
-SHA256 3f2954c68cc6463924a0af7ccb684db0332e3db31258e993830521532a7aa764 git-1.5.3.4.tar.bz2 1349196
-MD5 577f686fc8eed259e11e6d424134025a git-htmldocs-1.5.3.4.tar.bz2 542116
-RMD160 3a899140806b02413661cc5bad9e23c7ce683bfd git-htmldocs-1.5.3.4.tar.bz2 542116
-SHA256 1be968219cdac1ce6035bf81d42e24973ca6d4841f5d1775e6adebb52d44bbf8 git-htmldocs-1.5.3.4.tar.bz2 542116
-MD5 1cfaecc1e29cdccd6c595e2fca343ff9 git-manpages-1.5.3.4.tar.bz2 147392
-RMD160 49acd94b911b61b2581539985fad6723c56282e1 git-manpages-1.5.3.4.tar.bz2 147392
-SHA256 08861a12a0abb37e9156f5942154fe103db3232dc70e980152b61c197dcbce96 git-manpages-1.5.3.4.tar.bz2 147392
diff --git a/dev-util/git/files/digest-git-1.5.3.5 b/dev-util/git/files/digest-git-1.5.3.5
deleted file mode 100644
index 0d17ab778a07..000000000000
--- a/dev-util/git/files/digest-git-1.5.3.5
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 3fdff0bdb3638fce1c4bc6795ed81fb3 git-1.5.3.5.tar.bz2 1351433
-RMD160 188cdbf40fe841cd5a59f8f11a621a135a61f406 git-1.5.3.5.tar.bz2 1351433
-SHA256 92abf9ccaf3e32d8fcf92a32a0308db21fa6ca9f7e9d6b63a1ba7e5e841e6629 git-1.5.3.5.tar.bz2 1351433
-MD5 a4efa2e64921e7bc5513a10b47bca06f git-htmldocs-1.5.3.5.tar.bz2 542940
-RMD160 3597521cee89eb538db7ead2c49108522c9f674e git-htmldocs-1.5.3.5.tar.bz2 542940
-SHA256 0e7d9a59930a08c644fdf37deca1f36d36fe5cfb559f4bea38901bec6094e45b git-htmldocs-1.5.3.5.tar.bz2 542940
-MD5 2cc722f80968b1c2f99a217457b056d4 git-manpages-1.5.3.5.tar.bz2 147502
-RMD160 9ee059e372c7dc6660de5c77d27b5e559bb47018 git-manpages-1.5.3.5.tar.bz2 147502
-SHA256 e75de44c08f7dc2026d38c62855ff0895cbe640785042f89918e6f0475da5f51 git-manpages-1.5.3.5.tar.bz2 147502
diff --git a/dev-util/git/files/digest-git-1.5.3.6 b/dev-util/git/files/digest-git-1.5.3.6
deleted file mode 100644
index 85f99e352469..000000000000
--- a/dev-util/git/files/digest-git-1.5.3.6
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 9b0a6cea7b084f3fc78f264cd2fb49bd git-1.5.3.6.tar.bz2 1356739
-RMD160 dbda09ada993a9835f9f403d7fa5c54ed3598b46 git-1.5.3.6.tar.bz2 1356739
-SHA256 95a5f9d8a9174277b539296901561fff6dbbba20dbdd4cfe5595c22a5a4d2221 git-1.5.3.6.tar.bz2 1356739
-MD5 20fdbd3a2e1f9835c3c5cb6b78c08d0c git-htmldocs-1.5.3.6.tar.bz2 545021
-RMD160 4174428f3d37d3c32776137390bb46d3667a47a9 git-htmldocs-1.5.3.6.tar.bz2 545021
-SHA256 893b72beed877cca84de11f941807441685666016994bf83cbd28cf07b8144c9 git-htmldocs-1.5.3.6.tar.bz2 545021
-MD5 cc8556ff7e89db26dd1a024cfe8584e3 git-manpages-1.5.3.6.tar.bz2 147732
-RMD160 4080488cd65b82b2459b373c3d8eb6d3024b24e9 git-manpages-1.5.3.6.tar.bz2 147732
-SHA256 ec03a96deb343267d34801bb20f18d296c693da19280910cf3e68f5acc89de07 git-manpages-1.5.3.6.tar.bz2 147732
diff --git a/dev-util/git/files/digest-git-1.5.3.6-r1 b/dev-util/git/files/digest-git-1.5.3.6-r1
deleted file mode 100644
index 85f99e352469..000000000000
--- a/dev-util/git/files/digest-git-1.5.3.6-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 9b0a6cea7b084f3fc78f264cd2fb49bd git-1.5.3.6.tar.bz2 1356739
-RMD160 dbda09ada993a9835f9f403d7fa5c54ed3598b46 git-1.5.3.6.tar.bz2 1356739
-SHA256 95a5f9d8a9174277b539296901561fff6dbbba20dbdd4cfe5595c22a5a4d2221 git-1.5.3.6.tar.bz2 1356739
-MD5 20fdbd3a2e1f9835c3c5cb6b78c08d0c git-htmldocs-1.5.3.6.tar.bz2 545021
-RMD160 4174428f3d37d3c32776137390bb46d3667a47a9 git-htmldocs-1.5.3.6.tar.bz2 545021
-SHA256 893b72beed877cca84de11f941807441685666016994bf83cbd28cf07b8144c9 git-htmldocs-1.5.3.6.tar.bz2 545021
-MD5 cc8556ff7e89db26dd1a024cfe8584e3 git-manpages-1.5.3.6.tar.bz2 147732
-RMD160 4080488cd65b82b2459b373c3d8eb6d3024b24e9 git-manpages-1.5.3.6.tar.bz2 147732
-SHA256 ec03a96deb343267d34801bb20f18d296c693da19280910cf3e68f5acc89de07 git-manpages-1.5.3.6.tar.bz2 147732
diff --git a/dev-util/git/files/digest-git-1.5.3.7 b/dev-util/git/files/digest-git-1.5.3.7
deleted file mode 100644
index 431f5f87d94a..000000000000
--- a/dev-util/git/files/digest-git-1.5.3.7
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a114cbf532ff627698a031a66d072173 git-1.5.3.7.tar.bz2 1361540
-RMD160 74bfccd50c895e22d10b9e25f481f00a20617077 git-1.5.3.7.tar.bz2 1361540
-SHA256 f4f03dd1a5255019c2d771a04b8a647509b4c6cf51728acc50e8f26d99e62fec git-1.5.3.7.tar.bz2 1361540
-MD5 e25249bfa66933f0381f28e2104c46a1 git-htmldocs-1.5.3.7.tar.bz2 549391
-RMD160 18d01c803fd529ac897ae249ce4e05193ee9850a git-htmldocs-1.5.3.7.tar.bz2 549391
-SHA256 e28c7e149e0f5adb66093af287dffe0caef83926ae08c6cdb6a2d35bc9148d04 git-htmldocs-1.5.3.7.tar.bz2 549391
-MD5 bc810162a466e63ee5819ff35e4fb343 git-manpages-1.5.3.7.tar.bz2 147932
-RMD160 fd4b45c221cbc63f580a32595c59eb52da1baa2f git-manpages-1.5.3.7.tar.bz2 147932
-SHA256 870e68ef57f4175152b9b8decc721d8cbc9850ed8eda73919fc9e060f3968ffa git-manpages-1.5.3.7.tar.bz2 147932
diff --git a/dev-util/git/files/digest-git-1.5.3.8 b/dev-util/git/files/digest-git-1.5.3.8
new file mode 100644
index 000000000000..35588005330e
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.3.8
@@ -0,0 +1,9 @@
+MD5 bb2477df09d4af52b05f0ee64d6ccc54 git-1.5.3.8.tar.bz2 1363259
+RMD160 8e35e67cc94152c681849e14cb4aec86f1b316cf git-1.5.3.8.tar.bz2 1363259
+SHA256 f98c6b900c9f3b87a1fbbe0c5f466e9d981cb9f1d193066b6d371df4b8066b77 git-1.5.3.8.tar.bz2 1363259
+MD5 8ac4cf1dc25501812b22d531d65a056b git-htmldocs-1.5.3.8.tar.bz2 549444
+RMD160 f4df777094158beea16bd2f0783ef846198e2c36 git-htmldocs-1.5.3.8.tar.bz2 549444
+SHA256 200a7231d6a594aeb5cb0c0e1cf25513c086f53b84170c7c5376199b2659b874 git-htmldocs-1.5.3.8.tar.bz2 549444
+MD5 6aebdb18ab71309d6404f5be3cd7f09d git-manpages-1.5.3.8.tar.bz2 147875
+RMD160 c2a15b7a0742f14a70d0bf06d4d14fe9cf2b329b git-manpages-1.5.3.8.tar.bz2 147875
+SHA256 73a7cc2c0473694d454a6b7cb311ccdeb82f350bc8e652229d361592ea0a482f git-manpages-1.5.3.8.tar.bz2 147875
diff --git a/dev-util/git/files/digest-git-1.5.4_rc0 b/dev-util/git/files/digest-git-1.5.4_rc0
deleted file mode 100644
index 8c826ca8f931..000000000000
--- a/dev-util/git/files/digest-git-1.5.4_rc0
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 14433eb6f51bb3373a2b3cbd523da65a git-1.5.4.rc0.tar.bz2 1539299
-RMD160 5bd261e7b1bd312e6e7b55674c5cb9e22678c127 git-1.5.4.rc0.tar.bz2 1539299
-SHA256 d1d952e06f8112c0b217cde3a9bbb9352b116d2002fec1b71e9c61e30a2ea7c8 git-1.5.4.rc0.tar.bz2 1539299
-MD5 fdea02ce5ebfd285deddecc850c64b1a git-htmldocs-1.5.4.rc0.tar.bz2 571372
-RMD160 7da3cdce5aeccf8e423ac9141c025409944f151f git-htmldocs-1.5.4.rc0.tar.bz2 571372
-SHA256 2248d40a2acdb85fed5355ab135a98a6ab658c4f73511fc347aa0a6a1656614f git-htmldocs-1.5.4.rc0.tar.bz2 571372
-MD5 9727f05d73fb6d22cc5ad8f96b2d7afd git-manpages-1.5.4.rc0.tar.bz2 153501
-RMD160 746e9e0d09ad462ab6c3684032bfb09629ed10dd git-manpages-1.5.4.rc0.tar.bz2 153501
-SHA256 ad184fdf2e430610cb60562bc9b302cf2c9cc6c2edfcfa2a4dfcaed5df98c376 git-manpages-1.5.4.rc0.tar.bz2 153501
diff --git a/dev-util/git/files/digest-git-1.5.4_rc1 b/dev-util/git/files/digest-git-1.5.4_rc1
deleted file mode 100644
index b3ab18152208..000000000000
--- a/dev-util/git/files/digest-git-1.5.4_rc1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 37b44a578fc2b32ef2669d8e177e5d1d git-1.5.4.rc1.tar.bz2 1548134
-RMD160 a0d64bd1f8981922be35ecc0350879af587ffe3b git-1.5.4.rc1.tar.bz2 1548134
-SHA256 4f1c45574a16bd66fcfa370c5f7acc0e2fd20217fd200ad55371071c3c8038a8 git-1.5.4.rc1.tar.bz2 1548134
-MD5 4c8d7d6cc723beece3d1992f8f27edcc git-htmldocs-1.5.4.rc1.tar.bz2 600054
-RMD160 6c0570d9a4d81a61445c795247758d84d451b947 git-htmldocs-1.5.4.rc1.tar.bz2 600054
-SHA256 66aad13fc1768a2b57dd76100535d997d58f3731159d6cb568d7bd4b6887b107 git-htmldocs-1.5.4.rc1.tar.bz2 600054
-MD5 16c95f31b4ff74229bdcc9742a263c6f git-manpages-1.5.4.rc1.tar.bz2 153363
-RMD160 b754f0c74bf0059e0811eea2b41d6a88f73a279f git-manpages-1.5.4.rc1.tar.bz2 153363
-SHA256 2121a9c28214f4285e4004c321fa6b2a50a13e3a281def775eda978b192f58cd git-manpages-1.5.4.rc1.tar.bz2 153363
diff --git a/dev-util/git/files/git-1.5.3.8-t9106.patch b/dev-util/git/files/git-1.5.3.8-t9106.patch
new file mode 100644
index 000000000000..b5df85f3994d
--- /dev/null
+++ b/dev-util/git/files/git-1.5.3.8-t9106.patch
@@ -0,0 +1,22 @@
+commit 8d92f24852420c425f3ee499d3c3be01be4dc15c
+Author: Eric Wong <normalperson@yhbt.net>
+Date:   Wed Nov 21 00:57:33 2007 -0800
+
+    t9106: fix a race condition that caused svn to miss modifications
+    
+    carbonated beverage noticed this test was occasionally failing.
+    
+    Signed-off-by: Eric Wong <normalperson@yhbt.net>
+
+diff --git a/t/t9106-git-svn-dcommit-clobber-series.sh b/t/t9106-git-svn-dcommit-clobber-series.sh
+index d59acc8..7452546 100755
+--- a/t/t9106-git-svn-dcommit-clobber-series.sh
++++ b/t/t9106-git-svn-dcommit-clobber-series.sh
+@@ -22,6 +22,7 @@ test_expect_success '(supposedly) non-conflicting change from SVN' "
+ 	cd tmp &&
+ 		perl -i -p -e 's/^58\$/5588/' file &&
+ 		perl -i -p -e 's/^61\$/6611/' file &&
++		poke file &&
+ 		test x\"\`sed -n -e 58p < file\`\" = x5588 &&
+ 		test x\"\`sed -n -e 61p < file\`\" = x6611 &&
+ 		svn commit -m '58 => 5588, 61 => 6611' &&
diff --git a/dev-util/git/git-1.5.3.2.ebuild b/dev-util/git/git-1.5.3.2.ebuild
deleted file mode 100644
index cb780f7cf2fe..000000000000
--- a/dev-util/git/git-1.5.3.2.ebuild
+++ /dev/null
@@ -1,163 +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.3.2.ebuild,v 1.2 2007/12/17 05:23:41 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, the revision control system heavily used by the Linux kernel team"
-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="
-	!app-misc/git
-	dev-libs/openssl
-	sys-libs/zlib
-	dev-lang/perl
-	tk?     ( dev-lang/tk )
-	curl?   ( net-misc/curl )
-	webdav? ( dev-libs/expat )
-	emacs?  ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	perl?   ( dev-perl/Error )
-	gtk?    ( >=dev-python/pygtk-2.8 )"
-
-SITEFILE=71${PN}-gentoo.el
-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.3-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/git{k,-gui}
-
-	doman "${WORKDIR}"/man?/*
-
-	dodoc README 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
-		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
-			die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	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() {
-	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" \
-		"dev-perl/TermReadKey"
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
-	showpkgdeps git-send-email "USE=perl"
-	showpkgdeps git-remote "USE=perl"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.5.3.3.ebuild b/dev-util/git/git-1.5.3.3.ebuild
deleted file mode 100644
index e4145a97fb7b..000000000000
--- a/dev-util/git/git-1.5.3.3.ebuild
+++ /dev/null
@@ -1,163 +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.3.3.ebuild,v 1.2 2007/12/17 05:23:41 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, the revision control system heavily used by the Linux kernel team"
-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="
-	!app-misc/git
-	dev-libs/openssl
-	sys-libs/zlib
-	dev-lang/perl
-	tk?     ( dev-lang/tk )
-	curl?   ( net-misc/curl )
-	webdav? ( dev-libs/expat )
-	emacs?  ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	perl?   ( dev-perl/Error )
-	gtk?    ( >=dev-python/pygtk-2.8 )"
-
-SITEFILE=71${PN}-gentoo.el
-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.3-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/git{k,-gui}
-
-	doman "${WORKDIR}"/man?/*
-
-	dodoc README 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
-		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
-			die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	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() {
-	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" \
-		"dev-perl/TermReadKey"
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
-	showpkgdeps git-send-email "USE=perl"
-	showpkgdeps git-remote "USE=perl"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.5.3.4-r1.ebuild b/dev-util/git/git-1.5.3.4-r1.ebuild
deleted file mode 100644
index ebfa54acf2a4..000000000000
--- a/dev-util/git/git-1.5.3.4-r1.ebuild
+++ /dev/null
@@ -1,177 +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.3.4-r1.ebuild,v 1.3 2007/12/17 05:23:41 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, the revision control system heavily used by the Linux kernel team"
-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 emacs gtk iconv mozsha1 perl ppcsha1 tk webdav"
-
-DEPEND="
-	!app-misc/git
-	dev-libs/openssl
-	sys-libs/zlib
-	dev-lang/perl
-	tk?     ( dev-lang/tk )
-	curl?   ( net-misc/curl )
-	webdav? ( dev-libs/expat )
-	emacs?  ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	perl?   ( dev-perl/Error )
-	gtk?    ( >=dev-python/pygtk-2.8 )"
-
-SITEFILE=72${PN}-gentoo.el
-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 iconv || 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.3-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/git{k,-gui}
-
-	doman "${WORKDIR}"/man?/*
-
-	dodoc README 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
-		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
-			die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${D}"/"${SITELISP}"/${PN}/.nosearch
-	fi
-
-	if use gtk ; then
-		dobin "${S}"/contrib/gitview/gitview
-		use doc && dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	cp -rf \
-		"${S}"/contrib/{vim,stats,workdir,hg-to-git,fast-import,hooks} \
-		"${D}"/usr/share/${PN}/contrib
-
-	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() {
-	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() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "GNU Emacs has built-in Git support in versions greater 22.1."
-		elog "You can disable the emacs USE flag for dev-util/git"
-		elog "if you are using such a version."
-	fi
-	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" \
-		"dev-perl/TermReadKey"
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
-	showpkgdeps git-send-email "USE=perl"
-	showpkgdeps git-remote "USE=perl"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.5.3.4.ebuild b/dev-util/git/git-1.5.3.4.ebuild
deleted file mode 100644
index b1e021d813f4..000000000000
--- a/dev-util/git/git-1.5.3.4.ebuild
+++ /dev/null
@@ -1,172 +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.3.4.ebuild,v 1.3 2007/12/17 05:23:41 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, the revision control system heavily used by the Linux kernel team"
-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 emacs gtk iconv mozsha1 perl ppcsha1 tk webdav"
-
-DEPEND="
-	!app-misc/git
-	dev-libs/openssl
-	sys-libs/zlib
-	dev-lang/perl
-	tk?     ( dev-lang/tk )
-	curl?   ( net-misc/curl )
-	webdav? ( dev-libs/expat )
-	emacs?  ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	perl?   ( dev-perl/Error )
-	gtk?    ( >=dev-python/pygtk-2.8 )"
-
-SITEFILE=72${PN}-gentoo.el
-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 iconv || 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.3-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/git{k,-gui}
-
-	doman "${WORKDIR}"/man?/*
-
-	dodoc README 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
-		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
-			die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${D}"/"${SITELISP}"/${PN}/.nosearch
-	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() {
-	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() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "GNU Emacs has built-in Git support in versions greater 22.1."
-		elog "You can disable the emacs USE flag for dev-util/git"
-		elog "if you are using such a version."
-	fi
-	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" \
-		"dev-perl/TermReadKey"
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
-	showpkgdeps git-send-email "USE=perl"
-	showpkgdeps git-remote "USE=perl"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.5.3.5.ebuild b/dev-util/git/git-1.5.3.5.ebuild
deleted file mode 100644
index d078d26c736e..000000000000
--- a/dev-util/git/git-1.5.3.5.ebuild
+++ /dev/null
@@ -1,177 +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.3.5.ebuild,v 1.2 2007/12/17 05:23:41 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, the revision control system heavily used by the Linux kernel team"
-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 emacs gtk iconv mozsha1 perl ppcsha1 tk webdav"
-
-DEPEND="
-	!app-misc/git
-	dev-libs/openssl
-	sys-libs/zlib
-	dev-lang/perl
-	tk?     ( dev-lang/tk )
-	curl?   ( net-misc/curl )
-	webdav? ( dev-libs/expat )
-	emacs?  ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	perl?   ( dev-perl/Error )
-	gtk?    ( >=dev-python/pygtk-2.8 )"
-
-SITEFILE=72${PN}-gentoo.el
-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 iconv || 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.3-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/git{k,-gui}
-
-	doman "${WORKDIR}"/man?/*
-
-	dodoc README 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
-		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
-			die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${D}"/"${SITELISP}"/${PN}/.nosearch
-	fi
-
-	if use gtk ; then
-		dobin "${S}"/contrib/gitview/gitview
-		use doc && dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	cp -rf \
-		"${S}"/contrib/{vim,stats,workdir,hg-to-git,fast-import,hooks} \
-		"${D}"/usr/share/${PN}/contrib
-
-	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() {
-	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() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "GNU Emacs has built-in Git support in versions greater 22.1."
-		elog "You can disable the emacs USE flag for dev-util/git"
-		elog "if you are using such a version."
-	fi
-	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" \
-		"dev-perl/TermReadKey"
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
-	showpkgdeps git-send-email "USE=perl"
-	showpkgdeps git-remote "USE=perl"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.5.3.6-r1.ebuild b/dev-util/git/git-1.5.3.6-r1.ebuild
deleted file mode 100644
index 6bb438bbc2f0..000000000000
--- a/dev-util/git/git-1.5.3.6-r1.ebuild
+++ /dev/null
@@ -1,191 +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.3.6-r1.ebuild,v 1.2 2007/12/17 05:23:41 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, the revision control system heavily used by the Linux kernel team"
-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 emacs gtk iconv mozsha1 perl ppcsha1 tk webdav"
-
-DEPEND="
-	!app-misc/git
-	dev-libs/openssl
-	sys-libs/zlib
-	dev-lang/perl
-	app-arch/cpio
-	tk?     ( dev-lang/tk )
-	curl?   ( net-misc/curl )
-	webdav? ( dev-libs/expat )
-	emacs?  ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	perl?   ( dev-perl/Error )
-	gtk?    ( >=dev-python/pygtk-2.8 )"
-
-SITEFILE=72${PN}-gentoo.el
-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 iconv || myopts="${myopts} NO_ICONV=YesPlease"
-
-	export MY_MAKEOPTS=${myopts}
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd "${S}"
-	unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-	use doc && cd "${S}"/Documentation && unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.5.3-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/git{k,-gui}
-
-	doman man?/*
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		einfo "Doing Documentation${d}"
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-
-	dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
-			die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${D}"/"${SITELISP}"/${PN}/.nosearch
-	fi
-
-	if use gtk ; then
-		dobin "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-		newbin "${S}"/contrib/blameview/blameview.perl blameview
-		newdoc "${S}"/contrib/blameview/README README.blameview
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	for i in continuous fast-import hg-to-git \
-		hooks remotes2config.sh vim stats \
-		workdir ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${D}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	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() {
-	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() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "GNU Emacs has built-in Git support in versions greater 22.1."
-		elog "You can disable the emacs USE flag for dev-util/git"
-		elog "if you are using such a version."
-	fi
-	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" \
-		"dev-perl/TermReadKey"
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
-	showpkgdeps git-send-email "USE=perl"
-	showpkgdeps git-remote "USE=perl"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.5.3.6.ebuild b/dev-util/git/git-1.5.3.6.ebuild
deleted file mode 100644
index 8f0b0f1efdb7..000000000000
--- a/dev-util/git/git-1.5.3.6.ebuild
+++ /dev/null
@@ -1,177 +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.3.6.ebuild,v 1.2 2007/12/17 05:23:41 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, the revision control system heavily used by the Linux kernel team"
-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 emacs gtk iconv mozsha1 perl ppcsha1 tk webdav"
-
-DEPEND="
-	!app-misc/git
-	dev-libs/openssl
-	sys-libs/zlib
-	dev-lang/perl
-	tk?     ( dev-lang/tk )
-	curl?   ( net-misc/curl )
-	webdav? ( dev-libs/expat )
-	emacs?  ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	perl?   ( dev-perl/Error )
-	gtk?    ( >=dev-python/pygtk-2.8 )"
-
-SITEFILE=72${PN}-gentoo.el
-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 iconv || 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.3-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/git{k,-gui}
-
-	doman "${WORKDIR}"/man?/*
-
-	dodoc README 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
-		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
-			die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${D}"/"${SITELISP}"/${PN}/.nosearch
-	fi
-
-	if use gtk ; then
-		dobin "${S}"/contrib/gitview/gitview
-		use doc && dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	cp -rf \
-		"${S}"/contrib/{vim,stats,workdir,hg-to-git,fast-import,hooks} \
-		"${D}"/usr/share/${PN}/contrib
-
-	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() {
-	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() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "GNU Emacs has built-in Git support in versions greater 22.1."
-		elog "You can disable the emacs USE flag for dev-util/git"
-		elog "if you are using such a version."
-	fi
-	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" \
-		"dev-perl/TermReadKey"
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
-	showpkgdeps git-send-email "USE=perl"
-	showpkgdeps git-remote "USE=perl"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.5.3.7.ebuild b/dev-util/git/git-1.5.3.7.ebuild
deleted file mode 100644
index 5f1a71cff119..000000000000
--- a/dev-util/git/git-1.5.3.7.ebuild
+++ /dev/null
@@ -1,199 +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.3.7.ebuild,v 1.2 2007/12/17 05:23:41 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, the revision control system heavily used by the Linux kernel team"
-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 emacs gtk iconv mozsha1 perl ppcsha1 tk webdav"
-
-DEPEND="
-	!app-misc/git
-	dev-libs/openssl
-	sys-libs/zlib
-	dev-lang/perl
-	app-arch/cpio
-	tk?     ( dev-lang/tk )
-	curl?   ( net-misc/curl )
-	webdav? ( dev-libs/expat )
-	emacs?  ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	perl?   ( dev-perl/Error )
-	gtk?    ( >=dev-python/pygtk-2.8 )"
-
-SITEFILE=72${PN}-gentoo.el
-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 iconv || myopts="${myopts} NO_ICONV=YesPlease"
-
-	export MY_MAKEOPTS=${myopts}
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd "${S}"
-	unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-	use doc && cd "${S}"/Documentation && unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.5.3-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/git{k,-gui}
-
-	doman man?/*
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		einfo "Doing Documentation${d}"
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-
-	dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
-			die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${D}"/"${SITELISP}"/${PN}/.nosearch
-	fi
-
-	if use gtk ; then
-		dobin "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-		newbin "${S}"/contrib/blameview/blameview.perl blameview
-		newdoc "${S}"/contrib/blameview/README README.blameview
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	for i in continuous fast-import hg-to-git \
-		hooks remotes2config.sh vim stats \
-		workdir ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${D}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	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() {
-	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
-	if has userpriv "${FEATURES}"; then
-		einfo "Enabling CVS tests as we have FEATURES=userpriv"
-	else
-		ewarn "Skipping CVS tests because CVS does not work as root!"
-		ewarn "You should retest with FEATURES=userpriv!"
-		for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do
-			rm "${S}"/t/${i} || die "Failed to remove ${i}"
-		done
-	fi
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
-}
-
-pkg_postinst() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "GNU Emacs has built-in Git support in versions greater 22.1."
-		elog "You can disable the emacs USE flag for dev-util/git"
-		elog "if you are using such a version."
-	fi
-	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" \
-		"dev-perl/TermReadKey"
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
-	showpkgdeps git-send-email "USE=perl"
-	showpkgdeps git-remote "USE=perl"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.5.4_rc0.ebuild b/dev-util/git/git-1.5.3.8.ebuild
index ae3ee6a0eaae..6a75e7c47ebc 100644
--- a/dev-util/git/git-1.5.4_rc0.ebuild
+++ b/dev-util/git/git-1.5.3.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.4 2007/12/25 08:57:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3.8.ebuild,v 1.1 2008/01/10 11:51:48 ferdy Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -31,7 +31,7 @@ DEPEND="
 	webdav? ( dev-libs/expat )
 	emacs?  ( virtual/emacs )"
 RDEPEND="${DEPEND}
-	cgi?	( virtual/perl-CGI )
+	cgi?    ( virtual/perl-CGI )
 	perl?   ( dev-perl/Error )
 	gtk?    ( >=dev-python/pygtk-2.8 )"
 
@@ -78,6 +78,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-1.5.3-symlinks.patch
+	epatch "${FILESDIR}"/${P}-t9106.patch
 
 	sed -i \
 		-e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
@@ -113,7 +114,6 @@ src_install() {
 	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
 	use doc && dodir /usr/share/doc/${PF}/html
 	for d in / /howto/ /technical/ ; do
-		einfo "Doing Documentation${d}"
 		docinto ${d}
 		dodoc Documentation${d}*.txt
 		use doc && dohtml -p ${d} Documentation${d}*.html
@@ -143,13 +143,9 @@ src_install() {
 	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
-	# examples - these are stuff that is not used in Git anymore actually
-	# patches - stuff the Git guys made to go upstream to other places
 	for i in continuous fast-import hg-to-git \
 		hooks remotes2config.sh vim stats \
-		workdir convert-objects ; do
+		workdir ; do
 		cp -rf \
 			"${S}"/contrib/${i} \
 			"${D}"/usr/share/${PN}/contrib \
@@ -181,16 +177,14 @@ src_test() {
 		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
-	if has userpriv "${FEATURES}"; then
-		einfo "Enabling CVS tests as we have FEATURES=userpriv"
-	else
+	if ! has userpriv "${FEATURES}"; then
 		ewarn "Skipping CVS tests because CVS does not work as root!"
 		ewarn "You should retest with FEATURES=userpriv!"
 		for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do
 			rm "${S}"/t/${i} || die "Failed to remove ${i}"
 		done
 	fi
+	built_with_use dev-util/cvs server || rm "${S}"/t/t9600-cvsimport.sh
 	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
 }
 
@@ -208,13 +202,14 @@ pkg_postinst() {
 	showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1"
 	showpkgdeps git-svnimport "dev-util/subversion(USE=perl)"
 	showpkgdeps git-svn \
+		"USE=perl" \
 		"dev-util/subversion(USE=perl)" \
 		"dev-perl/libwww-perl" \
 		"dev-perl/TermReadKey"
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
 	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
+		"|| ( www-servers/lighttpd www-servers/apache )"
 	showpkgdeps git-send-email "USE=perl"
 	showpkgdeps git-remote "USE=perl"
 	echo
diff --git a/dev-util/git/git-1.5.4_rc1.ebuild b/dev-util/git/git-1.5.4_rc1.ebuild
deleted file mode 100644
index b5587ae98714..000000000000
--- a/dev-util/git/git-1.5.4_rc1.ebuild
+++ /dev/null
@@ -1,225 +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.4_rc1.ebuild,v 1.3 2007/12/29 10:41:59 welp 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, the revision control system heavily used by the Linux kernel team"
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav"
-
-DEPEND="
-	!app-misc/git
-	dev-libs/openssl
-	sys-libs/zlib
-	dev-lang/perl
-	app-arch/cpio
-	tk?     ( dev-lang/tk )
-	curl?   ( net-misc/curl )
-	webdav? ( dev-libs/expat )
-	emacs?  ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	cgi?	( virtual/perl-CGI )
-	perl?   ( dev-perl/Error )
-	gtk?    ( >=dev-python/pygtk-2.8 )"
-
-SITEFILE=72${PN}-gentoo.el
-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 iconv || myopts="${myopts} NO_ICONV=YesPlease"
-	use tk || myopts="${myopts} NO_TCLTK=YesPlease"
-
-	export MY_MAKEOPTS=${myopts}
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd "${S}"
-	unpack ${PN}-manpages-${DOC_VER}.tar.bz2
-	use doc && cd "${S}"/Documentation && unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.5.3-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
-	if use cgi ; then
-		emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		prefix=/usr \
-		gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed"
-	fi
-}
-
-src_install() {
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \
-		die "make install failed"
-
-	doman man?/*
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		einfo "Doing Documentation${d}"
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-
-	dobashcompletion contrib/completion/git-completion.bash ${PN}
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
-			die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${D}"/"${SITELISP}"/${PN}/.nosearch
-	fi
-
-	if use gtk ; then
-		dobin "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-		newbin "${S}"/contrib/blameview/blameview.perl blameview
-		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
-	# examples - these are stuff that is not used in Git anymore actually
-	# patches - stuff the Git guys made to go upstream to other places
-	for i in continuous fast-import hg-to-git \
-		hooks remotes2config.sh vim stats \
-		workdir convert-objects ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${D}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use cgi ; then
-		dodir /usr/share/${PN}/gitweb
-		insinto /usr/share/${PN}/gitweb
-		doins "${S}"/gitweb/gitweb.{cgi,css}
-		doins "${S}"/gitweb/git-{favicon,logo}.png
-		docinto /
-		# INSTALL discusses configuration issues, not just installation
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-	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() {
-	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
-	if has userpriv "${FEATURES}"; then
-		einfo "Enabling CVS tests as we have FEATURES=userpriv"
-	else
-		ewarn "Skipping CVS tests because CVS does not work as root!"
-		ewarn "You should retest with FEATURES=userpriv!"
-		for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do
-			rm "${S}"/t/${i} || die "Failed to remove ${i}"
-		done
-	fi
-	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
-}
-
-pkg_postinst() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "GNU Emacs has built-in Git support in versions greater 22.1."
-		elog "You can disable the emacs USE flag for dev-util/git"
-		elog "if you are using such a version."
-	fi
-	elog "These additional scripts need some dependencies:"
-	elog "(These are also needed for FEATURES=test)"
-	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" \
-		"dev-perl/TermReadKey"
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
-	showpkgdeps git-send-email "USE=perl"
-	showpkgdeps git-remote "USE=perl"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/git/git-1.5.4_rc2.ebuild b/dev-util/git/git-1.5.4_rc2.ebuild
index ece8366de490..8f9dbecf1ba3 100644
--- a/dev-util/git/git-1.5.4_rc2.ebuild
+++ b/dev-util/git/git-1.5.4_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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_rc2.ebuild,v 1.1 2008/01/01 19:51:52 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4_rc2.ebuild,v 1.2 2008/01/10 11:51:48 ferdy Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav"
 
 DEPEND="
@@ -31,7 +31,7 @@ DEPEND="
 	webdav? ( dev-libs/expat )
 	emacs?  ( virtual/emacs )"
 RDEPEND="${DEPEND}
-	cgi?	( virtual/perl-CGI )
+	cgi?    ( virtual/perl-CGI )
 	perl?   ( dev-perl/Error )
 	gtk?    ( >=dev-python/pygtk-2.8 )"
 
@@ -113,7 +113,6 @@ src_install() {
 	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
 	use doc && dodir /usr/share/doc/${PF}/html
 	for d in / /howto/ /technical/ ; do
-		einfo "Doing Documentation${d}"
 		docinto ${d}
 		dodoc Documentation${d}*.txt
 		use doc && dohtml -p ${d} Documentation${d}*.html
@@ -181,16 +180,14 @@ src_test() {
 		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
-	if has userpriv "${FEATURES}"; then
-		einfo "Enabling CVS tests as we have FEATURES=userpriv"
-	else
+	if ! has userpriv "${FEATURES}"; then
 		ewarn "Skipping CVS tests because CVS does not work as root!"
 		ewarn "You should retest with FEATURES=userpriv!"
 		for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do
 			rm "${S}"/t/${i} || die "Failed to remove ${i}"
 		done
 	fi
+	built_with_use dev-util/cvs server || rm "${S}"/t/t9600-cvsimport.sh
 	emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
 }
 
@@ -208,13 +205,14 @@ pkg_postinst() {
 	showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1"
 	showpkgdeps git-svnimport "dev-util/subversion(USE=perl)"
 	showpkgdeps git-svn \
+		"USE=perl" \
 		"dev-util/subversion(USE=perl)" \
 		"dev-perl/libwww-perl" \
 		"dev-perl/TermReadKey"
 	showpkgdeps git-quiltimport "dev-util/quilt"
 	showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
 	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )"
+		"|| ( www-servers/lighttpd www-servers/apache )"
 	showpkgdeps git-send-email "USE=perl"
 	showpkgdeps git-remote "USE=perl"
 	echo
author	Fernando J. Pereda <ferdy@gentoo.org>	2008-01-10 11:51:49 +0000
committer	Fernando J. Pereda <ferdy@gentoo.org>	2008-01-10 11:51:49 +0000
commit	97998b8c13b0a13cedc72d3cf5e8d24599ad2ce5 (patch)
tree	60ce967981a32ec6f987c17785ee009db012bbe3 /dev-util
parent	Stable on sparc (diff)
download	historical-97998b8c13b0a13cedc72d3cf5e8d24599ad2ce5.tar.gz historical-97998b8c13b0a13cedc72d3cf5e8d24599ad2ce5.tar.bz2 historical-97998b8c13b0a13cedc72d3cf5e8d24599ad2ce5.zip