[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

[Robin H. Johnson]

commit:     cc7a4fddf71429175b0c8d6a5029a426eca16dbe
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 00:56:00 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 00:56:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7a4fdd

dev-vcs/git: cleanup vuln versions per bug #577482.

Package-Manager: portage-2.2.27

 dev-vcs/git/Manifest          |  15 -
 dev-vcs/git/git-2.4.10.ebuild | 637 ----------------------------------------
 dev-vcs/git/git-2.5.4.ebuild  | 641 ----------------------------------------
 dev-vcs/git/git-2.6.5.ebuild  | 641 ----------------------------------------
 dev-vcs/git/git-2.7.1.ebuild  | 661 ------------------------------------------
 dev-vcs/git/git-2.7.2.ebuild  | 661 ------------------------------------------
 dev-vcs/git/git-2.7.3.ebuild  | 661 ------------------------------------------
 7 files changed, 3917 deletions(-)

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 4a0fa54..7047e3c 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,31 +1,16 @@
-DIST git-2.4.10.tar.xz 3695176 SHA256 
b631b2b26f5593833a29cd833b8071b4eaf7b212fba180e587b526f51c2331df SHA512 
08f7f63fd4820f155aec08373fd4f5abbe5a4c8f98a73a824897ba68901fb274b4cf47b8751cd2bea358cbb9c09934f7857aa440de69b46ee88a4bba852f5ced
 WHIRLPOOL 
3ec53b7355f1895c95b91e1fa85f185801acdb0317384099e4d7914208c3d762d536ed83e099c96a168d696e37e3f8a491459de59c7dd59dce9c49fb75af836b
 DIST git-2.4.11.tar.xz 3695028 SHA256 
ebca2cf93b7200d6d7b9982e3e9857f0b433a05e51338a600c799e97919118e3 SHA512 
34c60fa67e336a4c807a5f49e26083442acc52781b0adbd3f9d96b9594c0688686b30ca3a152621047489d59beb65ad99089a2f02cc589d6e3b36a79db1388fe
 WHIRLPOOL 
75e6b3090560e7aef4fcb382413a7432ecb63880a4139466a64dd06d4777441afd34c208a59dba9a01144f0c2f3a3763a267672f9f7155867b462b4c0bf09cba
-DIST git-2.5.4.tar.xz 3747552 SHA256 
e08d2d384e1c8c474d336c3583ed5cd396c76455155a4e65bfa97699fc38472a SHA512 
25964bc59301b11994c94bab618613bc87ef788d356af55a26c77861a939f2b67cf37be98199e81d5c2a63e8d9c043b4fc6fb481316cc4d8bb6a1f382eddf33e
 WHIRLPOOL 
e62efd86c5e0d1b040816978cc28a41d00a7c095513482b0df1d4addc87bd89ce20dbb1b77e3ec3d9bd0722de3237e451b05f687fdb6419fa419708921049222
 DIST git-2.5.5.tar.xz 3747448 SHA256 
82976a05dd85d44405ec9758040dd190507494fa2af322bd2c97163024ce1e82 SHA512 
edf223df92298a3d25865140b4a2c2194840b21f96c13e07ac35940d6afa759f766e4d36ad2e2428ba913c4949b4f76283475a6b7aa1cc774523c793cb5794f1
 WHIRLPOOL 
3ab15f8a0bc54d3865537bc70c9a0d6e3d8f30b9ba8c68c2dadbd77575f892f55e0e010b9ac89af03ca228f034abbccac53a619865c1e8044f61dedef8713501
-DIST git-2.6.5.tar.xz 3822016 SHA256 
07ce40131821c42fbcfa8f989b384f30f64f3665c06e8b2c2e2077d730777db5 SHA512 
c71a1ad80eced40b007d9a6dc10d081fcf5b9b384f20d5db2e3a2646191838070369b96c172a66d86eaa488634bd4adbe0840f0c4dade51a45eba2fd3a0870a5
 WHIRLPOOL 
331e8422cdaf0376ea6ff15f8b7abc2d14355fda9871ad8928fd7d46df3cd88e94702da243c5032e1e1e364def92b3fd8b852e8b7aaa98a69bb20599417ba50c
 DIST git-2.6.6.tar.xz 3822260 SHA256 
8d53410d60f9c36b0f34c125076634d068c8d812f4143fa10b7130cd7acf7ec2 SHA512 
5c77f83f34296f85d1b1f1bf00a59664bced9db7ad222606471d8400772441775b82fdbfae637aa11006164c4fc9912b8218aa2f6f7812112048902ecf5f0000
 WHIRLPOOL 
ffc6d10b166b3d0ff1e51fe44a6809877b2d4a9679fc519b7648897621ea02616e330ae46693a2f306286b40c0b41589b20bc93e240b87d535ac5b9b84b28738
-DIST git-2.7.1.tar.xz 3905876 SHA256 
477a8137de342f858d364383266e9551e582718e96b34051a6aaef57606d6bfe SHA512 
968a77ed2dd0118a55fdc0715c1dad3edbef59cad15d57d1cd6f8385636480746bf8f934e5bbf4e7cf2264cb59f387260a10e851f0b4a54b0b959e19e8856dbb
 WHIRLPOOL 
9cb5e59eb8dfbad56b6046fac69dcd0e3588558a30c5c8d67499b75afbd4bddf2053bd1907c584a984649b40ae7f67d659ac9abe6658b2d93d4fafcc1042e3ed
-DIST git-2.7.2.tar.xz 3907296 SHA256 
b20479ce523031c37581b763b4442b25b9d606f2f416049aea4e463dc150cf20 SHA512 
fa139b10d134742efa74707ca77111463656000fd3fae52752eb5af1e56b57d9a2a6d21e6c23085af8db830b811387435fe95c1310b28ef280630e99e432fc79
 WHIRLPOOL 
f4b570afb846c01110ee95ee4c9d8104e6ebb65c82e0a81bdf87b08e6f81ae6861e4292840ac6ad18463007134778d12d306a6e8a067c811a0342c4869e7d6ef
 DIST 
git-2.7.3-00-9831e92bfa833ee9c0ce464bbc2f941ae6c2698d-lose-name-path.patch 
28198 SHA256 b6bf7d67b9cc4d34550a10933af63b665b136b869dbbe23ad3ece0d463f027f9 
SHA512 
3fd64b0d6b53d5b08b791195e6edc162db682fc8a1bafc04aab7a7a4e61e2db4b3b84d9f769e0d7756da2739bdd900e30a233c228706c39817e42e309c36684c
 WHIRLPOOL 
7e1d9337d46222ea4ae2164429a6a220adb0f763bdde6722c0f2adf79789e092f5cfb74b932597b8d3971af4fc27dede1fea51b9cb72b44ec8e30bd78bdaaa8d
 DIST git-2.7.3.tar.xz 3909636 SHA256 
89c467912d4740da2b40288f956251f0a1e276e28eecd28a6d776067103629b6 SHA512 
f7acbf52d12f39d323bd90a82c7135aa2aacf2661f7087c71b41dbfbec688342e0a2fc061fc0f216848a538a0dbc4fce68e24ea2a26e747f5eb92f763fa5bc72
 WHIRLPOOL 
5cc261749f91c2e0b0509d2fac1bc7426b3ddcc37e859d4f524838e1dd471071ad430886751933bae57aafc20bdcf3f9a43f4c018cc9c89610134a5203b22447
 DIST git-2.7.4.tar.xz 3909636 SHA256 
dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b SHA512 
82a646140834e909bf1748a017e86f37f0711c759fe0a6ad03529beb57c79742cb7bf77c2dba29ccd84fcf3d5f18ad9c85c00f002d3b257be42e058750423da7
 WHIRLPOOL 
74532038b6ba95a5354f43ebad00a9c159c495d46e7dc1b8a2a59f5a86e149538190d9800144a719dcc00e28cfea1039cd5dbfb67fd5aac5e7d0998d3231bae3
-DIST git-htmldocs-2.4.10.tar.xz 996588 SHA256 
f2c523ea114caac7c5cf51a20a420a215411762fabff2da9febfc2917af835ef SHA512 
60fc5a2b6665ec7fc10680608b5689a24fa211fe7393f010a8099c6fb0a9582f20cebc7cad0653b62750677d79a80fcd6e8e96fb440acb3fc7c7c0ffc00779d3
 WHIRLPOOL 
30585753a7b08dfa812c74832d35168d3615d8bf71c3c853efb125348538b5fb7cc4b3f1cfef725082ade144b5362394991186967f6026cee8c91dd41e30290e
 DIST git-htmldocs-2.4.11.tar.xz 997132 SHA256 
2764af41b319f4d11b29832de4bd05392f2887d9a1d3c56c864fb081920eac97 SHA512 
d5d2abae9cc303fe8ebeb72ae7078d44db94610d549ca03afffcbbef8b611efda662677423d9ff97a0c7a2384bbd4c3468b01a2ecd7b68f4fdc89e62ad688eb4
 WHIRLPOOL 
66cd4fc754be7c103ca58a030d4799ba988792419a426e85a39805172e6329ec617b3561696dc74be36801cca0b17a26102a194a1a58d6c7b9ee1ab17752c4a6
-DIST git-htmldocs-2.5.4.tar.xz 1009820 SHA256 
cb36b3b7198a3fa49f2677bba83f1e57a1a40250a181d9e86232cb8febcc8053 SHA512 
af833635632ba5c65524bfef00f291a41fd37ba7bd9ca4b65b4c0eb9329b888d2e8757fe29f33bd25a75e1841d67a20dff49f43d35a502ef3b29599d073dcd6a
 WHIRLPOOL 
e5f55c3dbdf69d946295c5c19b95a79168d34645ced8e6a837ec8b5dd948008487288159f63a2f81a36fbdf3f413d3fdefd008b0157785df37431ccb9127284e
 DIST git-htmldocs-2.5.5.tar.xz 1010216 SHA256 
15de2f234cf419496399f7ad396709544d62537488a8e5200e6e34b0f1a685e7 SHA512 
265ddf3835352f85eb2e2ee983eb8aaf37bc7b151968866bdb8b9bb6782cdb72dbd1fefe5d7f694a6825954d49bcf4c799e8bcb4e3b25e3f228f6f97f041fd9b
 WHIRLPOOL 
90da44c0bdb6f9ff428d1673289e612936ed5f26110cd13d155c8cbef8433b13bd8b15cea88f967224a699e4c3a6ac41d70b67be1b25c4d35989879626eb10ad
-DIST git-htmldocs-2.6.5.tar.xz 1021516 SHA256 
40b5ee75a69d834005b36dd190dc0164124593cca233391774a3a9c82af88de5 SHA512 
dc796bbe54104821c8be8a7475039a8a6b207d3e3bd20b950d786b02c824801e3f915389af7c267b83800ed2e0d1b037fb543d6c0f942f887c715a361a589728
 WHIRLPOOL 
3abd96db7ed3368a8903ff89265c6a44c8e5a2127695edca6bdc2511a27dd45c546016400f926c367030602828329a194fc2683785f25c7833c18c9f32ea57f1
 DIST git-htmldocs-2.6.6.tar.xz 1021856 SHA256 
897fb0bc7e2eb67a4b582c963f337fda3a6ad2b23bca55e27f23f7d15bad7c5d SHA512 
85dcd8514e1ba2cb591512a0003aedf25eafbf185ba1eed01f8adfd9eb467d29b17108e6b087183004004ab17301316d403cd6762619ac2a030a565ea5c776b3
 WHIRLPOOL 
3cd964f1d0164db98e97e0097813a620911adadd9c50837e23a5ca79eb0f2d988aa68317b5b79fa7b052900564657c36d050e75841a1018d5ff12e1299c01dc6
-DIST git-htmldocs-2.7.1.tar.xz 1030484 SHA256 
9a9b857fb28fef8ad2fd780b263331f2f5d3f09338c64bd902f8a5ec03bbfc89 SHA512 
b97223f7fec21d254f0b1b2407341b84d03ec23ed38e3042541e9cb2e2d847a856524e9e5751d2ff4a00c32f0f02ee667e376c3a6ad00252d6b6bee0dde1af4e
 WHIRLPOOL 
42ba0d194a77d5074f57a6936a72a7f4dbd0cbda0d620eb22fc04ea5ef1d0016d777dbf1e9a06265424f870c0241ef6f79e310f758c90ebf081d05b926e810b0
-DIST git-htmldocs-2.7.2.tar.xz 1031152 SHA256 
fabf3afa674931c70d6bb2e37497b46046f554c8d5520f0ccb126ce5e748f724 SHA512 
ae925a416cda4a28e9c48ca9178ece7c2e6db20c79c00512a0e3fbe15e2fcc965ec37b848d4b613da2ed10cfaabdaa01f2272c3ca43f5ebac229d3bc44354854
 WHIRLPOOL 
03b6b194d2f30003370eee4ecbf7155037564fb4afa9aaa9d0b3c282d8ca77db139de22a5317db0b3858e054e803f0ebe5cc225895aacbc10fa7ff76d590c653
 DIST git-htmldocs-2.7.3.tar.xz 1031848 SHA256 
f71f5e8e1a6103e83ea794f367bc419a1d14ba0f79ebacdc81b3b9430714adea SHA512 
50de5d9d3c0f6d874a6a4bc3b247a1795b1bcf154a276b546f88c3b5f5fb2eb27212d207a4bb50c04cba36d8537853afd25816addfb87c9a50e18528d93586fe
 WHIRLPOOL 
057d9bebfe51c29a0a7f689baa9873cb6a54feb1d2869c541396902b160379c9220c5de79a4cb59c6e804e5c7557c0fd141b89621b97d3b495dc6e0a77c67a9f
 DIST git-htmldocs-2.7.4.tar.xz 1032428 SHA256 
3fae21e2e68104621ea1405be73192b46bf3ef29bbc248a81b1e7e6fcf5acfad SHA512 
f05b7b8a4dd4abe23f7e51982e9c33026aa31610ac8640028aeae6b310b70b764aee9a81fa702ed0712ccf1b7ad897e06163eb5c5246c14f6cce7c5f4e462682
 WHIRLPOOL 
87fc486d182a4b72fd906105fefcc53b722c4ae6832b290cd6f759ac1eca7ebfbbe7c0e72c1d7b5ef3581d19d7576f1d0387d6e5b0a33d960d57f59ee61a7869
-DIST git-manpages-2.4.10.tar.xz 373968 SHA256 
da712c07d84bb3da10be9fb56c15289c77828d3011179ab71f090e77e52a03d9 SHA512 
d5a978109db70f3d50d02ad17c93229206f2d5a2dd3dd7e9fb266ca7b76b85ad92f63120df885b88b5a33fe1dce0686ae92fc50749cb3b6275cb48812eb031a9
 WHIRLPOOL 
decb0b5bf81b25e4562f639e03c2b60b0c470338be0ac298f3d62deb54538de0961a81c6a8ced17ef5877df6de5c17b49fe96e77f00dd2038d2d1189c8f48e7c
 DIST git-manpages-2.4.11.tar.xz 373956 SHA256 
0a1fff7650e635339f92985a47198f5f6664eda1c233c3cf48e92f22c3735db2 SHA512 
78226baf1c8be28c456a84b06f403af9b918cd3e46218917cce18b3b9ce494600bf00014b818ca0dff9f675aca8b17cd9f7893c7063e218d719a9567e81d9040
 WHIRLPOOL 
f8883ca7d327c378937f62287cbb515b5271cb8aeda18d32135f1c7ea71c9f39282fe55b191476f046de4815a994e4f6f98696d9353f0bfcca7994101398786c
-DIST git-manpages-2.5.4.tar.xz 378296 SHA256 
bdd8db3b8cd35d01b2631d1f3c1174e5bc1b62b3e0177ae1954d83743aa93ea9 SHA512 
ccd675d8d9c117042083800fa4ae7a876a7873cf13844c92f731e46553d316a949d445c80e4b57824792a6b369623085053d25baeb4f8b79801b5849f06eb084
 WHIRLPOOL 
a2149da3217826c1c4951aa0fa0900e388ea806511559d0e01c4e17a565470048e55e988b12e6da3d7b52b11d410d27b4da0cac4d2d88e3f6860f22664cd8ac9
 DIST git-manpages-2.5.5.tar.xz 378304 SHA256 
41b66002436add0781618764c3f0c8222bac7d8a636f1d7e2994480b22369930 SHA512 
bebcc04fa54080316d01f1bd1ba7b91a1712e6c6a6f95306d9f079cf5858cf0fb2ccea24c606153e9adb99e956c5dbae5a5c7a7a0ed8c643efdf5a5db599cda1
 WHIRLPOOL 
e72873d3f1a404a311e643d89cf65996d884e794e468417272cdda494ef621f0ebf875faa17433e443fcece54608c59a3c094372101bf4342fadcf8395dabce8
-DIST git-manpages-2.6.5.tar.xz 381620 SHA256 
7b0800c0e3d6a7370413ee9ded8466158170a1635dfd434cec8e2d168e5038ef SHA512 
c370811ced1b481e66efeb3f5efb00a5091183d3125e2796b883e6f9e1dfb82032ad303eca5a9380882227aab8c63fe0d5c80dfd80228aaa29d7c7ab6afae9b4
 WHIRLPOOL 
211866bd59f537bd9ba8d51d037b76f3054afee254d92708137105e7360647d244c3558a70254a94ea99cf96397a5d794ff3b80d893d67e1032abbb18e28b11c
 DIST git-manpages-2.6.6.tar.xz 381588 SHA256 
0f64c1db015e3c74e56eef646a9fdd456cf043cae54714f404ad9b35ddb537a0 SHA512 
bd8573f58bd988f78978041b88643e6d0af99ae0df4be6ec80db7de6e042970a23d9a153e84ddb8ffc538724b1482ff6dac7594462e28073067f54d040fdddfd
 WHIRLPOOL 
3e8af6df1b96e3211c5799ace846dab331f30c1133c1d093e344b4576d8f588631e29187909b600112a9f7b42a0de63f56cec953e0d162cc49c2b6efeef0db53
-DIST git-manpages-2.7.1.tar.xz 384468 SHA256 
e6091a4f13f199109e19ef689b5028337419ed7fa5a9dd284d55efda72751e2d SHA512 
b0c0469ce9163e10122e5fabb5a39a1b6faa0a1bbe2c24365aae8f02bebb37e9954d477a02be71737510fd82393c4e0aaa7a4cc1caeda3f93735446ee951923e
 WHIRLPOOL 
c87331b7e03dad33239cb1bc36d443fb3e5bac3d2cee36cf825b5bd554b72b532af1136b000b1d82b5d4203b7679dd9c263f9b91a4882961aa7dc472dc1b13d9
-DIST git-manpages-2.7.2.tar.xz 384440 SHA256 
19a6254a34da516e1ec67bfcbc6da7a1483440a2e8416b30e736f96c3404ff4b SHA512 
b99015148706097bc2a8ca0a885473233fc7e1e3846290d456311058853da205f30175b7c158f67e70ea98fca2dac8c2d6844e73db5a51bea1e57d770bc7a15f
 WHIRLPOOL 
dc2f751327520077f48d2cc3b5dc82160c968ee91fbffff9b9717be0096bd2d926d325f2eed42fff0574b22c2d1cf41713f0ce53fb4ee7b4d1842e4a4a3230da
 DIST git-manpages-2.7.3.tar.xz 384544 SHA256 
9f088427c61a9e0a840007c7f50fc6f7caba36ac8c403460c49210983090496d SHA512 
883441df049bfaf0f22cf9d17041125dc9c8f0e7d94efa7a4188a68c2242d1b4c3d34fd3bd3ecdd2af905ee2f8fb5fefd0ce6328dd76c665f7ec20e3b9c87d1b
 WHIRLPOOL 
7ee013444665366ecb8f3df507a3c5af8a9f48d3185783a94db827b192c32ac6998157eb42bcbfe397f96d452451b2416c32e2dffbabc71062422e7c5e25c184
 DIST git-manpages-2.7.4.tar.xz 384460 SHA256 
d04fd81ab8aa32efbe54acd27ab5c88ef4ab615313e4cdfa793dd0065899ce25 SHA512 
1af6f0d9fc3945a5a215092caabd0963f3eaa35c5f3b0270861b625bf7bd88e4fdea9b3e50ce1b10c79a12ee2b06b203fab4aa9d566560535c1decf7b2d987cd
 WHIRLPOOL 
38306b6e198336dd3c75a9fd032b636e0e43a3b75eba2746d2d42c3752cf7405b1f8572199748509974d68bfc77c74fbea52626884f9b509d8b593cefce4aad5

diff --git a/dev-vcs/git/git-2.4.10.ebuild b/dev-vcs/git/git-2.4.10.ebuild
deleted file mode 100644
index 7302748..0000000
--- a/dev-vcs/git/git-2.4.10.ebuild
+++ /dev/null
@@ -1,637 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_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="https://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 arm64 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"
-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:0=
-       sys-libs/zlib
-       pcre? ( dev-libs/libpcre )
-       perl? ( dev-lang/perl:=[-build(-)] )
-       tk? ( dev-lang/tk:0= )
-       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/DateTime-Format-ISO8601
-               dev-perl/HTML-Tree
-               dev-perl/MediaWiki-API
-       )
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-                       cvs? ( >=dev-vcs/cvsps-2.1:0 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}
-       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+=" BLK_SHA1=YesPlease"
-       elif use ppcsha1 ; then
-               myopts+=" PPC_SHA1=YesPlease"
-       fi
-
-       if use curl ; then
-               use webdav || myopts+=" NO_EXPAT=YesPlease"
-       else
-               myopts+=" NO_CURL=YesPlease"
-       fi
-
-       # broken assumptions, because of broken build system ...
-       myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-       myopts+=" INSTALL=install TAR=tar"
-       myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-       myopts+=" SANE_TOOL_PATH="
-       myopts+=" OLD_ICONV="
-       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+=" NO_ICONV=YesPlease"
-       use nls \
-               || myopts+=" NO_GETTEXT=YesPlease"
-       use tk \
-               || myopts+=" NO_TCLTK=YesPlease"
-       use pcre \
-               && myopts+=" USE_LIBPCRE=yes" \
-               && extlibs+=" -lpcre"
-       use perl \
-               && myopts+=" INSTALLDIRS=vendor" \
-               || myopts+=" NO_PERL=YesPlease"
-       use python \
-               || myopts+=" NO_PYTHON=YesPlease"
-       use subversion \
-               || myopts+=" NO_SVN_TESTS=YesPlease"
-       use threads \
-               && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-               || myopts+=" NO_PTHREADS=YesPlease"
-       use cvs \
-               || myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#      if [[ ${CHOST} == *-mint* ]] ; then
-#              myopts+=" NO_MMAP=YesPlease"
-#              myopts+=" NO_IPV6=YesPlease"
-#              myopts+=" NO_STRLCPY=YesPlease"
-#              myopts+=" NO_MEMMEM=YesPlease"
-#              myopts+=" NO_MKDTEMP=YesPlease"
-#              myopts+=" NO_MKSTEMPS=YesPlease"
-#      fi
-       if [[ ${CHOST} == ia64-*-hpux* ]]; then
-               myopts+=" NO_NSEC=YesPlease"
-       fi
-       if [[ ${CHOST} == *-*-aix* ]]; then
-               myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-       fi
-       if [[ ${CHOST} == *-solaris* ]]; then
-               myopts+=" NEEDS_LIBICONV=YesPlease"
-       fi
-
-       has_version '>=app-text/asciidoc-8.0' \
-               && myopts+=" ASCIIDOC8=YesPlease"
-       myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-       # Bug 290465:
-       # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 
'st_mtim'
-       [[ "${CHOST}" == *-uclibc* ]] && \
-               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.2.2-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 "${FILESDIR}"/git-2.2.0-svn-fe-linking.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 \
-                       || die "emake 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
-               # by defining EXTLIBS we override the detection for libintl and
-               # libiconv, bug #516168
-               local nlsiconv=
-               use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-               use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-               git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || 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}
-       bashcomp_alias git gitk
-       # 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
-
-       # 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
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # completion - installed above
-       # credential/gnome-keyring TODO
-       # diff-highlight - 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 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
-
-       perl_delete_localpod
-}
-
-src_test() {
-       local disabled="" #t7004-tag.sh" #520270
-       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
-}

