Version bump (bug #517562)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 668 insertions, 15 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 52002825655b..a6fc39254a8d 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.269 2014/07/18 14:04:11 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.270 2014/07/20 21:22:53 polynomial-c Exp $
+
+*git-2.0.2 (20 Jul 2014)
+
+  20 Jul 2014; Lars Wendler <polynomial-c@gentoo.org> +git-2.0.2.ebuild:
+  Version bump (bug #517562).
 
 *git-2.0.1 (18 Jul 2014)
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 15587857ef01..882cfd1f13e7 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -26,6 +26,7 @@ DIST git-1.8.5.5.tar.gz 4761469 SHA256 c59268c33d2412af329cb09b10e5348e4001a47e1
 DIST git-1.9.3.tar.gz 4846233 SHA256 71bca677efa3b87a060cba1de9e3512e7ab0f09197ef95d648e5280d9a6d1357 SHA512 42a774f0d2b9d0ace9e555b3d12b7a27fabdad407d5d1f342792d56cc1b7d1c9d1f921432238ec1bc61e9fd7f9dba7c5d8bcadea8b05bf73bab8c3b428f17b89 WHIRLPOOL b0cd2a18404af0856972d3ab1bad776b5c3cb5088369e5556aa2293feb6a164ef1af7a79cd4a1d7e20c37795921c05d811f9faebe57e31ea5621cc9990b8e5f3
 DIST git-2.0.0.tar.gz 4898319 SHA256 c6a370e95326701037dfe32f8e66f39cdd28557ca84ffdb282d6042c37a98b68 SHA512 ee1132e259bc9dbcf1b5124131ab81ae0ee00a850640903d80bb78ba6122764d2d10a76b1fe1341c17a3caf22d7d27a726a68be28a54c4d28791074e98ff604a WHIRLPOOL 4c8a70c462f5beddd653c5e159237958573881e457471fc85b0e56381ace6a48eb500e21727301c35853fb586300b2e6df96e00441143bb268f4c61e532ee612
 DIST git-2.0.1.tar.xz 3433780 SHA256 ab12a103523b430d8d3e26ac2e05e759bdb1349f10e13bba48bed98f45c6d4df SHA512 51307c395c012f65842a53850dbcb5bde90dfee8ea731eab9bc099b3b284254fdbe86df08ab6fcae7b25f82edd87e3edb1fee4e5af1d2a01f2bfdfb7306d6107 WHIRLPOOL efd26778248472a742bae5208476a101aed5aaf0d81d7c924a2e09c89e7e39dbec9fab34c77f1d35405ae9d7a30be6a4c1757d12bb7c45a1827ec2dbae9afd6d
+DIST git-2.0.2.tar.xz 3435424 SHA256 bcf8c22c9745abb1b050e8baba55473cc0a2f9444802ea1889b1fb886def69c2 SHA512 a0402f2827bebba2698fbbe5db99b01768b62db0329bee94bc7351319ddd52d88a6f747f7857a9daf2532d916cf78541dbdb6d8af271000b6731f00ebd96dea2 WHIRLPOOL 49184ab124c179b5e378403bde1d5496aac1514dddf9ecc2162df858fe1eadaf24bde091a93b595fa178de137a544ec1e373850737af5c7b45ffa468fe2d59a4
 DIST git-htmldocs-1.8.1.5.tar.gz 2060977 SHA256 108e34217b2668945ca78b36b08ceeb9fe283617fe68b8f181219076bb225de0 SHA512 0b46a95a47df4326633d10295eeb09d41cee78d9c30775f7784690715e3b5d607ff26027f4cd6036f31dfc458ba2757ceb5ed6ea675a863a5dc69d8e5a7b34f5 WHIRLPOOL d273fbee9fb0a68ef3f0d19ba2249481bd15ff69b289e046e975fccda7639102519aa79bff94f6317e6b73cc414128b8b8619fcda1a910b74770b0aba1694d26
 DIST git-htmldocs-1.8.2.1.tar.gz 2093688 SHA256 3f2482089eb345ec7d2ad61ad731c17ea87733b763585b580cf99b17194e0286 SHA512 8e7f25a0b230473f9e9290f61e9ea80a675459eea163ef76e281aa95747f5bc4df2ddb7f9bba9c2b0fb75819cd206f2415ba665bc986a628a07e8da4e5aa6efc WHIRLPOOL 574a01d1e403b25444ac88f66a939fcad1c96025a62f91550f328d400246955e61255dd403f3cf8302b961032f536e394b77228a8434c7b2065b564163f49114
 DIST git-htmldocs-1.8.3.2.tar.gz 2115320 SHA256 805b7fc4399daf9258e8cc28ecc3dd043fdd7f339447f4d84674826916109246 SHA512 0890b60bfa110ca7eaf7aaddbf0aca9574f608addc384cece3c91c8c04ef6397064a0669f3d61d0a65eb120b626ccd85df26f04438ca301f349136cd55e5080a WHIRLPOOL 377c39ac7988a3c1bb6e80333c43878d38fe5eecbb75dcbcbef3c2186842fcc170a552d72be891f1479c336fdd6c5ac1ce1ca2c0adf9a8238bd057f093c3f912
@@ -34,6 +35,7 @@ DIST git-htmldocs-1.8.5.5.tar.gz 2228410 SHA256 14088e41803a9127946a9f31146d5ac4
 DIST git-htmldocs-1.9.3.tar.gz 2243608 SHA256 d23f3f3ccd421706f8805c40ee199fb1d3dda7e6720eb8b260f3dbed20f2536f SHA512 c381f560d5f67f723920ba679665725d377b40e0074ca49826436310f7c64d9c9814ff8a3e98a9d00c0d47e9d9f613ec4ed035d15420b87221fdb17de4ebaf3d WHIRLPOOL 9437271b91b5667fa7a6e979aa86822c1824bcf786a2fad07c0a3cdb1c576bccfe2a098f0e43ebfc66f0dc54cf32443988018ce15f191747b412d200599d0af7
 DIST git-htmldocs-2.0.0.tar.gz 2274715 SHA256 19d34736cc50e3a4b5641e0998191d67d89d3146b8652e7abd88780ca475dbcb SHA512 16d1baa93f8ee14d7e5ad1048261875cd37722ff5fb4e742196edfa282c5b93b2e45b2f38b632f25afdffbf27f3162eeedd42f07dfee9c05abfd5f9c0e101769 WHIRLPOOL d3823421435ae58dbd7d6cec7a00333cf32280c036086d71d9917303be47102eee53b017ae74d30a18f69bde69514ce15a52f8c2461c47c7d81119fb7cdf56f3
 DIST git-htmldocs-2.0.1.tar.xz 943016 SHA256 22df5f33657d0b6106e3ae87e6fce806cefc6ea10fa51fad292f6823f3be0e5b SHA512 73f3d3f4b38fb7760a6c9668bd379fdb46133ccdddfbe8f21c1c6cd9e2b20e01422fba41ce74508e512796fcaca7f360612db8667ab5632746f262175d74dc75 WHIRLPOOL 188db71fbc9d310d9217537fd51a42ff8efc94381c64935598fdc49947fd9c395dcf1119e8eadbe543b4adeb38f1d65ff178014bb77656750b0c4a8b3963322c
+DIST git-htmldocs-2.0.2.tar.xz 943424 SHA256 b8adaadf5ef37aebf50a5ae0d2be17129202021306aded97c66eb97e40f47e1d SHA512 c1be70fb78b2c5a95fcf63132e4b5b1a319b3e8373a1291b9d0eea5d19ce16e8691e1ed75a254e535c0093b8b02f3906c6616d5909eb3800b94f00084d4962b0 WHIRLPOOL e89396ef5658839aaba3d5de1bbb8ab22d77e1f134a17a0f7a9d0547a9ca41525f7b1d11394135ef959bad8f42fcaeecb1697f325ab20872d6ce48016afd2de2
 DIST git-manpages-1.8.1.5.tar.gz 528540 SHA256 b171761f13deb738a2464c9d3967c12539067a34d6f2bfa5739a1006786fd24a SHA512 c0106da12ae3beeba3c23e68b37113082d829fe80160c53df51aac207557a2045c662b4d01b5a1cb211e75f9f7629290b7ecf3907b3bdc828820382793414e8e WHIRLPOOL 3da3b254707c06cb069fa462561634a4f5869fadab6ab8a07301eeb0b2244f159415d409d71c5ebceb4a74ef51f645f2f4c9ca19080a84ee370b5787740d08c2
 DIST git-manpages-1.8.2.1.tar.gz 536718 SHA256 1d3bc31d10564d29d0c3a45f98f98a7d936dfcdb1692528bf2fdb2140fe89824 SHA512 a6463c8bc8a23301d89e985b88fa0073c154e126c51a1f7699cd09e79723ed463f46a9cf5dd63f9e2e46ee4111e6154ae86553bd446f5cf76db9fd4e3bff5a1f WHIRLPOOL 8aa3c57475d8cfd7c47019c4eb05c091c76fb0ec5d213942b5a16ee9f6c540111aecb6b754eb98578e9e129d4e8ba941a3bee326a2845b2a098cc30e1109d35d
 DIST git-manpages-1.8.3.2.tar.gz 542769 SHA256 599bc8f6c56986a994a237cfebb53b4fab9051576775e32d0353e0455ab84115 SHA512 42fd781b924355c969ce381aae828f877059472741d7b53b0d1aad53f04c8a27b6b161b5dfc353098370ead73ccb9cdc86ac5374cf02829134f8c4d70bcbb7cf WHIRLPOOL 90226006a35b7b6e644f887981f2725238ff428f572425942701614e14fab5c8c5c602746de93a113d83d9b9c76ea1805a9c7cfa353305b0f817c33976048d77
@@ -42,6 +44,7 @@ DIST git-manpages-1.8.5.5.tar.gz 568976 SHA256 375870364a67e663ee85de30d64a12388
 DIST git-manpages-1.9.3.tar.gz 571550 SHA256 43bfb09c072ccfe0ed4b0ad30d04c8f34b6af4d2f52cd8dfdb48787cc9c8509d SHA512 3f985a4446e3ce1b8bff356585eb5f33565179517e7ba9ae53fc59399c2e4f3ee8498567ce5282e3ddafe0709e79b80877ee53166986facc1ce348495cbb254a WHIRLPOOL 21e96604e4d6581c34ccf0c1367b706e383c47e45ffe9bfb05e9998c7de45507aa72c3fe95f8fd1d81eced81cea149e6bb393a097fe95d8debbeebfbecde6efd
 DIST git-manpages-2.0.0.tar.gz 575350 SHA256 12523fe1c8de8b88997b5483313e143c96c0a116c19a498ddbbfe573ed98bded SHA512 50b27b1fa5fd005f17e52c91d8bc6ed8b387611525d6d5aa5d7a5b8808d94d4afa34e56fa6921d768ca623535ed720a699b092ed2826a2d78fde7592826d27db WHIRLPOOL 7acdba3f493fc26b39854d71026fa0235c2989d99a42cb63e0811afa2e9c1536f5980f0c11dabf7fd85f71dd54632bc36c9e556e4597216e69aa962f30743fff
 DIST git-manpages-2.0.1.tar.xz 358984 SHA256 197bc5e447be0dbd5185717a555d7f908dd064e8d2bf3ed9fdbb822c3ddd35d8 SHA512 72b7a9e08552f4b3cef35572aa1575700825098480ef5dc118c9440afee3bbec180571eae01df2ea349e8ab1170f2ffd6c1763b6947e67779e3eba9ea69c5489 WHIRLPOOL 8bba425ccd1d19e8a69e1a53f69c55c26fd065d8022b2e6d3a86c5f0e07c445731eeae6658e659f38b89868213da8a200ad6151dadc4c5ea49dcc6b40c4dd936
+DIST git-manpages-2.0.2.tar.xz 358984 SHA256 a367ab3704c05b4d69a5a02f2d89d2b6075be63670b29e580b63f99e918c377b SHA512 36347ce921d781c230dc1a3e050eda72bc1d9e12177bbc68190b5014ac3ca77828534a930665bb4aa2c3988fff04dcd114a80da54075b150790f702648b99fff WHIRLPOOL d93c58f66a844e78669ec015572f475a0baa120e846cf5fc027e4a8a533c34f2a5cdfe2a7b3ad9e961ef64bc93655ef93621af107cd061f547415dae09438847
 EBUILD git-1.8.1.5-r1.ebuild 17197 SHA256 a8e26f49500c3b04fb2256d71fecfa89bb60f78a7c5d748da0e18f1f8771ab73 SHA512 dfce07003e4e9067d47c06d0d584b0f25c64f35962dfed9993441c4c50be3620f91c7d638b95cefa55f2c8bc7f985a290a5d630a08a1555929df0250552428d7 WHIRLPOOL 074ef949c303f3b364163a2d78c5ab34a30352bb6adb8b79d2525b8ee9bd36aa8268e21e02204900f0bc3a0d1169b60fd3080075e5c21a5ac5014f4dce258321
 EBUILD git-1.8.1.5.ebuild 17056 SHA256 58ea9e905febf001a56c5253d504f47125b830e1d7ae5df96a5e9c3a1a01afb3 SHA512 265f76b77027e3e9c1304909f06b9e578a69d3d7b8126b2d5bff734bf7e28a7849289ce01e21545707adde4d36d9663d14f2543d74c11300ba86e9fc2248e500 WHIRLPOOL 6d35fae91695069e94a9ee52916b01b29d9c5b2b5d352e69263ff984d854a5f5f9a90e719cb3a996c904993aaec9e942f1665fc7832c2e7490948d526cbe95a1
 EBUILD git-1.8.2.1.ebuild 17512 SHA256 db2a6516a749afb887266a632576d006b51aba7f908fd00d23e719e3c41609bc SHA512 798852bedc7eebba48957178442a77c87885afe84a6841b89ea0dbf00cc9807f08991de2dbc4c15824b460bda3c8f309ee6444780542cfbef8e4264d51b161a7 WHIRLPOOL 4cf2c58a9933b89d3a80a2e61f374be05970a7b70a8fb6d3fd84c3e58c57b6826396dec7068889bb56c7249ef7d92d452f545902dc686c5223e10d2381e9ab96
@@ -51,27 +54,28 @@ EBUILD git-1.8.5.5.ebuild 18442 SHA256 07a712895990037bb6c584c1cc39ae26c555c14f0
 EBUILD git-1.9.3.ebuild 18401 SHA256 b5c8e8c34f18fe480316a4c1a362f5516c6694f9dcdb21cc701796a02c71095e SHA512 8713955f11876f0de849459d327ecdf5d04d454257683187d55477d73ee12cd592f79f0642aa3bbb7c62ef1cbb3b1eca2877fd169bc0cab748a102cc7ca9d05c WHIRLPOOL 363b60787caee4e3fdc24f444dac781138af6e998db0de0c50715ccc040ace7c4c24b1ebc47e1730a8bf85660494d865f929a85dbda0b394205ce1269c581688
 EBUILD git-2.0.0-r2.ebuild 18416 SHA256 4a4b6a2d9dc34292bc5de120291801f1aaef76a140dfb7b388454ed9b0ce7c44 SHA512 661c1c1393633cf710bb4134221458a2b2afd0532c7bb74a33b3876c1d7b0a1c12a6b0cadfb2bc468697de8c0b4bd58d4acd910c0609be9fc3ef880be6aa7835 WHIRLPOOL c8d43357bff9d69dbdeb60600c416a26b9a7762bc8142fb2d1f1891aedfb130bafca1442b9e93437ba40335989a5c52ec6895db3bcd12108f09b47aa4926223f
 EBUILD git-2.0.1.ebuild 18418 SHA256 725d667f9337a3cd33813a987586c62680adee7c75aaf16f9e0861702a482a2f SHA512 30b39996b243d2a378a32990c8ad428f22cd26e7e7d892f787f61d9234b7e31d2676b09d2489bc48e8595021a139c933196592221f418ee23db8429e5387ecb7 WHIRLPOOL 90c6a8bb73cd933407b838f6d55a9116d699fbb5fc32b4b20eac3d94f5c73fd2310faff1a54c02efdc538aaff175b2bd7f9371b0dff4e26ad728888a4951d1b7
+EBUILD git-2.0.2.ebuild 18418 SHA256 50ff2218e4a371b6f0d4c75420c276355f127cebf4eb2fcf9d400511a3cd6649 SHA512 434d41adfe4ffd425c4470309540fab81d95872db95fbeebf456f10d737fef8f178f3f79c825caea5ec9647496a8709371fc320d5c61f827e3520cc0b05b6bd1 WHIRLPOOL eb2f8b57d54d03c2e46ae361582dc6cfbdc812f658d3e8e6dd303ef966159ee33a329c17612f5593175490f90fce0f8ae0528d871f187d3de3e74c390442ada1
 EBUILD git-9999-r1.ebuild 18429 SHA256 b7a46df58d8db77fdb92dd9d38aa79ec13333663921a9ab5b555669dabbb6243 SHA512 e98f691dfb497c4026de6e809a9e1ead4d2039f62ef8c41535a738a923fed864d718173346765282fd344a5a93f599f97d2ff998c2d12d8cc974ff8a8f5cf5db WHIRLPOOL 236c89dbcedfc91a9a2f5a882eac340736e933e509c232c55ef0ca1c7b1dfab25da817d7afe9a35b3930ad54072b4a93f75b5064a9b7ce1f62ef943673ecd6f1
 EBUILD git-9999-r2.ebuild 18428 SHA256 7949810c2fc4a3a0949f2c6c79a6f0be5576c9bffae0668d15821529cb3fc114 SHA512 1e26eccf828111a432b1b72f4dbae0ff612617b95f4765d63d925aadc5c80cf0fe52c63c3f3614032c8825f2858205f66b9ebc7a1f5fcbd8e9589ea3313d3196 WHIRLPOOL 557acd343e23da274860ce0f1af59d3c9c86069d0690f0441418396ad661b8f50d82d91e0b7dbf951c7247de7232bcdf7867dd4080e5f1ea33dd67a0aed742cf
 EBUILD git-9999-r3.ebuild 18426 SHA256 472e5aba211cc1815a4f0fdc4c2681a0bf18ad00420dd6bd99b0dbe25506a99a SHA512 0cd75f80a7b04bedbefd264ea4dfc2fe9386ef85bef5d95c8f8fd9ae3fc56cd5e99d54d74af10228d33a32ded44d0987803c43dc7d6eb7ed6740d0dece98cf2c WHIRLPOOL 0a3f92bcbdf0475bb9a6c7026543e62e05649645e54c410d713443c033c7f24f30299568f037d3b46995c212c8c087de7acdbdc068f86e49167a5d6f572b6321
 EBUILD git-9999.ebuild 18428 SHA256 b15f3f6c987df2cebeae2537ffafe94d413b1370f620019593b58770b85935f4 SHA512 68d16476f4bef771feebc32caa866a31d60496f99ef18fdbd26a44cd5f9bb7bd2f98505a7d543011781228c02c494e2d91e7194a97d3cafe9424f464565bca96 WHIRLPOOL 5178cd97cdb410c7f3049352ae672a1aeafd913f093e0fd724c4232a9c37f237157ef2cfc0e4453a5610062f1fb355e2374f3bb568cbd430304199fe9017712d
-MISC ChangeLog 16965 SHA256 d73235a292aeaf1825bc7b3134995e6c86b94d96ea0835f72a61d5d5897fb607 SHA512 399c41774591628308a349a4cb43a4c9e0dec42abc23dd288c5d170112ac10d082a71d6c14f69dba92b641ad8a30915aeb68334b550b64703b986c1e1c504a48 WHIRLPOOL 16498a3ba7f52f60c77127f5e8158e055e3366452ba8729eee24388a7c585c006da81325bc8b7cda08eb4198067c58a4261159c8dbc410277c767d30d11456ca
+MISC ChangeLog 17095 SHA256 60239bb03c93a88d02b676cf460b9da79d9855fabe6aad7d0a8fba182c65f521 SHA512 e8c55d44e75e9c776b26eebd7a1deae7ab4030c36c9cb86e1439e18e64b43b073955fb996eeea2969ecc719a9ae8d8f8a353a40e5d5ce44c303defc63e4230c6 WHIRLPOOL 9fb586dca8c7feec0b9b15a83704a38a64dedc3d04e5a31200cc8c6850b3646f12d429e3cc684f74548b7c2d813062161cc9e854b97896d5f5349643b9a5ce64
 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
 MISC metadata.xml 1877 SHA256 74e93a953d9484c1f5806efc9c80bfa729b4d53415a00168e5ffec255750f7bd SHA512 3ef0d74206f67c27b82cefa40602cd33e432cc0f06ce900766d32f1ebd0a71d6cfa750ae77660531fc61a1117f7959d7df6ec10f439cfa2ee372d54d7ac87c5c WHIRLPOOL b9d97eb6b92a1894d965a5e9fbfbfd0d64625b31318fab2eb11b4dcb331133dbf678f62a7216c12b53a2546fa5d6a07c6240bddfa7784a925eafed602a7ffa75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTySlcAAoJEPiazRVxLXTFnKIQANcLv9i5HpQrEnSvFs3Zeja1
-Lfv2EFSUz/hQDUWqm4UcU3Tlw3ga26YwJULV3ODWzCVM8XyZJyh/zHKdHJHwbPwQ
-NEs2Kh7XfCPbKXyjyDbtO+l9dSIZa7EVEVjbkT+4650si1MF8sGGoqhmOWKD8xKu
-tIow7ZkOTXB+sNafZNAt1fB4LfG5QLyiKN94JUP/pqY3tEIV36J6uTiMU5fkOxAi
-79VYiw+U1GMHYt2Z/EC6q5dWAAUlzziPFgLUN8L+RNsN+ojp+/EXVyJkLAssVxMP
-nwnosii54yDV0le4T0otzxiRICG7mo/wFbm+LVRDzY8+trTkAMv1Y2odRDcLg/Pm
-f2qe5yVjhWcJnI5RWyVEXq6ALmleOf4I8W165luH64k+H3rVAlV+VyTFENEGDQts
-6lTBjFIK230TwvUd1A5wt+3IViG1vvXE3HtXQsnclbOeuAhs9RK0PKKD0WUIR8Am
-wQGZo8U4G3hXoujDM/kBzfvJrOYkQx+kwUv3S9l6JsGEf3nyNweI0QejTBFQs+jL
-ZvkbLUCFimzoS8NppIDe7quo8EMaQe2gcinWg3mBqt9ojQw5Z3ls+tjPQsgna7iM
-Qc6zftR+WmJeRz6WC8KzwDrHZWk4FdAwApYL/R75BoAjhkYV70YzBuacR29GSnhY
-TiG4b2aMXwkkTOIkeAKA
-=wlhp
+iQIcBAEBCAAGBQJTzDMuAAoJEPiazRVxLXTFhAAQAMOTPb92zZ0HKCBIzl9AQSMr
+XhdcR6MDwhOSwkaRorzXkEjUJ5G3NLzZ3FZSv3YGqSEcGHv4/cDtNIlwIDzvQNUm
+gtKMfM7aB4FYhDcomW3QWXjNo8ATmdcqCikAyuEDf4UTtcu946RK1i+gGX5glycE
+mpSGTovNVeVHfloGm3R9CrLiqKdSwWfMKhrnyaTWhTx0MFpoZr2jPiVYkqbb3UNE
+BYImHB0kYNkwYte34Tkq7x4J7fv/L1OPeGJSpz1s4Y408UIhTfS4aVMHle7C1PAR
+sFLKwX0Lle4f48Et+mV7uXVTa+B0MbQcB770IPnH7O6XssOkVfhfYvyXwG9+4I6U
+8YA/0AWCzgA2h+qxpWtpYfAmWUZZ6VIYoEK3JeNOC/02WFrjkTUiL66UliUXpSKq
+DeTX1KWa6xdKnRtZtvq9IaX521wn6nIiKtyc9ySl4T/F/LV/VyezEL4sjP+7h0Rt
+FPd90lM3S0Z8R8ltWuSTjXA5ZCA2FxAn9XepqifsHB2kMXREOCbMuwI9AHnVq4XH
+nnzgC9Hh0e7OtZ8R9avzS3GOMbRd6BNS8yJupYJc9vxrr60RNnSYzKS0zYoJZDZk
+DQK9oCTuzP1/6QAvQt+GqSl0YRZXj8u/yPyBZIim7NktK7NZwCxZRLwHKCHqZVJ4
+WRvWEozlyhcqZC1UHjEY
+=5wKT
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-2.0.2.ebuild b/dev-vcs/git/git-2.0.2.ebuild
new file mode 100644
index 000000000000..33b4b989a225
--- /dev/null
+++ b/dev-vcs/git/git-2.0.2.ebuild
@@ -0,0 +1,644 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.2.ebuild,v 1.1 2014/07/20 21:22:53 polynomial-c Exp $
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_{6,7} )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+EGIT_MASTER=pu
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+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://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_GOOG="http://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	dev-libs/openssl
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	mediawiki? (
+		dev-perl/HTML-Tree
+		dev-perl/MediaWiki-API
+	)
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
+		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
+	)
+		${PYTHON_DEPS} )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+	gtk? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# 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 blksha1 ; then
+		myopts="${myopts} BLK_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"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${myopts} NO_EXTERNAL_GREP="
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use nls \
+		|| myopts="${myopts} NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use pcre \
+		&& myopts="${myopts} USE_LIBPCRE=yes" \
+		&& extlibs="${extlibs} -lpcre"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use python \
+		|| myopts="${myopts} NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
+		|| myopts="${myopts} NO_PTHREADS=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${myopts} NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	epatch_user
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		V=1 \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
+		git_emake || die "emake credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		git_emake || die "emake git-credential-gnome-keyring failed"
+	fi
+
+	cd "${S}"/contrib/subtree
+	git_emake
+	use doc && git_emake doc
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	if use python && use gtk ; then
+		python_doscript "${S}"/contrib/gitview/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	cd "${S}"/contrib/subtree
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	cd "${S}"
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	fi
+
+	# git-diffall
+	dobin contrib/diffall/git-diffall
+	newdoc contrib/diffall/README git-diffall.txt
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/gnome-keyring
+		dobin git-credential-gnome-keyring
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		use doc && doman svn-fe.1 && dohtml svn-fe.html
+		cd "${S}"
+	fi
+
+	# remote-helpers
+	if use python ; then
+		python_scriptinto /usr/libexec/git-core/
+		python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
+		python_optimize
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# credential/gnome-keyring TODO
+	# diff-highlight - done above
+	# diffall - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		buildsystems convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		stats vim workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9402-git-cvsserver-refs.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh \
+					t9604-cvsimport-timestamps.sh"
+	local tests_perl="t3701-add-interactive.sh \
+					t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh \
+					t7106-reset-unborn-branch.sh \
+					t7501-commit.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	einfo "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}