diff --git a/dev-vcs/git/git-2.5.4.ebuild b/dev-vcs/git/git-2.5.4.ebuild
deleted file mode 100644
index 67716d2..0000000
--- a/dev-vcs/git/git-2.5.4.ebuild
+++ /dev/null
@@ -1,641 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_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="https://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 ~arm64 ~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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv 
libressl mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd 
cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:= )
-       sys-libs/zlib
-       pcre? ( dev-libs/libpcre )
-       perl? ( dev-lang/perl:=[-build(-)] )
-       tk? ( dev-lang/tk:0= )
-       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/DateTime-Format-ISO8601
-               dev-perl/HTML-Tree
-               dev-perl/MediaWiki-API
-       )
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-                       cvs? ( >=dev-vcs/cvsps-2.1:0 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}
-       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+=" BLK_SHA1=YesPlease"
-       elif use ppcsha1 ; then
-               myopts+=" PPC_SHA1=YesPlease"
-       fi
-
-       if use curl ; then
-               use webdav || myopts+=" NO_EXPAT=YesPlease"
-       else
-               myopts+=" NO_CURL=YesPlease"
-       fi
-
-       # broken assumptions, because of broken build system ...
-       myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-       myopts+=" INSTALL=install TAR=tar"
-       myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-       myopts+=" SANE_TOOL_PATH="
-       myopts+=" OLD_ICONV="
-       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+=" NO_ICONV=YesPlease"
-       use nls \
-               || myopts+=" NO_GETTEXT=YesPlease"
-       use tk \
-               || myopts+=" NO_TCLTK=YesPlease"
-       use pcre \
-               && myopts+=" USE_LIBPCRE=yes" \
-               && extlibs+=" -lpcre"
-       use perl \
-               && myopts+=" INSTALLDIRS=vendor" \
-               || myopts+=" NO_PERL=YesPlease"
-       use python \
-               || myopts+=" NO_PYTHON=YesPlease"
-       use subversion \
-               || myopts+=" NO_SVN_TESTS=YesPlease"
-       use threads \
-               && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-               || myopts+=" NO_PTHREADS=YesPlease"
-       use cvs \
-               || myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#      if [[ ${CHOST} == *-mint* ]] ; then
-#              myopts+=" NO_MMAP=YesPlease"
-#              myopts+=" NO_IPV6=YesPlease"
-#              myopts+=" NO_STRLCPY=YesPlease"
-#              myopts+=" NO_MEMMEM=YesPlease"
-#              myopts+=" NO_MKDTEMP=YesPlease"
-#              myopts+=" NO_MKSTEMPS=YesPlease"
-#      fi
-       if [[ ${CHOST} == ia64-*-hpux* ]]; then
-               myopts+=" NO_NSEC=YesPlease"
-       fi
-       if [[ ${CHOST} == *-*-aix* ]]; then
-               myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-       fi
-       if [[ ${CHOST} == *-solaris* ]]; then
-               myopts+=" NEEDS_LIBICONV=YesPlease"
-       fi
-
-       has_version '>=app-text/asciidoc-8.0' \
-               && myopts+=" ASCIIDOC8=YesPlease"
-       myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-       # Bug 290465:
-       # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 
'st_mtim'
-       [[ "${CHOST}" == *-uclibc* ]] && \
-               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.2.2-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 "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-       epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.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 \
-                       || die "emake 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
-               # by defining EXTLIBS we override the detection for libintl and
-               # libiconv, bug #516168
-               local nlsiconv=
-               use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-               use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-               git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || 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}
-       bashcomp_alias git gitk
-       # 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
-
-       # 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
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # completion - installed above
-       # credential/gnome-keyring TODO
-       # diff-highlight - 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 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
-
-       perl_delete_localpod
-}
-
-src_test() {
-       local disabled="" #t7004-tag.sh" #520270
-       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
-}

diff --git a/dev-vcs/git/git-2.6.5.ebuild b/dev-vcs/git/git-2.6.5.ebuild
deleted file mode 100644
index 67716d2..0000000
--- a/dev-vcs/git/git-2.6.5.ebuild
+++ /dev/null
@@ -1,641 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_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="https://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 ~arm64 ~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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv 
libressl mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd 
cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:= )
-       sys-libs/zlib
-       pcre? ( dev-libs/libpcre )
-       perl? ( dev-lang/perl:=[-build(-)] )
-       tk? ( dev-lang/tk:0= )
-       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/DateTime-Format-ISO8601
-               dev-perl/HTML-Tree
-               dev-perl/MediaWiki-API
-       )
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-                       cvs? ( >=dev-vcs/cvsps-2.1:0 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}
-       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+=" BLK_SHA1=YesPlease"
-       elif use ppcsha1 ; then
-               myopts+=" PPC_SHA1=YesPlease"
-       fi
-
-       if use curl ; then
-               use webdav || myopts+=" NO_EXPAT=YesPlease"
-       else
-               myopts+=" NO_CURL=YesPlease"
-       fi
-
-       # broken assumptions, because of broken build system ...
-       myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-       myopts+=" INSTALL=install TAR=tar"
-       myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-       myopts+=" SANE_TOOL_PATH="
-       myopts+=" OLD_ICONV="
-       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+=" NO_ICONV=YesPlease"
-       use nls \
-               || myopts+=" NO_GETTEXT=YesPlease"
-       use tk \
-               || myopts+=" NO_TCLTK=YesPlease"
-       use pcre \
-               && myopts+=" USE_LIBPCRE=yes" \
-               && extlibs+=" -lpcre"
-       use perl \
-               && myopts+=" INSTALLDIRS=vendor" \
-               || myopts+=" NO_PERL=YesPlease"
-       use python \
-               || myopts+=" NO_PYTHON=YesPlease"
-       use subversion \
-               || myopts+=" NO_SVN_TESTS=YesPlease"
-       use threads \
-               && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-               || myopts+=" NO_PTHREADS=YesPlease"
-       use cvs \
-               || myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#      if [[ ${CHOST} == *-mint* ]] ; then
-#              myopts+=" NO_MMAP=YesPlease"
-#              myopts+=" NO_IPV6=YesPlease"
-#              myopts+=" NO_STRLCPY=YesPlease"
-#              myopts+=" NO_MEMMEM=YesPlease"
-#              myopts+=" NO_MKDTEMP=YesPlease"
-#              myopts+=" NO_MKSTEMPS=YesPlease"
-#      fi
-       if [[ ${CHOST} == ia64-*-hpux* ]]; then
-               myopts+=" NO_NSEC=YesPlease"
-       fi
-       if [[ ${CHOST} == *-*-aix* ]]; then
-               myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-       fi
-       if [[ ${CHOST} == *-solaris* ]]; then
-               myopts+=" NEEDS_LIBICONV=YesPlease"
-       fi
-
-       has_version '>=app-text/asciidoc-8.0' \
-               && myopts+=" ASCIIDOC8=YesPlease"
-       myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-       # Bug 290465:
-       # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 
'st_mtim'
-       [[ "${CHOST}" == *-uclibc* ]] && \
-               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.2.2-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 "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-       epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.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 \
-                       || die "emake 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
-               # by defining EXTLIBS we override the detection for libintl and
-               # libiconv, bug #516168
-               local nlsiconv=
-               use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-               use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-               git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || 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}
-       bashcomp_alias git gitk
-       # 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
-
-       # 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
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # completion - installed above
-       # credential/gnome-keyring TODO
-       # diff-highlight - 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 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
-
-       perl_delete_localpod
-}
-
-src_test() {
-       local disabled="" #t7004-tag.sh" #520270
-       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
-}

diff --git a/dev-vcs/git/git-2.7.1.ebuild b/dev-vcs/git/git-2.7.1.ebuild
deleted file mode 100644
index aad8604..0000000
--- a/dev-vcs/git/git-2.7.1.ebuild
+++ /dev/null
@@ -1,661 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_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="https://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 ~arm64 ~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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv 
libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk 
+threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:= )
-       sys-libs/zlib
-       pcre? ( dev-libs/libpcre )
-       perl? ( dev-lang/perl:=[-build(-)] )
-       tk? ( dev-lang/tk:0= )
-       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/DateTime-Format-ISO8601
-               dev-perl/HTML-Tree
-               dev-perl/MediaWiki-API
-       )
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-                       cvs? ( >=dev-vcs/cvsps-2.1:0 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}
-       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 )
-       mediawiki-experimental? ( mediawiki )
-       subversion? ( perl )
-       webdav? ( curl )
-       gtk? ( python )
-       python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-       # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-       # install mediawiki perl modules also in vendor_dir
-       # hack, needs better upstream solution
-       "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-       "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-       "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-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+=" BLK_SHA1=YesPlease"
-       elif use ppcsha1 ; then
-               myopts+=" PPC_SHA1=YesPlease"
-       fi
-
-       if use curl ; then
-               use webdav || myopts+=" NO_EXPAT=YesPlease"
-       else
-               myopts+=" NO_CURL=YesPlease"
-       fi
-
-       # broken assumptions, because of broken build system ...
-       myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-       myopts+=" INSTALL=install TAR=tar"
-       myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-       myopts+=" SANE_TOOL_PATH="
-       myopts+=" OLD_ICONV="
-       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+=" NO_ICONV=YesPlease"
-       use nls \
-               || myopts+=" NO_GETTEXT=YesPlease"
-       use tk \
-               || myopts+=" NO_TCLTK=YesPlease"
-       use pcre \
-               && myopts+=" USE_LIBPCRE=yes" \
-               && extlibs+=" -lpcre"
-       use perl \
-               && myopts+=" INSTALLDIRS=vendor" \
-               || myopts+=" NO_PERL=YesPlease"
-       use python \
-               || myopts+=" NO_PYTHON=YesPlease"
-       use subversion \
-               || myopts+=" NO_SVN_TESTS=YesPlease"
-       use threads \
-               && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-               || myopts+=" NO_PTHREADS=YesPlease"
-       use cvs \
-               || myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#      if [[ ${CHOST} == *-mint* ]] ; then
-#              myopts+=" NO_MMAP=YesPlease"
-#              myopts+=" NO_IPV6=YesPlease"
-#              myopts+=" NO_STRLCPY=YesPlease"
-#              myopts+=" NO_MEMMEM=YesPlease"
-#              myopts+=" NO_MKDTEMP=YesPlease"
-#              myopts+=" NO_MKSTEMPS=YesPlease"
-#      fi
-       if [[ ${CHOST} == ia64-*-hpux* ]]; then
-               myopts+=" NO_NSEC=YesPlease"
-       fi
-       if [[ ${CHOST} == *-*-aix* ]]; then
-               myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-       fi
-       if [[ ${CHOST} == *-solaris* ]]; then
-               myopts+=" NEEDS_LIBICONV=YesPlease"
-       fi
-
-       has_version '>=app-text/asciidoc-8.0' \
-               && myopts+=" ASCIIDOC8=YesPlease"
-       myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-       # Bug 290465:
-       # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 
'st_mtim'
-       [[ "${CHOST}" == *-uclibc* ]] && \
-               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() {
-       # add experimental patches to improve mediawiki support
-       # see patches for origin
-       if use mediawiki-experimental ; then
-               PATCHES+=(
-                       "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-               )
-       fi
-
-       default
-
-       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 \
-                       || die "emake 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
-               # by defining EXTLIBS we override the detection for libintl and
-               # libiconv, bug #516168
-               local nlsiconv=
-               use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-               use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-               git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || 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
-               if use doc ; then
-                       docinto ${d}/html
-                       dodoc Documentation${d}*.html
-               fi
-       done
-       docinto /
-       # Upstream does not ship this pre-built :-(
-       use doc && doinfo Documentation/{git,gitman}.info
-
-       newbashcomp contrib/completion/git-completion.bash ${PN}
-       bashcomp_alias git gitk
-       # 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
-
-       # 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
-               if use doc ; then
-                       doman svn-fe.1
-                       docinto html
-                       dodoc svn-fe.html
-               fi
-               cd "${S}"
-       fi
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # completion - installed above
-       # credential/gnome-keyring TODO
-       # diff-highlight - 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 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
-
-       perl_delete_localpod
-}
-
-src_test() {
-       local disabled="t8005-blame-i18n.sh" #t7004-tag.sh" #520270
-       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
-       use mediawiki-experimental && ewarn "Using experimental git-mediawiki 
patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/dev-vcs/git/git-2.7.2.ebuild b/dev-vcs/git/git-2.7.2.ebuild
deleted file mode 100644
index ff8deaa..0000000
--- a/dev-vcs/git/git-2.7.2.ebuild
+++ /dev/null
@@ -1,661 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_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="https://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 ~arm64 ~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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv 
libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk 
+threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:= )
-       sys-libs/zlib
-       pcre? ( dev-libs/libpcre )
-       perl? ( dev-lang/perl:=[-build(-)] )
-       tk? ( dev-lang/tk:0= )
-       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/DateTime-Format-ISO8601
-               dev-perl/HTML-Tree
-               dev-perl/MediaWiki-API
-       )
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-                       cvs? ( >=dev-vcs/cvsps-2.1:0 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}
-       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 )
-       mediawiki-experimental? ( mediawiki )
-       subversion? ( perl )
-       webdav? ( curl )
-       gtk? ( python )
-       python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-       # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-       # install mediawiki perl modules also in vendor_dir
-       # hack, needs better upstream solution
-       "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-       "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-       "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-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+=" BLK_SHA1=YesPlease"
-       elif use ppcsha1 ; then
-               myopts+=" PPC_SHA1=YesPlease"
-       fi
-
-       if use curl ; then
-               use webdav || myopts+=" NO_EXPAT=YesPlease"
-       else
-               myopts+=" NO_CURL=YesPlease"
-       fi
-
-       # broken assumptions, because of broken build system ...
-       myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-       myopts+=" INSTALL=install TAR=tar"
-       myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-       myopts+=" SANE_TOOL_PATH="
-       myopts+=" OLD_ICONV="
-       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+=" NO_ICONV=YesPlease"
-       use nls \
-               || myopts+=" NO_GETTEXT=YesPlease"
-       use tk \
-               || myopts+=" NO_TCLTK=YesPlease"
-       use pcre \
-               && myopts+=" USE_LIBPCRE=yes" \
-               && extlibs+=" -lpcre"
-       use perl \
-               && myopts+=" INSTALLDIRS=vendor" \
-               || myopts+=" NO_PERL=YesPlease"
-       use python \
-               || myopts+=" NO_PYTHON=YesPlease"
-       use subversion \
-               || myopts+=" NO_SVN_TESTS=YesPlease"
-       use threads \
-               && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-               || myopts+=" NO_PTHREADS=YesPlease"
-       use cvs \
-               || myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#      if [[ ${CHOST} == *-mint* ]] ; then
-#              myopts+=" NO_MMAP=YesPlease"
-#              myopts+=" NO_IPV6=YesPlease"
-#              myopts+=" NO_STRLCPY=YesPlease"
-#              myopts+=" NO_MEMMEM=YesPlease"
-#              myopts+=" NO_MKDTEMP=YesPlease"
-#              myopts+=" NO_MKSTEMPS=YesPlease"
-#      fi
-       if [[ ${CHOST} == ia64-*-hpux* ]]; then
-               myopts+=" NO_NSEC=YesPlease"
-       fi
-       if [[ ${CHOST} == *-*-aix* ]]; then
-               myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-       fi
-       if [[ ${CHOST} == *-solaris* ]]; then
-               myopts+=" NEEDS_LIBICONV=YesPlease"
-       fi
-
-       has_version '>=app-text/asciidoc-8.0' \
-               && myopts+=" ASCIIDOC8=YesPlease"
-       myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-       # Bug 290465:
-       # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 
'st_mtim'
-       [[ "${CHOST}" == *-uclibc* ]] && \
-               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() {
-       # add experimental patches to improve mediawiki support
-       # see patches for origin
-       if use mediawiki-experimental ; then
-               PATCHES+=(
-                       "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-               )
-       fi
-
-       default
-
-       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 \
-                       || die "emake 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
-               # by defining EXTLIBS we override the detection for libintl and
-               # libiconv, bug #516168
-               local nlsiconv=
-               use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-               use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-               git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || 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
-               if use doc ; then
-                       docinto ${d}/html
-                       dodoc Documentation${d}*.html
-               fi
-       done
-       docinto /
-       # Upstream does not ship this pre-built :-(
-       use doc && doinfo Documentation/{git,gitman}.info
-
-       newbashcomp contrib/completion/git-completion.bash ${PN}
-       bashcomp_alias git gitk
-       # 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
-
-       # 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
-               if use doc ; then
-                       doman svn-fe.1
-                       docinto html
-                       dodoc svn-fe.html
-               fi
-               cd "${S}"
-       fi
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # completion - installed above
-       # credential/gnome-keyring TODO
-       # diff-highlight - 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 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
-
-       perl_delete_localpod
-}
-
-src_test() {
-       local disabled="t8005-blame-i18n.sh" #520270
-       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
-       use mediawiki-experimental && ewarn "Using experimental git-mediawiki 
patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/dev-vcs/git/git-2.7.3.ebuild b/dev-vcs/git/git-2.7.3.ebuild
deleted file mode 100644
index a2e47da..0000000
--- a/dev-vcs/git/git-2.7.3.ebuild
+++ /dev/null
@@ -1,661 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_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="https://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 ~arm64 ~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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv 
libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk 
+threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:= )
-       sys-libs/zlib
-       pcre? ( dev-libs/libpcre )
-       perl? ( dev-lang/perl:=[-build(-)] )
-       tk? ( dev-lang/tk:0= )
-       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/DateTime-Format-ISO8601
-               dev-perl/HTML-Tree
-               dev-perl/MediaWiki-API
-       )
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       dev-perl/Authen-SASL
-                       cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-                       cvs? ( >=dev-vcs/cvsps-2.1:0 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}
-       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 )
-       mediawiki-experimental? ( mediawiki )
-       subversion? ( perl )
-       webdav? ( curl )
-       gtk? ( python )
-       python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-       # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-       # install mediawiki perl modules also in vendor_dir
-       # hack, needs better upstream solution
-       "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-       "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-       "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-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+=" BLK_SHA1=YesPlease"
-       elif use ppcsha1 ; then
-               myopts+=" PPC_SHA1=YesPlease"
-       fi
-
-       if use curl ; then
-               use webdav || myopts+=" NO_EXPAT=YesPlease"
-       else
-               myopts+=" NO_CURL=YesPlease"
-       fi
-
-       # broken assumptions, because of broken build system ...
-       myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-       myopts+=" INSTALL=install TAR=tar"
-       myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-       myopts+=" SANE_TOOL_PATH="
-       myopts+=" OLD_ICONV="
-       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+=" NO_ICONV=YesPlease"
-       use nls \
-               || myopts+=" NO_GETTEXT=YesPlease"
-       use tk \
-               || myopts+=" NO_TCLTK=YesPlease"
-       use pcre \
-               && myopts+=" USE_LIBPCRE=yes" \
-               && extlibs+=" -lpcre"
-       use perl \
-               && myopts+=" INSTALLDIRS=vendor" \
-               || myopts+=" NO_PERL=YesPlease"
-       use python \
-               || myopts+=" NO_PYTHON=YesPlease"
-       use subversion \
-               || myopts+=" NO_SVN_TESTS=YesPlease"
-       use threads \
-               && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-               || myopts+=" NO_PTHREADS=YesPlease"
-       use cvs \
-               || myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#      if [[ ${CHOST} == *-mint* ]] ; then
-#              myopts+=" NO_MMAP=YesPlease"
-#              myopts+=" NO_IPV6=YesPlease"
-#              myopts+=" NO_STRLCPY=YesPlease"
-#              myopts+=" NO_MEMMEM=YesPlease"
-#              myopts+=" NO_MKDTEMP=YesPlease"
-#              myopts+=" NO_MKSTEMPS=YesPlease"
-#      fi
-       if [[ ${CHOST} == ia64-*-hpux* ]]; then
-               myopts+=" NO_NSEC=YesPlease"
-       fi
-       if [[ ${CHOST} == *-*-aix* ]]; then
-               myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-       fi
-       if [[ ${CHOST} == *-solaris* ]]; then
-               myopts+=" NEEDS_LIBICONV=YesPlease"
-       fi
-
-       has_version '>=app-text/asciidoc-8.0' \
-               && myopts+=" ASCIIDOC8=YesPlease"
-       myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-       # Bug 290465:
-       # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 
'st_mtim'
-       [[ "${CHOST}" == *-uclibc* ]] && \
-               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() {
-       # add experimental patches to improve mediawiki support
-       # see patches for origin
-       if use mediawiki-experimental ; then
-               PATCHES+=(
-                       "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-                       "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-               )
-       fi
-
-       default
-
-       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 \
-                       || die "emake 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
-               # by defining EXTLIBS we override the detection for libintl and
-               # libiconv, bug #516168
-               local nlsiconv=
-               use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-               use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-               git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || 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
-               if use doc ; then
-                       docinto ${d}/html
-                       dodoc Documentation${d}*.html
-               fi
-       done
-       docinto /
-       # Upstream does not ship this pre-built :-(
-       use doc && doinfo Documentation/{git,gitman}.info
-
-       newbashcomp contrib/completion/git-completion.bash ${PN}
-       bashcomp_alias git gitk
-       # 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
-
-       # 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
-               if use doc ; then
-                       doman svn-fe.1
-                       docinto html
-                       dodoc svn-fe.html
-               fi
-               cd "${S}"
-       fi
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # completion - installed above
-       # credential/gnome-keyring TODO
-       # diff-highlight - 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 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
-
-       perl_delete_localpod
-}
-
-src_test() {
-       local disabled="t8005-blame-i18n.sh" #520270
-       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
-       use mediawiki-experimental && ewarn "Using experimental git-mediawiki 
patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}