Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/
Date: Mon, 26 Dec 2016 16:05:15
Message-Id: 1482768307.8da6b4e95c98c9f356d2214b057e22855ac3d52a.polynomial-c@gentoo
1 commit: 8da6b4e95c98c9f356d2214b057e22855ac3d52a
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 26 16:04:48 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 26 16:05:07 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da6b4e9
7
8 dev-vcs/git: Removed old.
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-vcs/git/Manifest | 12 -
13 dev-vcs/git/git-2.11.0_rc2.ebuild | 681 --------------------------------------
14 dev-vcs/git/git-2.4.11.ebuild | 633 -----------------------------------
15 dev-vcs/git/git-2.5.5.ebuild | 637 -----------------------------------
16 dev-vcs/git/git-2.6.6.ebuild | 637 -----------------------------------
17 5 files changed, 2600 deletions(-)
18
19 diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
20 index c21a820..de8623c 100644
21 --- a/dev-vcs/git/Manifest
22 +++ b/dev-vcs/git/Manifest
23 @@ -1,10 +1,6 @@
24 DIST git-2.10.1.tar.xz 4102452 SHA256 a9c32df9061cfc2c194ecaa0357ba273c1f24a0dbf0d856b03dcedafcd0a4dc6 SHA512 976c62b530405388f77b01abb9dd40929831e0fdb83574c5c56ea309af462805659a20685221cf011db67635cebfe550853d1ba3764118bb53df41cf480f216a WHIRLPOOL e4c077c09ffdbe960450f48cf089836f12fe64e3b919a5e744a8644511d958f08f77f5066c189a9616e649fb20d05104dcd3fd0b345f3eff6c3f860945231bf6
25 DIST git-2.10.2.tar.xz 4106108 SHA256 94802903dd707d85ca3b9a2be35e936a54ce86375f52c6a789efe7ce7e238671 SHA512 0ab09de481dbb31c3304382afaa5d3fc9f861115c9954c65b11a8a1c34b939118c7ed3ff60ac329145888596388e3e4d2b2fb677fe109d33a57206d531b5ee6a WHIRLPOOL 808404fa13f908d149028f64aaf5b73400448fff6393dabfaa874d750065e86ff5dae4903724cbca4e59fb74b3ff30b8b8f0a0f1435a0a90c18267c7a0550de6
26 -DIST git-2.11.0.rc2.tar.xz 4166928 SHA256 50f7ff3cd809ae1053e28a24ec0fad1a055bc1ef4d61136cf07063d43d02f83a SHA512 db410e63777e691860a5286a7c4ee837481c5035fa5cd7835da969d487741f1aef0be3edb747b8cff0493a8d8851d2010aa1a6dcfad397fdd59e42b5bc14b871 WHIRLPOOL 97a772fe47cc9c26ed774b5de54fec460d53c417e04fde9fc33a0c5f0f00b1160566332dcc57a2e65bab8f98ded15533f0ae9b6f6b56d2d7ca3181b2a73e2d57
27 DIST git-2.11.0.tar.xz 4197984 SHA256 7e7e8d69d494892373b87007674be5820a4bc1ef596a0117d03ea3169119fd0b SHA512 f9588dfcb4ae38adc46300b8ef65ee51343fc4685f9e43bffff10839a492e6a54c7f7a774687fef3ebb8a30108775aa472cda2378aa202905f8555bfb9d4ede2 WHIRLPOOL 73ce3c2cb083906b1e55245935a01b27881be48d2c4c3cace8353a4c2baf87fe3ce338553f66407cb629fa9c8c63d396ef09f4d6aa18803d487af4dd3fef8f10
28 -DIST git-2.4.11.tar.xz 3695028 SHA256 ebca2cf93b7200d6d7b9982e3e9857f0b433a05e51338a600c799e97919118e3 SHA512 34c60fa67e336a4c807a5f49e26083442acc52781b0adbd3f9d96b9594c0688686b30ca3a152621047489d59beb65ad99089a2f02cc589d6e3b36a79db1388fe WHIRLPOOL 75e6b3090560e7aef4fcb382413a7432ecb63880a4139466a64dd06d4777441afd34c208a59dba9a01144f0c2f3a3763a267672f9f7155867b462b4c0bf09cba
29 -DIST git-2.5.5.tar.xz 3747448 SHA256 82976a05dd85d44405ec9758040dd190507494fa2af322bd2c97163024ce1e82 SHA512 edf223df92298a3d25865140b4a2c2194840b21f96c13e07ac35940d6afa759f766e4d36ad2e2428ba913c4949b4f76283475a6b7aa1cc774523c793cb5794f1 WHIRLPOOL 3ab15f8a0bc54d3865537bc70c9a0d6e3d8f30b9ba8c68c2dadbd77575f892f55e0e010b9ac89af03ca228f034abbccac53a619865c1e8044f61dedef8713501
30 -DIST git-2.6.6.tar.xz 3822260 SHA256 8d53410d60f9c36b0f34c125076634d068c8d812f4143fa10b7130cd7acf7ec2 SHA512 5c77f83f34296f85d1b1f1bf00a59664bced9db7ad222606471d8400772441775b82fdbfae637aa11006164c4fc9912b8218aa2f6f7812112048902ecf5f0000 WHIRLPOOL ffc6d10b166b3d0ff1e51fe44a6809877b2d4a9679fc519b7648897621ea02616e330ae46693a2f306286b40c0b41589b20bc93e240b87d535ac5b9b84b28738
31 DIST git-2.7.3-00-9831e92bfa833ee9c0ce464bbc2f941ae6c2698d-lose-name-path.patch 28198 SHA256 b6bf7d67b9cc4d34550a10933af63b665b136b869dbbe23ad3ece0d463f027f9 SHA512 3fd64b0d6b53d5b08b791195e6edc162db682fc8a1bafc04aab7a7a4e61e2db4b3b84d9f769e0d7756da2739bdd900e30a233c228706c39817e42e309c36684c WHIRLPOOL 7e1d9337d46222ea4ae2164429a6a220adb0f763bdde6722c0f2adf79789e092f5cfb74b932597b8d3971af4fc27dede1fea51b9cb72b44ec8e30bd78bdaaa8d
32 DIST git-2.7.3.tar.xz 3909636 SHA256 89c467912d4740da2b40288f956251f0a1e276e28eecd28a6d776067103629b6 SHA512 f7acbf52d12f39d323bd90a82c7135aa2aacf2661f7087c71b41dbfbec688342e0a2fc061fc0f216848a538a0dbc4fce68e24ea2a26e747f5eb92f763fa5bc72 WHIRLPOOL 5cc261749f91c2e0b0509d2fac1bc7426b3ddcc37e859d4f524838e1dd471071ad430886751933bae57aafc20bdcf3f9a43f4c018cc9c89610134a5203b22447
33 DIST git-2.7.4.tar.xz 3909636 SHA256 dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b SHA512 82a646140834e909bf1748a017e86f37f0711c759fe0a6ad03529beb57c79742cb7bf77c2dba29ccd84fcf3d5f18ad9c85c00f002d3b257be42e058750423da7 WHIRLPOOL 74532038b6ba95a5354f43ebad00a9c159c495d46e7dc1b8a2a59f5a86e149538190d9800144a719dcc00e28cfea1039cd5dbfb67fd5aac5e7d0998d3231bae3
34 @@ -12,22 +8,14 @@ DIST git-2.8.4.tar.xz 3982836 SHA256 120e9a32a1858871dea34165622ec7a63f27887b930
35 DIST git-2.9.3.tar.xz 4025288 SHA256 9f1473350c1792310b51af03a9cb5cce841f68202f835b20d46312a30232fa63 SHA512 7152d075b705c92c813e977558b1a6d8d1c9e6ac01b41ee052bcd40c056f08c6fdb030ef0995822c6d22ce44b739935d89026aeae35f8b93fb569773c4b005bb WHIRLPOOL 0117dad19c4a74dcc7a7963dd2ffa60f5a1e10890e4f233b1c92cce87c07e3da270a65464ed152fc20ffbea34f074342a9153f7a328cae2d850b763b3a196c3e
36 DIST git-htmldocs-2.10.1.tar.xz 1067144 SHA256 40f9ce980f91c0391438e5d04a1bb11b128c6b6bf272eac44d6fca80f2dacfcb SHA512 530c0b76263cfc4f4147fb6b8b485494f1c1bafd5e92bd5c5e16de914ab5f13eb0c358f4b36aba8471d70ffb087925598ea39116c254564c86f8c10061c3dd90 WHIRLPOOL 7d10f8e46419e38f31bdd9eef4a9aa5f8773b7f50394ba7ea8fb03fd5a224401a8abd781d2f4b41b6768331fb68177059d773ba326d624d376049dfb211036dc
37 DIST git-htmldocs-2.10.2.tar.xz 1068436 SHA256 dd43111c3518a92a7fe64ac5cd32a5d4d77d49c67f7d89dce3e8293bc3d6b491 SHA512 8ef57218d7eef285ac427414d92bd5e8eba5c85c2a2a9ec0e423705ee2cb6f26dd33ad780d1b4237e7534dbe5cc3b4d8eea5780d0acc49066d78fc1893df2525 WHIRLPOOL 160fe3446d959d0f2315c9b2be182925619a4d89343602038e92283abdb393805eb5252799c502b83641d9e23a157332033baaa1ef2f1d9401cbbf372d8e86d7
38 -DIST git-htmldocs-2.11.0.rc2.tar.xz 1080176 SHA256 1d30b9d66c8b2766f1aeeca1fdd5f785a8fa282b0bb3c3fa96624372169e627e SHA512 516f6db0577d98a0d5a391981cd24989d0258860a9095ddded448546e4276b3987265ad5757352146c77ab3d721b0e7af8788fd300c3f139185945946c27ed31 WHIRLPOOL cfeb1946e1bd821ae0770ae4b2807925ef5ba37a7dc83dcbfcff0bf9ffae64ba4e57597aca8242fe3845664ca98f2324355948579565ba856b3a381232b9359c
39 DIST git-htmldocs-2.11.0.tar.xz 1080584 SHA256 3975399f1be3d959edf0fded03eab8fbf94787bfd0318b7644c77cf61e4a7b48 SHA512 50250028030b1b277c17f27bc8bc0aa35938e7ae690d59bfff0a2d1f91c60564b254ce5b242f9ca081bfae60a9fb70cef538586abc0878bab6105e904748ee63 WHIRLPOOL 0839629b8f2fa08e22b69fe3638d67ae08d78dceaa008d8f35932ff361a1c1d8dbcd1262d4e469b5cd511a5dfb1848061d8e3491051188d0f90a6f0f98fa8003
40 -DIST git-htmldocs-2.4.11.tar.xz 997132 SHA256 2764af41b319f4d11b29832de4bd05392f2887d9a1d3c56c864fb081920eac97 SHA512 d5d2abae9cc303fe8ebeb72ae7078d44db94610d549ca03afffcbbef8b611efda662677423d9ff97a0c7a2384bbd4c3468b01a2ecd7b68f4fdc89e62ad688eb4 WHIRLPOOL 66cd4fc754be7c103ca58a030d4799ba988792419a426e85a39805172e6329ec617b3561696dc74be36801cca0b17a26102a194a1a58d6c7b9ee1ab17752c4a6
41 -DIST git-htmldocs-2.5.5.tar.xz 1010216 SHA256 15de2f234cf419496399f7ad396709544d62537488a8e5200e6e34b0f1a685e7 SHA512 265ddf3835352f85eb2e2ee983eb8aaf37bc7b151968866bdb8b9bb6782cdb72dbd1fefe5d7f694a6825954d49bcf4c799e8bcb4e3b25e3f228f6f97f041fd9b WHIRLPOOL 90da44c0bdb6f9ff428d1673289e612936ed5f26110cd13d155c8cbef8433b13bd8b15cea88f967224a699e4c3a6ac41d70b67be1b25c4d35989879626eb10ad
42 -DIST git-htmldocs-2.6.6.tar.xz 1021856 SHA256 897fb0bc7e2eb67a4b582c963f337fda3a6ad2b23bca55e27f23f7d15bad7c5d SHA512 85dcd8514e1ba2cb591512a0003aedf25eafbf185ba1eed01f8adfd9eb467d29b17108e6b087183004004ab17301316d403cd6762619ac2a030a565ea5c776b3 WHIRLPOOL 3cd964f1d0164db98e97e0097813a620911adadd9c50837e23a5ca79eb0f2d988aa68317b5b79fa7b052900564657c36d050e75841a1018d5ff12e1299c01dc6
43 DIST git-htmldocs-2.7.3.tar.xz 1031848 SHA256 f71f5e8e1a6103e83ea794f367bc419a1d14ba0f79ebacdc81b3b9430714adea SHA512 50de5d9d3c0f6d874a6a4bc3b247a1795b1bcf154a276b546f88c3b5f5fb2eb27212d207a4bb50c04cba36d8537853afd25816addfb87c9a50e18528d93586fe WHIRLPOOL 057d9bebfe51c29a0a7f689baa9873cb6a54feb1d2869c541396902b160379c9220c5de79a4cb59c6e804e5c7557c0fd141b89621b97d3b495dc6e0a77c67a9f
44 DIST git-htmldocs-2.7.4.tar.xz 1032428 SHA256 3fae21e2e68104621ea1405be73192b46bf3ef29bbc248a81b1e7e6fcf5acfad SHA512 f05b7b8a4dd4abe23f7e51982e9c33026aa31610ac8640028aeae6b310b70b764aee9a81fa702ed0712ccf1b7ad897e06163eb5c5246c14f6cce7c5f4e462682 WHIRLPOOL 87fc486d182a4b72fd906105fefcc53b722c4ae6832b290cd6f759ac1eca7ebfbbe7c0e72c1d7b5ef3581d19d7576f1d0387d6e5b0a33d960d57f59ee61a7869
45 DIST git-htmldocs-2.8.4.tar.xz 1042260 SHA256 78135be591e3a68d1030a76e343d59622e5e40f6990667f4385a01d9dafe9bbd SHA512 5da40db4421f94a969b83bfa0ea6e5ccf3fce8c2085ea2271a2eb3e1b4fc496c36ae8790207cd1814ff747b7633bb27fd53bb9c012f866ea1e7f1cc8065379dd WHIRLPOOL 4f80041ad4ef8b178a6b91313680433a7e07b0ecb15354304436d70880063b2f9cdd875fcd95684a817272d05a57485e1863e9e06c3788eddf0e5f031279ea9a
46 DIST git-htmldocs-2.9.3.tar.xz 1055980 SHA256 abfa0e160c062a36956beaa5e8bf4d6e2db93f235c892f94681bd6f1feb71865 SHA512 4ce1c00767d485ca4ebec9ea5a3d001d4395eb44c2c82caec36b18dd1df26cbbd5d458d9c2b83b54d572d830eb0bccf2916f28863a96384cd3d6fcb741f1b97f WHIRLPOOL b3c16dd25da7309c4c8302008eda147e113e025081dfa447c6de629ae68fe5369e391c402fe3cdbfba2187040559609082edae5469238af68a1e17bd805acddf
47 DIST git-manpages-2.10.1.tar.xz 395560 SHA256 89ff7aae275252d6b01cac6479e10e1be2e0208181ff14decf200606b5223611 SHA512 648c8f1705137459728d24610888bbcadd31bcd082984e9eddc045011852b1d696204f2d69b0d441989e44e78d6b73c240164f0f0e3d8fb451e30376094ef845 WHIRLPOOL 8fdea82f3c79206f5c10544641b623cabf340780c4ed29c8d60f74ecf17e30f31108bd5d1aed0e66556b071a640748a6904df166a7a61934d2649311d7e68679
48 DIST git-manpages-2.10.2.tar.xz 395556 SHA256 83b0a317f6039ad95ef6af6a182cf659c2d053eed5d8f70b06710eb787f8aa6f SHA512 0dc5df8441601865511983b85762102396cbf7c704fd831eb6666ef7b7639252b971f6b4080b8a57226a86124edcdd77acf24374da22047bd315769a09109bef WHIRLPOOL e1d6b9cb4479b584c16a25a4f3b0528d96d483307e768efea3d7bd8156d74e1c59b61a641dfe5671f4cb01a02f10322262d133cb76f85194ac97ee74c6195d0e
49 -DIST git-manpages-2.11.0.rc2.tar.xz 399964 SHA256 e18482708fbf318afa71453da54841a289a6719b4d132d30ba8fe5344af6dd34 SHA512 e778b48672ffa423031c002c318ca8c05d7e998d11ea3aac6e1a9411c1cf82bdea80afba6996de534601050892db18cc17dde1552b6406e408c31bdfccbe793b WHIRLPOOL e98a0c64bd86a62606bce3564c33db37d2334dfe4af381ce1fd2d55dfbe715f06eed472a467307129789d7300f9d00edc86ae9557d29445da0d33c7fecff7e4a
50 DIST git-manpages-2.11.0.tar.xz 399992 SHA256 b3d3e78829c0b69b727aaca407ecfe239a46db3f354f16189f7a7c10af9528d8 SHA512 5b72b2dd7e151bde0fdc5ca5044391ebd9943ee8313133fdea1e0cb13b90ddd9164ee46f9c49ca2a70f636da7bcb54651a6389ed1c0a8693cf8eb31bfea49079 WHIRLPOOL 93fd5b6819ab0942421368d9c0e4723d6f5d2650e94ad8cab225499bb616f162e754a5e08a8f7f0ec74e378069cec0109047c72b67fa9d5c2d244399127b942a
51 -DIST git-manpages-2.4.11.tar.xz 373956 SHA256 0a1fff7650e635339f92985a47198f5f6664eda1c233c3cf48e92f22c3735db2 SHA512 78226baf1c8be28c456a84b06f403af9b918cd3e46218917cce18b3b9ce494600bf00014b818ca0dff9f675aca8b17cd9f7893c7063e218d719a9567e81d9040 WHIRLPOOL f8883ca7d327c378937f62287cbb515b5271cb8aeda18d32135f1c7ea71c9f39282fe55b191476f046de4815a994e4f6f98696d9353f0bfcca7994101398786c
52 -DIST git-manpages-2.5.5.tar.xz 378304 SHA256 41b66002436add0781618764c3f0c8222bac7d8a636f1d7e2994480b22369930 SHA512 bebcc04fa54080316d01f1bd1ba7b91a1712e6c6a6f95306d9f079cf5858cf0fb2ccea24c606153e9adb99e956c5dbae5a5c7a7a0ed8c643efdf5a5db599cda1 WHIRLPOOL e72873d3f1a404a311e643d89cf65996d884e794e468417272cdda494ef621f0ebf875faa17433e443fcece54608c59a3c094372101bf4342fadcf8395dabce8
53 -DIST git-manpages-2.6.6.tar.xz 381588 SHA256 0f64c1db015e3c74e56eef646a9fdd456cf043cae54714f404ad9b35ddb537a0 SHA512 bd8573f58bd988f78978041b88643e6d0af99ae0df4be6ec80db7de6e042970a23d9a153e84ddb8ffc538724b1482ff6dac7594462e28073067f54d040fdddfd WHIRLPOOL 3e8af6df1b96e3211c5799ace846dab331f30c1133c1d093e344b4576d8f588631e29187909b600112a9f7b42a0de63f56cec953e0d162cc49c2b6efeef0db53
54 DIST git-manpages-2.7.3.tar.xz 384544 SHA256 9f088427c61a9e0a840007c7f50fc6f7caba36ac8c403460c49210983090496d SHA512 883441df049bfaf0f22cf9d17041125dc9c8f0e7d94efa7a4188a68c2242d1b4c3d34fd3bd3ecdd2af905ee2f8fb5fefd0ce6328dd76c665f7ec20e3b9c87d1b WHIRLPOOL 7ee013444665366ecb8f3df507a3c5af8a9f48d3185783a94db827b192c32ac6998157eb42bcbfe397f96d452451b2416c32e2dffbabc71062422e7c5e25c184
55 DIST git-manpages-2.7.4.tar.xz 384460 SHA256 d04fd81ab8aa32efbe54acd27ab5c88ef4ab615313e4cdfa793dd0065899ce25 SHA512 1af6f0d9fc3945a5a215092caabd0963f3eaa35c5f3b0270861b625bf7bd88e4fdea9b3e50ce1b10c79a12ee2b06b203fab4aa9d566560535c1decf7b2d987cd WHIRLPOOL 38306b6e198336dd3c75a9fd032b636e0e43a3b75eba2746d2d42c3752cf7405b1f8572199748509974d68bfc77c74fbea52626884f9b509d8b593cefce4aad5
56 DIST git-manpages-2.8.4.tar.xz 387168 SHA256 d2ddfc302e5b3c0ad182916b27c28d95bc667ea8b9db8dc099bf3d8d62b8b7f5 SHA512 d4ffca6ad8ff0b6bfab984eb06ad5c6c0cf73cfb4beaff4e924b2bd117a4a369e928faa2ca09f11903ebc52249ad24e2b68e7b571965a2ef48f5731ad94b9bef WHIRLPOOL a22d7ad38ccfb399325e321cecc7255fdf4ca05f14e92acfe94e74b816199d2e057a559f6e3eede2df768d762457eb2a43f1e9c76e8b6e76c7498dc9547dcf25
57
58 diff --git a/dev-vcs/git/git-2.11.0_rc2.ebuild b/dev-vcs/git/git-2.11.0_rc2.ebuild
59 deleted file mode 100644
60 index 82ef7b1..00000000
61 --- a/dev-vcs/git/git-2.11.0_rc2.ebuild
62 +++ /dev/null
63 @@ -1,681 +0,0 @@
64 -# Copyright 1999-2016 Gentoo Foundation
65 -# Distributed under the terms of the GNU General Public License v2
66 -# $Id$
67 -
68 -EAPI=6
69 -
70 -GENTOO_DEPEND_ON_PERL=no
71 -
72 -# bug #329479: git-remote-testgit is not multiple-version aware
73 -PYTHON_COMPAT=( python2_7 )
74 -[[ ${PV} == *9999 ]] && SCM="git-r3"
75 -# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
76 -# See https://git-scm.com/docs/gitworkflows#_graduation
77 -# In order of stability:
78 -# 9999-r0: maint
79 -# 9999-r1: master
80 -# 9999-r2: next
81 -# 9999-r3: pu
82 -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
83 -EGIT_BRANCH=maint
84 -PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
85 -
86 -inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
87 -
88 -MY_PV="${PV/_rc/.rc}"
89 -MY_P="${PN}-${MY_PV}"
90 -
91 -DOC_VER=${MY_PV}
92 -
93 -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
94 -HOMEPAGE="http://www.git-scm.com/"
95 -if [[ ${PV} != *9999 ]]; then
96 - SRC_URI_SUFFIX="xz"
97 - SRC_URI_KORG="mirror://kernel/software/scm/git"
98 - [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
99 - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
100 - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
101 - doc? (
102 - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
103 - )"
104 - 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"
105 -fi
106 -
107 -LICENSE="GPL-2"
108 -SLOT="0"
109 -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"
110 -
111 -# Common to both DEPEND and RDEPEND
112 -CDEPEND="
113 - !libressl? ( dev-libs/openssl:0= )
114 - libressl? ( dev-libs/libressl:= )
115 - sys-libs/zlib
116 - pcre? ( dev-libs/libpcre )
117 - perl? ( dev-lang/perl:=[-build(-)] )
118 - tk? ( dev-lang/tk:0= )
119 - curl? (
120 - net-misc/curl
121 - webdav? ( dev-libs/expat )
122 - )
123 - emacs? ( virtual/emacs )
124 - gnome-keyring? ( gnome-base/libgnome-keyring )"
125 -
126 -RDEPEND="${CDEPEND}
127 - gpg? ( app-crypt/gnupg )
128 - mediawiki? (
129 - dev-perl/DateTime-Format-ISO8601
130 - dev-perl/HTML-Tree
131 - dev-perl/MediaWiki-API
132 - )
133 - perl? ( dev-perl/Error
134 - dev-perl/Net-SMTP-SSL
135 - dev-perl/Authen-SASL
136 - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
137 - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
138 - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
139 - )
140 - python? ( gtk?
141 - (
142 - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
143 - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
144 - )
145 - ${PYTHON_DEPS} )"
146 -
147 -# This is how info docs are created with Git:
148 -# .txt/asciidoc --(asciidoc)---------> .xml/docbook
149 -# .xml/docbook --(docbook2texi.pl)--> .texi
150 -# .texi --(makeinfo)---------> .info
151 -DEPEND="${CDEPEND}
152 - doc? (
153 - app-text/asciidoc
154 - app-text/docbook2X
155 - sys-apps/texinfo
156 - app-text/xmlto
157 - )
158 - nls? ( sys-devel/gettext )
159 - test? ( app-crypt/gnupg )"
160 -
161 -# Live ebuild builds man pages and HTML docs, additionally
162 -if [[ ${PV} == *9999 ]]; then
163 - DEPEND="${DEPEND}
164 - app-text/asciidoc"
165 -fi
166 -
167 -SITEFILE=50${PN}-gentoo.el
168 -S="${WORKDIR}/${MY_P}"
169 -
170 -REQUIRED_USE="
171 - cgi? ( perl )
172 - cvs? ( perl )
173 - mediawiki? ( perl )
174 - mediawiki-experimental? ( mediawiki )
175 - subversion? ( perl )
176 - webdav? ( curl )
177 - gtk? ( python )
178 - python? ( ${PYTHON_REQUIRED_USE} )
179 -"
180 -
181 -PATCHES=(
182 - # bug #350330 - automagic CVS when we don't want it is bad.
183 - "${FILESDIR}"/git-2.10.0-optional-cvs.patch
184 -
185 - # install mediawiki perl modules also in vendor_dir
186 - # hack, needs better upstream solution
187 - "${FILESDIR}"/git-1.8.5-mw-vendor.patch
188 -
189 - "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
190 -
191 - # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
192 - "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
193 -)
194 -
195 -pkg_setup() {
196 - if use subversion && has_version "dev-vcs/subversion[dso]"; then
197 - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
198 - ewarn "with USE=dso, there may be weird crashes in git-svn. You"
199 - ewarn "have been warned."
200 - fi
201 - if use python ; then
202 - python-single-r1_pkg_setup
203 - fi
204 -}
205 -
206 -# This is needed because for some obscure reasons future calls to make don't
207 -# pick up these exports if we export them in src_unpack()
208 -exportmakeopts() {
209 - local myopts
210 -
211 - if use blksha1 ; then
212 - myopts+=" BLK_SHA1=YesPlease"
213 - elif use ppcsha1 ; then
214 - myopts+=" PPC_SHA1=YesPlease"
215 - fi
216 -
217 - if use curl ; then
218 - use webdav || myopts+=" NO_EXPAT=YesPlease"
219 - else
220 - myopts+=" NO_CURL=YesPlease"
221 - fi
222 -
223 - # broken assumptions, because of broken build system ...
224 - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
225 - myopts+=" INSTALL=install TAR=tar"
226 - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
227 - myopts+=" SANE_TOOL_PATH="
228 - myopts+=" OLD_ICONV="
229 - myopts+=" NO_EXTERNAL_GREP="
230 -
231 - # For svn-fe
232 - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
233 -
234 - # can't define this to null, since the entire makefile depends on it
235 - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
236 -
237 - use iconv \
238 - || myopts+=" NO_ICONV=YesPlease"
239 - use nls \
240 - || myopts+=" NO_GETTEXT=YesPlease"
241 - use tk \
242 - || myopts+=" NO_TCLTK=YesPlease"
243 - use pcre \
244 - && myopts+=" USE_LIBPCRE=yes" \
245 - && extlibs+=" -lpcre"
246 - use perl \
247 - && myopts+=" INSTALLDIRS=vendor" \
248 - || myopts+=" NO_PERL=YesPlease"
249 - use python \
250 - || myopts+=" NO_PYTHON=YesPlease"
251 - use subversion \
252 - || myopts+=" NO_SVN_TESTS=YesPlease"
253 - use threads \
254 - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
255 - || myopts+=" NO_PTHREADS=YesPlease"
256 - use cvs \
257 - || myopts+=" NO_CVS=YesPlease"
258 - use elibc_musl \
259 - && myopts+=" NO_REGEX=YesPlease"
260 -# Disabled until ~m68k-mint can be keyworded again
261 -# if [[ ${CHOST} == *-mint* ]] ; then
262 -# myopts+=" NO_MMAP=YesPlease"
263 -# myopts+=" NO_IPV6=YesPlease"
264 -# myopts+=" NO_STRLCPY=YesPlease"
265 -# myopts+=" NO_MEMMEM=YesPlease"
266 -# myopts+=" NO_MKDTEMP=YesPlease"
267 -# myopts+=" NO_MKSTEMPS=YesPlease"
268 -# fi
269 - if [[ ${CHOST} == ia64-*-hpux* ]]; then
270 - myopts+=" NO_NSEC=YesPlease"
271 - fi
272 - if [[ ${CHOST} == *-*-aix* ]]; then
273 - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
274 - fi
275 - if [[ ${CHOST} == *-solaris* ]]; then
276 - myopts+=" NEEDS_LIBICONV=YesPlease"
277 - myopts+=" HAVE_CLOCK_MONOTONIC=1"
278 - myopts+=" HAVE_GETDELIM=1"
279 - fi
280 -
281 - has_version '>=app-text/asciidoc-8.0' \
282 - && myopts+=" ASCIIDOC8=YesPlease"
283 - myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
284 -
285 - # Bug 290465:
286 - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
287 - [[ "${CHOST}" == *-uclibc* ]] && \
288 - myopts+=" NO_NSEC=YesPlease"
289 -
290 - export MY_MAKEOPTS="${myopts}"
291 - export EXTLIBS="${extlibs}"
292 -}
293 -
294 -src_unpack() {
295 - if [[ ${PV} != *9999 ]]; then
296 - unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
297 - cd "${S}"
298 - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
299 - use doc && \
300 - cd "${S}"/Documentation && \
301 - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
302 - cd "${S}"
303 - else
304 - git-r3_src_unpack
305 - cd "${S}"
306 - #cp "${FILESDIR}"/GIT-VERSION-GEN .
307 - fi
308 -
309 -}
310 -
311 -src_prepare() {
312 - # add experimental patches to improve mediawiki support
313 - # see patches for origin
314 - if use mediawiki-experimental ; then
315 - PATCHES+=(
316 - "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
317 - "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
318 - "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
319 - )
320 - fi
321 -
322 - default
323 -
324 - sed -i \
325 - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
326 - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
327 - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
328 - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
329 - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
330 - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
331 - Makefile contrib/svn-fe/Makefile || die "sed failed"
332 -
333 - # Never install the private copy of Error.pm (bug #296310)
334 - sed -i \
335 - -e '/private-Error.pm/s,^,#,' \
336 - perl/Makefile.PL
337 -
338 - # Fix docbook2texi command
339 - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
340 - Documentation/Makefile || die "sed failed"
341 -
342 - # Fix git-subtree missing DESTDIR
343 - sed -i \
344 - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
345 - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
346 - contrib/subtree/Makefile
347 -}
348 -
349 -git_emake() {
350 - # bug #326625: PERL_PATH, PERL_MM_OPT
351 - # bug #320647: PYTHON_PATH
352 - PYTHON_PATH=""
353 - use python && PYTHON_PATH="${PYTHON}"
354 - emake ${MY_MAKEOPTS} \
355 - DESTDIR="${D}" \
356 - OPTCFLAGS="${CFLAGS}" \
357 - OPTLDFLAGS="${LDFLAGS}" \
358 - OPTCC="$(tc-getCC)" \
359 - OPTAR="$(tc-getAR)" \
360 - prefix="${EPREFIX}"/usr \
361 - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
362 - sysconfdir="${EPREFIX}"/etc \
363 - PYTHON_PATH="${PYTHON_PATH}" \
364 - PERL_MM_OPT="" \
365 - GIT_TEST_OPTS="--no-color" \
366 - V=1 \
367 - "$@"
368 - # This is the fix for bug #326625, but it also causes breakage, see bug
369 - # #352693.
370 - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
371 -}
372 -
373 -src_configure() {
374 - exportmakeopts
375 -}
376 -
377 -src_compile() {
378 - if use perl ; then
379 - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
380 - git_emake perl/perl.mak || die "emake perl/perl.mak failed"
381 - fi
382 - git_emake || die "emake failed"
383 -
384 - if use emacs ; then
385 - elisp-compile contrib/emacs/git{,-blame}.el
386 - fi
387 -
388 - if use perl && use cgi ; then
389 - git_emake \
390 - gitweb \
391 - || die "emake gitweb (cgi) failed"
392 - fi
393 -
394 - if [[ ${CHOST} == *-darwin* ]]; then
395 - cd "${S}"/contrib/credential/osxkeychain || die
396 - git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
397 - || die "emake credential-osxkeychain"
398 - fi
399 -
400 - cd "${S}"/Documentation
401 - if [[ ${PV} == *9999 ]] ; then
402 - git_emake man \
403 - || die "emake man failed"
404 - if use doc ; then
405 - git_emake info html \
406 - || die "emake info html failed"
407 - fi
408 - else
409 - if use doc ; then
410 - git_emake info \
411 - || die "emake info html failed"
412 - fi
413 - fi
414 -
415 - if use subversion ; then
416 - cd "${S}"/contrib/svn-fe
417 - # by defining EXTLIBS we override the detection for libintl and
418 - # libiconv, bug #516168
419 - local nlsiconv=
420 - use nls && use !elibc_glibc && nlsiconv+=" -lintl"
421 - use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
422 - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
423 - if use doc ; then
424 - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
425 - fi
426 - cd "${S}"
427 - fi
428 -
429 - if use gnome-keyring ; then
430 - cd "${S}"/contrib/credential/gnome-keyring
431 - git_emake || die "emake git-credential-gnome-keyring failed"
432 - fi
433 -
434 - cd "${S}"/contrib/subtree
435 - git_emake
436 - use doc && git_emake doc
437 -
438 - if use mediawiki ; then
439 - cd "${S}"/contrib/mw-to-git
440 - git_emake
441 - fi
442 -}
443 -
444 -src_install() {
445 - git_emake \
446 - install || \
447 - die "make install failed"
448 -
449 - if [[ ${CHOST} == *-darwin* ]]; then
450 - dobin contrib/credential/osxkeychain/git-credential-osxkeychain
451 - fi
452 -
453 - # Depending on the tarball and manual rebuild of the documentation, the
454 - # manpages may exist in either OR both of these directories.
455 - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
456 - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
457 - dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
458 - use doc && dodir /usr/share/doc/${PF}/html
459 - for d in / /howto/ /technical/ ; do
460 - docinto ${d}
461 - dodoc Documentation${d}*.txt
462 - if use doc ; then
463 - docinto ${d}/html
464 - dodoc Documentation${d}*.html
465 - fi
466 - done
467 - docinto /
468 - # Upstream does not ship this pre-built :-(
469 - use doc && doinfo Documentation/{git,gitman}.info
470 -
471 - newbashcomp contrib/completion/git-completion.bash ${PN}
472 - bashcomp_alias git gitk
473 - # Not really a bash-completion file (bug #477920)
474 - # but still needed uncompressed (bug #507480)
475 - insinto /usr/share/${PN}
476 - doins contrib/completion/git-prompt.sh
477 -
478 - if use emacs ; then
479 - elisp-install ${PN} contrib/emacs/git.{el,elc}
480 - elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
481 - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
482 - # don't add automatically to the load-path, so the sitefile
483 - # can do a conditional loading
484 - touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
485 - elisp-site-file-install "${FILESDIR}"/${SITEFILE}
486 - fi
487 -
488 - if use python && use gtk ; then
489 - python_doscript "${S}"/contrib/gitview/gitview
490 - dodoc "${S}"/contrib/gitview/gitview.txt
491 - fi
492 -
493 - #dobin contrib/fast-import/git-p4 # Moved upstream
494 - #dodoc contrib/fast-import/git-p4.txt # Moved upstream
495 - newbin contrib/fast-import/import-tars.perl import-tars
496 - exeinto /usr/libexec/git-core/
497 - newexe contrib/git-resurrect.sh git-resurrect
498 -
499 - # git-subtree
500 - cd "${S}"/contrib/subtree
501 - git_emake install || die "Failed to emake install git-subtree"
502 - if use doc ; then
503 - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
504 - fi
505 - newdoc README README.git-subtree
506 - dodoc git-subtree.txt
507 - cd "${S}"
508 -
509 - if use mediawiki ; then
510 - cd "${S}"/contrib/mw-to-git
511 - git_emake install
512 - cd "${S}"
513 - fi
514 -
515 - # diff-highlight
516 - dobin contrib/diff-highlight/diff-highlight
517 - newdoc contrib/diff-highlight/README README.diff-highlight
518 -
519 - # git-jump
520 - exeinto /usr/libexec/git-core/
521 - doexe contrib/git-jump/git-jump
522 - newdoc contrib/git-jump/README git-jump.txt
523 -
524 - # git-contacts
525 - exeinto /usr/libexec/git-core/
526 - doexe contrib/contacts/git-contacts
527 - dodoc contrib/contacts/git-contacts.txt
528 -
529 - if use gnome-keyring ; then
530 - cd "${S}"/contrib/credential/gnome-keyring
531 - dobin git-credential-gnome-keyring
532 - fi
533 -
534 - if use subversion ; then
535 - cd "${S}"/contrib/svn-fe
536 - dobin svn-fe
537 - dodoc svn-fe.txt
538 - if use doc ; then
539 - doman svn-fe.1
540 - docinto html
541 - dodoc svn-fe.html
542 - fi
543 - cd "${S}"
544 - fi
545 -
546 - dodir /usr/share/${PN}/contrib
547 - # The following are excluded:
548 - # completion - installed above
549 - # credential/gnome-keyring TODO
550 - # diff-highlight - done above
551 - # emacs - installed above
552 - # examples - these are stuff that is not used in Git anymore actually
553 - # git-jump - done above
554 - # gitview - installed above
555 - # p4import - excluded because fast-import has a better one
556 - # patches - stuff the Git guys made to go upstream to other places
557 - # persistent-https - TODO
558 - # mw-to-git - TODO
559 - # subtree - build seperately
560 - # svnimport - use git-svn
561 - # thunderbird-patch-inline - fixes thunderbird
562 - for i in \
563 - buildsystems convert-objects fast-import \
564 - hg-to-git hooks remotes2config.sh rerere-train.sh \
565 - stats workdir \
566 - ; do
567 - cp -rf \
568 - "${S}"/contrib/${i} \
569 - "${ED}"/usr/share/${PN}/contrib \
570 - || die "Failed contrib ${i}"
571 - done
572 -
573 - if use perl && use cgi ; then
574 - # We used to install in /usr/share/${PN}/gitweb
575 - # but upstream installs in /usr/share/gitweb
576 - # so we will install a symlink and use their location for compat with other
577 - # distros
578 - dosym /usr/share/gitweb /usr/share/${PN}/gitweb
579 -
580 - # INSTALL discusses configuration issues, not just installation
581 - docinto /
582 - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
583 - newdoc "${S}"/gitweb/README README.gitweb
584 -
585 - find "${ED}"/usr/lib64/perl5/ \
586 - -name .packlist \
587 - -exec rm \{\} \;
588 - else
589 - rm -rf "${ED}"/usr/share/gitweb
590 - fi
591 -
592 - if ! use subversion ; then
593 - rm -f "${ED}"/usr/libexec/git-core/git-svn \
594 - "${ED}"/usr/share/man/man1/git-svn.1*
595 - fi
596 -
597 - if use xinetd ; then
598 - insinto /etc/xinetd.d
599 - newins "${FILESDIR}"/git-daemon.xinetd git-daemon
600 - fi
601 -
602 - if use !prefix ; then
603 - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
604 - newconfd "${FILESDIR}"/git-daemon.confd git-daemon
605 - systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
606 - systemd_dounit "${FILESDIR}/git-daemon.socket"
607 - fi
608 -
609 - perl_delete_localpod
610 -
611 - # Remove disabled linguas
612 - # we could remove sources in src_prepare, but install does not
613 - # handle missing locale dir well
614 - rm_loc() {
615 - if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
616 - rm -r "${ED}/usr/share/locale/${1}" || die
617 - fi
618 - }
619 - l10n_for_each_disabled_locale_do rm_loc
620 -}
621 -
622 -src_test() {
623 - local disabled=""
624 - local tests_cvs="t9200-git-cvsexportcommit.sh \
625 - t9400-git-cvsserver-server.sh \
626 - t9401-git-cvsserver-crlf.sh \
627 - t9402-git-cvsserver-refs.sh \
628 - t9600-cvsimport.sh \
629 - t9601-cvsimport-vendor-branch.sh \
630 - t9602-cvsimport-branches-tags.sh \
631 - t9603-cvsimport-patchsets.sh \
632 - t9604-cvsimport-timestamps.sh"
633 - local tests_perl="t3701-add-interactive.sh \
634 - t5502-quickfetch.sh \
635 - t5512-ls-remote.sh \
636 - t5520-pull.sh \
637 - t7106-reset-unborn-branch.sh \
638 - t7501-commit.sh"
639 - # Bug #225601 - t0004 is not suitable for root perm
640 - # Bug #219839 - t1004 is not suitable for root perm
641 - # t0001-init.sh - check for init notices EPERM* fails
642 - local tests_nonroot="t0001-init.sh \
643 - t0004-unwritable.sh \
644 - t0070-fundamental.sh \
645 - t1004-read-tree-m-u-wf.sh \
646 - t3700-add.sh \
647 - t7300-clean.sh"
648 - # t9100 still fails with symlinks in SVN 1.7
649 - local test_svn="t9100-git-svn-basic.sh"
650 -
651 - # Unzip is used only for the testcase code, not by any normal parts of Git.
652 - if ! has_version app-arch/unzip ; then
653 - einfo "Disabling tar-tree tests"
654 - disabled="${disabled} t5000-tar-tree.sh"
655 - fi
656 -
657 - cvs=0
658 - use cvs && let cvs=$cvs+1
659 - if [[ ${EUID} -eq 0 ]]; then
660 - if [[ $cvs -eq 1 ]]; then
661 - ewarn "Skipping CVS tests because CVS does not work as root!"
662 - ewarn "You should retest with FEATURES=userpriv!"
663 - disabled="${disabled} ${tests_cvs}"
664 - fi
665 - einfo "Skipping other tests that require being non-root"
666 - disabled="${disabled} ${tests_nonroot}"
667 - else
668 - [[ $cvs -gt 0 ]] && \
669 - has_version dev-vcs/cvs && \
670 - let cvs=$cvs+1
671 - [[ $cvs -gt 1 ]] && \
672 - has_version "dev-vcs/cvs[server]" && \
673 - let cvs=$cvs+1
674 - if [[ $cvs -lt 3 ]]; then
675 - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
676 - disabled="${disabled} ${tests_cvs}"
677 - fi
678 - fi
679 -
680 - if ! use perl ; then
681 - einfo "Disabling tests that need Perl"
682 - disabled="${disabled} ${tests_perl}"
683 - fi
684 -
685 - einfo "Disabling tests that fail with SVN 1.7"
686 - disabled="${disabled} ${test_svn}"
687 -
688 - # Reset all previously disabled tests
689 - cd "${S}/t"
690 - for i in *.sh.DISABLED ; do
691 - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
692 - done
693 - einfo "Disabled tests:"
694 - for i in ${disabled} ; do
695 - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
696 - done
697 -
698 - # Avoid the test system removing the results because we want them ourselves
699 - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
700 - -i "${S}"/t/Makefile
701 -
702 - # Clean old results first, must always run
703 - cd "${S}/t"
704 - nonfatal git_emake clean
705 -
706 - # Now run the tests, keep going if we hit an error, and don't terminate on
707 - # failure
708 - cd "${S}"
709 - einfo "Start test run"
710 - #MAKEOPTS=-j1
711 - nonfatal git_emake --keep-going test
712 - rc=$?
713 -
714 - # Display nice results, now print the results
715 - cd "${S}/t"
716 - nonfatal git_emake aggregate-results
717 -
718 - # And bail if there was a problem
719 - [ $rc -eq 0 ] || die "tests failed. Please file a bug."
720 -}
721 -
722 -showpkgdeps() {
723 - local pkg=$1
724 - shift
725 - elog " $(printf "%-17s:" ${pkg}) ${@}"
726 -}
727 -
728 -pkg_postinst() {
729 - use emacs && elisp-site-regen
730 - einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
731 - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
732 - einfo "Note that the prompt bash code is now in that separate script"
733 - elog "These additional scripts need some dependencies:"
734 - echo
735 - showpkgdeps git-quiltimport "dev-util/quilt"
736 - showpkgdeps git-instaweb \
737 - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
738 - echo
739 - use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
740 -}
741 -
742 -pkg_postrm() {
743 - use emacs && elisp-site-regen
744 -}
745
746 diff --git a/dev-vcs/git/git-2.4.11.ebuild b/dev-vcs/git/git-2.4.11.ebuild
747 deleted file mode 100644
748 index 4d1adaf..00000000
749 --- a/dev-vcs/git/git-2.4.11.ebuild
750 +++ /dev/null
751 @@ -1,633 +0,0 @@
752 -# Copyright 1999-2016 Gentoo Foundation
753 -# Distributed under the terms of the GNU General Public License v2
754 -# $Id$
755 -
756 -EAPI=5
757 -
758 -GENTOO_DEPEND_ON_PERL=no
759 -
760 -# bug #329479: git-remote-testgit is not multiple-version aware
761 -PYTHON_COMPAT=( python2_7 )
762 -[[ ${PV} == *9999 ]] && SCM="git-2"
763 -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
764 -EGIT_MASTER=pu
765 -
766 -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
767 -
768 -MY_PV="${PV/_rc/.rc}"
769 -MY_P="${PN}-${MY_PV}"
770 -
771 -DOC_VER=${MY_PV}
772 -
773 -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
774 -HOMEPAGE="http://www.git-scm.com/"
775 -if [[ ${PV} != *9999 ]]; then
776 - SRC_URI_SUFFIX="xz"
777 - SRC_URI_KORG="mirror://kernel/software/scm/git"
778 - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
779 - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
780 - doc? (
781 - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
782 - )"
783 - 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"
784 -fi
785 -
786 -LICENSE="GPL-2"
787 -SLOT="0"
788 -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"
789 -
790 -# Common to both DEPEND and RDEPEND
791 -CDEPEND="
792 - dev-libs/openssl:0=
793 - sys-libs/zlib
794 - pcre? ( dev-libs/libpcre )
795 - perl? ( dev-lang/perl:=[-build(-)] )
796 - tk? ( dev-lang/tk:0= )
797 - curl? (
798 - net-misc/curl
799 - webdav? ( dev-libs/expat )
800 - )
801 - emacs? ( virtual/emacs )
802 - gnome-keyring? ( gnome-base/libgnome-keyring )"
803 -
804 -RDEPEND="${CDEPEND}
805 - gpg? ( app-crypt/gnupg )
806 - mediawiki? (
807 - dev-perl/DateTime-Format-ISO8601
808 - dev-perl/HTML-Tree
809 - dev-perl/MediaWiki-API
810 - )
811 - perl? ( dev-perl/Error
812 - dev-perl/Net-SMTP-SSL
813 - dev-perl/Authen-SASL
814 - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
815 - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
816 - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
817 - )
818 - python? ( gtk?
819 - (
820 - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
821 - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
822 - )
823 - ${PYTHON_DEPS} )"
824 -
825 -# This is how info docs are created with Git:
826 -# .txt/asciidoc --(asciidoc)---------> .xml/docbook
827 -# .xml/docbook --(docbook2texi.pl)--> .texi
828 -# .texi --(makeinfo)---------> .info
829 -DEPEND="${CDEPEND}
830 - doc? (
831 - app-text/asciidoc
832 - app-text/docbook2X
833 - sys-apps/texinfo
834 - app-text/xmlto
835 - )
836 - nls? ( sys-devel/gettext )
837 - test? ( app-crypt/gnupg )"
838 -
839 -# Live ebuild builds man pages and HTML docs, additionally
840 -if [[ ${PV} == *9999 ]]; then
841 - DEPEND="${DEPEND}
842 - app-text/asciidoc"
843 -fi
844 -
845 -SITEFILE=50${PN}-gentoo.el
846 -S="${WORKDIR}/${MY_P}"
847 -
848 -REQUIRED_USE="
849 - cgi? ( perl )
850 - cvs? ( perl )
851 - mediawiki? ( perl )
852 - subversion? ( perl )
853 - webdav? ( curl )
854 - gtk? ( python )
855 - python? ( ${PYTHON_REQUIRED_USE} )
856 -"
857 -
858 -pkg_setup() {
859 - if use subversion && has_version "dev-vcs/subversion[dso]"; then
860 - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
861 - ewarn "with USE=dso, there may be weird crashes in git-svn. You"
862 - ewarn "have been warned."
863 - fi
864 - if use python ; then
865 - python-single-r1_pkg_setup
866 - fi
867 -}
868 -
869 -# This is needed because for some obscure reasons future calls to make don't
870 -# pick up these exports if we export them in src_unpack()
871 -exportmakeopts() {
872 - local myopts
873 -
874 - if use blksha1 ; then
875 - myopts+=" BLK_SHA1=YesPlease"
876 - elif use ppcsha1 ; then
877 - myopts+=" PPC_SHA1=YesPlease"
878 - fi
879 -
880 - if use curl ; then
881 - use webdav || myopts+=" NO_EXPAT=YesPlease"
882 - else
883 - myopts+=" NO_CURL=YesPlease"
884 - fi
885 -
886 - # broken assumptions, because of broken build system ...
887 - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
888 - myopts+=" INSTALL=install TAR=tar"
889 - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
890 - myopts+=" SANE_TOOL_PATH="
891 - myopts+=" OLD_ICONV="
892 - myopts+=" NO_EXTERNAL_GREP="
893 -
894 - # For svn-fe
895 - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
896 -
897 - # can't define this to null, since the entire makefile depends on it
898 - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
899 -
900 - use iconv \
901 - || myopts+=" NO_ICONV=YesPlease"
902 - use nls \
903 - || myopts+=" NO_GETTEXT=YesPlease"
904 - use tk \
905 - || myopts+=" NO_TCLTK=YesPlease"
906 - use pcre \
907 - && myopts+=" USE_LIBPCRE=yes" \
908 - && extlibs+=" -lpcre"
909 - use perl \
910 - && myopts+=" INSTALLDIRS=vendor" \
911 - || myopts+=" NO_PERL=YesPlease"
912 - use python \
913 - || myopts+=" NO_PYTHON=YesPlease"
914 - use subversion \
915 - || myopts+=" NO_SVN_TESTS=YesPlease"
916 - use threads \
917 - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
918 - || myopts+=" NO_PTHREADS=YesPlease"
919 - use cvs \
920 - || myopts+=" NO_CVS=YesPlease"
921 -# Disabled until ~m68k-mint can be keyworded again
922 -# if [[ ${CHOST} == *-mint* ]] ; then
923 -# myopts+=" NO_MMAP=YesPlease"
924 -# myopts+=" NO_IPV6=YesPlease"
925 -# myopts+=" NO_STRLCPY=YesPlease"
926 -# myopts+=" NO_MEMMEM=YesPlease"
927 -# myopts+=" NO_MKDTEMP=YesPlease"
928 -# myopts+=" NO_MKSTEMPS=YesPlease"
929 -# fi
930 - if [[ ${CHOST} == ia64-*-hpux* ]]; then
931 - myopts+=" NO_NSEC=YesPlease"
932 - fi
933 - if [[ ${CHOST} == *-*-aix* ]]; then
934 - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
935 - fi
936 - if [[ ${CHOST} == *-solaris* ]]; then
937 - myopts+=" NEEDS_LIBICONV=YesPlease"
938 - fi
939 -
940 - has_version '>=app-text/asciidoc-8.0' \
941 - && myopts+=" ASCIIDOC8=YesPlease"
942 - myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
943 -
944 - # Bug 290465:
945 - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
946 - [[ "${CHOST}" == *-uclibc* ]] && \
947 - myopts+=" NO_NSEC=YesPlease"
948 -
949 - export MY_MAKEOPTS="${myopts}"
950 - export EXTLIBS="${extlibs}"
951 -}
952 -
953 -src_unpack() {
954 - if [[ ${PV} != *9999 ]]; then
955 - unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
956 - cd "${S}"
957 - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
958 - use doc && \
959 - cd "${S}"/Documentation && \
960 - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
961 - cd "${S}"
962 - else
963 - git-2_src_unpack
964 - cd "${S}"
965 - #cp "${FILESDIR}"/GIT-VERSION-GEN .
966 - fi
967 -
968 -}
969 -
970 -src_prepare() {
971 - # bug #350330 - automagic CVS when we don't want it is bad.
972 - epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
973 -
974 - # install mediawiki perl modules also in vendor_dir
975 - # hack, needs better upstream solution
976 - epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
977 -
978 - epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
979 -
980 - epatch_user
981 -
982 - sed -i \
983 - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
984 - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
985 - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
986 - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
987 - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
988 - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
989 - Makefile contrib/svn-fe/Makefile || die "sed failed"
990 -
991 - # Never install the private copy of Error.pm (bug #296310)
992 - sed -i \
993 - -e '/private-Error.pm/s,^,#,' \
994 - perl/Makefile.PL
995 -
996 - # Fix docbook2texi command
997 - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
998 - Documentation/Makefile || die "sed failed"
999 -
1000 - # Fix git-subtree missing DESTDIR
1001 - sed -i \
1002 - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
1003 - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
1004 - contrib/subtree/Makefile
1005 -}
1006 -
1007 -git_emake() {
1008 - # bug #326625: PERL_PATH, PERL_MM_OPT
1009 - # bug #320647: PYTHON_PATH
1010 - PYTHON_PATH=""
1011 - use python && PYTHON_PATH="${PYTHON}"
1012 - emake ${MY_MAKEOPTS} \
1013 - DESTDIR="${D}" \
1014 - OPTCFLAGS="${CFLAGS}" \
1015 - OPTLDFLAGS="${LDFLAGS}" \
1016 - OPTCC="$(tc-getCC)" \
1017 - OPTAR="$(tc-getAR)" \
1018 - prefix="${EPREFIX}"/usr \
1019 - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
1020 - sysconfdir="${EPREFIX}"/etc \
1021 - PYTHON_PATH="${PYTHON_PATH}" \
1022 - PERL_MM_OPT="" \
1023 - GIT_TEST_OPTS="--no-color" \
1024 - V=1 \
1025 - "$@"
1026 - # This is the fix for bug #326625, but it also causes breakage, see bug
1027 - # #352693.
1028 - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
1029 -}
1030 -
1031 -src_configure() {
1032 - exportmakeopts
1033 -}
1034 -
1035 -src_compile() {
1036 - if use perl ; then
1037 - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
1038 - git_emake perl/perl.mak || die "emake perl/perl.mak failed"
1039 - fi
1040 - git_emake || die "emake failed"
1041 -
1042 - if use emacs ; then
1043 - elisp-compile contrib/emacs/git{,-blame}.el
1044 - fi
1045 -
1046 - if use perl && use cgi ; then
1047 - git_emake \
1048 - gitweb \
1049 - || die "emake gitweb (cgi) failed"
1050 - fi
1051 -
1052 - if [[ ${CHOST} == *-darwin* ]]; then
1053 - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
1054 - git_emake || die "emake credential-osxkeychain"
1055 - fi
1056 -
1057 - cd "${S}"/Documentation
1058 - if [[ ${PV} == *9999 ]] ; then
1059 - git_emake man \
1060 - || die "emake man failed"
1061 - if use doc ; then
1062 - git_emake info html \
1063 - || die "emake info html failed"
1064 - fi
1065 - else
1066 - if use doc ; then
1067 - git_emake info \
1068 - || die "emake info html failed"
1069 - fi
1070 - fi
1071 -
1072 - if use subversion ; then
1073 - cd "${S}"/contrib/svn-fe
1074 - # by defining EXTLIBS we override the detection for libintl and
1075 - # libiconv, bug #516168
1076 - local nlsiconv=
1077 - use nls && use !elibc_glibc && nlsiconv+=" -lintl"
1078 - use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
1079 - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
1080 - if use doc ; then
1081 - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
1082 - fi
1083 - cd "${S}"
1084 - fi
1085 -
1086 - if use gnome-keyring ; then
1087 - cd "${S}"/contrib/credential/gnome-keyring
1088 - git_emake || die "emake git-credential-gnome-keyring failed"
1089 - fi
1090 -
1091 - cd "${S}"/contrib/subtree
1092 - git_emake
1093 - use doc && git_emake doc
1094 -
1095 - if use mediawiki ; then
1096 - cd "${S}"/contrib/mw-to-git
1097 - git_emake
1098 - fi
1099 -}
1100 -
1101 -src_install() {
1102 - git_emake \
1103 - install || \
1104 - die "make install failed"
1105 -
1106 - if [[ ${CHOST} == *-darwin* ]]; then
1107 - dobin contrib/credential/osxkeychain/git-credential-osxkeychain
1108 - fi
1109 -
1110 - # Depending on the tarball and manual rebuild of the documentation, the
1111 - # manpages may exist in either OR both of these directories.
1112 - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
1113 - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
1114 -
1115 - dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
1116 - use doc && dodir /usr/share/doc/${PF}/html
1117 - for d in / /howto/ /technical/ ; do
1118 - docinto ${d}
1119 - dodoc Documentation${d}*.txt
1120 - use doc && dohtml -p ${d} Documentation${d}*.html
1121 - done
1122 - docinto /
1123 - # Upstream does not ship this pre-built :-(
1124 - use doc && doinfo Documentation/{git,gitman}.info
1125 -
1126 - newbashcomp contrib/completion/git-completion.bash ${PN}
1127 - bashcomp_alias git gitk
1128 - # Not really a bash-completion file (bug #477920)
1129 - # but still needed uncompressed (bug #507480)
1130 - insinto /usr/share/${PN}
1131 - doins contrib/completion/git-prompt.sh
1132 -
1133 - if use emacs ; then
1134 - elisp-install ${PN} contrib/emacs/git.{el,elc}
1135 - elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
1136 - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
1137 - # don't add automatically to the load-path, so the sitefile
1138 - # can do a conditional loading
1139 - touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
1140 - elisp-site-file-install "${FILESDIR}"/${SITEFILE}
1141 - fi
1142 -
1143 - if use python && use gtk ; then
1144 - python_doscript "${S}"/contrib/gitview/gitview
1145 - dodoc "${S}"/contrib/gitview/gitview.txt
1146 - fi
1147 -
1148 - #dobin contrib/fast-import/git-p4 # Moved upstream
1149 - #dodoc contrib/fast-import/git-p4.txt # Moved upstream
1150 - newbin contrib/fast-import/import-tars.perl import-tars
1151 - exeinto /usr/libexec/git-core/
1152 - newexe contrib/git-resurrect.sh git-resurrect
1153 -
1154 - # git-subtree
1155 - cd "${S}"/contrib/subtree
1156 - git_emake install || die "Failed to emake install git-subtree"
1157 - if use doc ; then
1158 - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
1159 - fi
1160 - newdoc README README.git-subtree
1161 - dodoc git-subtree.txt
1162 - cd "${S}"
1163 -
1164 - if use mediawiki ; then
1165 - cd "${S}"/contrib/mw-to-git
1166 - git_emake install
1167 - cd "${S}"
1168 - fi
1169 -
1170 - # diff-highlight
1171 - dobin contrib/diff-highlight/diff-highlight
1172 - newdoc contrib/diff-highlight/README README.diff-highlight
1173 -
1174 - # git-jump
1175 - exeinto /usr/libexec/git-core/
1176 - doexe contrib/git-jump/git-jump
1177 - newdoc contrib/git-jump/README git-jump.txt
1178 -
1179 - # git-contacts
1180 - exeinto /usr/libexec/git-core/
1181 - doexe contrib/contacts/git-contacts
1182 - dodoc contrib/contacts/git-contacts.txt
1183 -
1184 - if use gnome-keyring ; then
1185 - cd "${S}"/contrib/credential/gnome-keyring
1186 - dobin git-credential-gnome-keyring
1187 - fi
1188 -
1189 - if use subversion ; then
1190 - cd "${S}"/contrib/svn-fe
1191 - dobin svn-fe
1192 - dodoc svn-fe.txt
1193 - use doc && doman svn-fe.1 && dohtml svn-fe.html
1194 - cd "${S}"
1195 - fi
1196 -
1197 - dodir /usr/share/${PN}/contrib
1198 - # The following are excluded:
1199 - # completion - installed above
1200 - # credential/gnome-keyring TODO
1201 - # diff-highlight - done above
1202 - # emacs - installed above
1203 - # examples - these are stuff that is not used in Git anymore actually
1204 - # git-jump - done above
1205 - # gitview - installed above
1206 - # p4import - excluded because fast-import has a better one
1207 - # patches - stuff the Git guys made to go upstream to other places
1208 - # persistent-https - TODO
1209 - # mw-to-git - TODO
1210 - # subtree - build seperately
1211 - # svnimport - use git-svn
1212 - # thunderbird-patch-inline - fixes thunderbird
1213 - for i in \
1214 - buildsystems convert-objects fast-import \
1215 - hg-to-git hooks remotes2config.sh rerere-train.sh \
1216 - stats workdir \
1217 - ; do
1218 - cp -rf \
1219 - "${S}"/contrib/${i} \
1220 - "${ED}"/usr/share/${PN}/contrib \
1221 - || die "Failed contrib ${i}"
1222 - done
1223 -
1224 - if use perl && use cgi ; then
1225 - # We used to install in /usr/share/${PN}/gitweb
1226 - # but upstream installs in /usr/share/gitweb
1227 - # so we will install a symlink and use their location for compat with other
1228 - # distros
1229 - dosym /usr/share/gitweb /usr/share/${PN}/gitweb
1230 -
1231 - # INSTALL discusses configuration issues, not just installation
1232 - docinto /
1233 - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
1234 - newdoc "${S}"/gitweb/README README.gitweb
1235 -
1236 - find "${ED}"/usr/lib64/perl5/ \
1237 - -name .packlist \
1238 - -exec rm \{\} \;
1239 - else
1240 - rm -rf "${ED}"/usr/share/gitweb
1241 - fi
1242 -
1243 - if ! use subversion ; then
1244 - rm -f "${ED}"/usr/libexec/git-core/git-svn \
1245 - "${ED}"/usr/share/man/man1/git-svn.1*
1246 - fi
1247 -
1248 - if use xinetd ; then
1249 - insinto /etc/xinetd.d
1250 - newins "${FILESDIR}"/git-daemon.xinetd git-daemon
1251 - fi
1252 -
1253 - if use !prefix ; then
1254 - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
1255 - newconfd "${FILESDIR}"/git-daemon.confd git-daemon
1256 - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
1257 - systemd_dounit "${FILESDIR}/git-daemon.socket"
1258 - fi
1259 -
1260 - perl_delete_localpod
1261 -}
1262 -
1263 -src_test() {
1264 - local disabled="" #t7004-tag.sh" #520270
1265 - local tests_cvs="t9200-git-cvsexportcommit.sh \
1266 - t9400-git-cvsserver-server.sh \
1267 - t9401-git-cvsserver-crlf.sh \
1268 - t9402-git-cvsserver-refs.sh \
1269 - t9600-cvsimport.sh \
1270 - t9601-cvsimport-vendor-branch.sh \
1271 - t9602-cvsimport-branches-tags.sh \
1272 - t9603-cvsimport-patchsets.sh \
1273 - t9604-cvsimport-timestamps.sh"
1274 - local tests_perl="t3701-add-interactive.sh \
1275 - t5502-quickfetch.sh \
1276 - t5512-ls-remote.sh \
1277 - t5520-pull.sh \
1278 - t7106-reset-unborn-branch.sh \
1279 - t7501-commit.sh"
1280 - # Bug #225601 - t0004 is not suitable for root perm
1281 - # Bug #219839 - t1004 is not suitable for root perm
1282 - # t0001-init.sh - check for init notices EPERM* fails
1283 - local tests_nonroot="t0001-init.sh \
1284 - t0004-unwritable.sh \
1285 - t0070-fundamental.sh \
1286 - t1004-read-tree-m-u-wf.sh \
1287 - t3700-add.sh \
1288 - t7300-clean.sh"
1289 - # t9100 still fails with symlinks in SVN 1.7
1290 - local test_svn="t9100-git-svn-basic.sh"
1291 -
1292 - # Unzip is used only for the testcase code, not by any normal parts of Git.
1293 - if ! has_version app-arch/unzip ; then
1294 - einfo "Disabling tar-tree tests"
1295 - disabled="${disabled} t5000-tar-tree.sh"
1296 - fi
1297 -
1298 - cvs=0
1299 - use cvs && let cvs=$cvs+1
1300 - if [[ ${EUID} -eq 0 ]]; then
1301 - if [[ $cvs -eq 1 ]]; then
1302 - ewarn "Skipping CVS tests because CVS does not work as root!"
1303 - ewarn "You should retest with FEATURES=userpriv!"
1304 - disabled="${disabled} ${tests_cvs}"
1305 - fi
1306 - einfo "Skipping other tests that require being non-root"
1307 - disabled="${disabled} ${tests_nonroot}"
1308 - else
1309 - [[ $cvs -gt 0 ]] && \
1310 - has_version dev-vcs/cvs && \
1311 - let cvs=$cvs+1
1312 - [[ $cvs -gt 1 ]] && \
1313 - has_version "dev-vcs/cvs[server]" && \
1314 - let cvs=$cvs+1
1315 - if [[ $cvs -lt 3 ]]; then
1316 - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
1317 - disabled="${disabled} ${tests_cvs}"
1318 - fi
1319 - fi
1320 -
1321 - if ! use perl ; then
1322 - einfo "Disabling tests that need Perl"
1323 - disabled="${disabled} ${tests_perl}"
1324 - fi
1325 -
1326 - einfo "Disabling tests that fail with SVN 1.7"
1327 - disabled="${disabled} ${test_svn}"
1328 -
1329 - # Reset all previously disabled tests
1330 - cd "${S}/t"
1331 - for i in *.sh.DISABLED ; do
1332 - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
1333 - done
1334 - einfo "Disabled tests:"
1335 - for i in ${disabled} ; do
1336 - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
1337 - done
1338 -
1339 - # Avoid the test system removing the results because we want them ourselves
1340 - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
1341 - -i "${S}"/t/Makefile
1342 -
1343 - # Clean old results first, must always run
1344 - cd "${S}/t"
1345 - nonfatal git_emake clean
1346 -
1347 - # Now run the tests, keep going if we hit an error, and don't terminate on
1348 - # failure
1349 - cd "${S}"
1350 - einfo "Start test run"
1351 - #MAKEOPTS=-j1
1352 - nonfatal git_emake --keep-going test
1353 - rc=$?
1354 -
1355 - # Display nice results, now print the results
1356 - cd "${S}/t"
1357 - nonfatal git_emake aggregate-results
1358 -
1359 - # And bail if there was a problem
1360 - [ $rc -eq 0 ] || die "tests failed. Please file a bug."
1361 -}
1362 -
1363 -showpkgdeps() {
1364 - local pkg=$1
1365 - shift
1366 - elog " $(printf "%-17s:" ${pkg}) ${@}"
1367 -}
1368 -
1369 -pkg_postinst() {
1370 - use emacs && elisp-site-regen
1371 - einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
1372 - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
1373 - einfo "Note that the prompt bash code is now in that separate script"
1374 - elog "These additional scripts need some dependencies:"
1375 - echo
1376 - showpkgdeps git-quiltimport "dev-util/quilt"
1377 - showpkgdeps git-instaweb \
1378 - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
1379 - echo
1380 -}
1381 -
1382 -pkg_postrm() {
1383 - use emacs && elisp-site-regen
1384 -}
1385
1386 diff --git a/dev-vcs/git/git-2.5.5.ebuild b/dev-vcs/git/git-2.5.5.ebuild
1387 deleted file mode 100644
1388 index 0ddf8e8..00000000
1389 --- a/dev-vcs/git/git-2.5.5.ebuild
1390 +++ /dev/null
1391 @@ -1,637 +0,0 @@
1392 -# Copyright 1999-2016 Gentoo Foundation
1393 -# Distributed under the terms of the GNU General Public License v2
1394 -# $Id$
1395 -
1396 -EAPI=5
1397 -
1398 -GENTOO_DEPEND_ON_PERL=no
1399 -
1400 -# bug #329479: git-remote-testgit is not multiple-version aware
1401 -PYTHON_COMPAT=( python2_7 )
1402 -[[ ${PV} == *9999 ]] && SCM="git-2"
1403 -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
1404 -EGIT_MASTER=pu
1405 -
1406 -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
1407 -
1408 -MY_PV="${PV/_rc/.rc}"
1409 -MY_P="${PN}-${MY_PV}"
1410 -
1411 -DOC_VER=${MY_PV}
1412 -
1413 -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
1414 -HOMEPAGE="http://www.git-scm.com/"
1415 -if [[ ${PV} != *9999 ]]; then
1416 - SRC_URI_SUFFIX="xz"
1417 - SRC_URI_KORG="mirror://kernel/software/scm/git"
1418 - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
1419 - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
1420 - doc? (
1421 - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
1422 - )"
1423 - 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"
1424 -fi
1425 -
1426 -LICENSE="GPL-2"
1427 -SLOT="0"
1428 -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"
1429 -
1430 -# Common to both DEPEND and RDEPEND
1431 -CDEPEND="
1432 - !libressl? ( dev-libs/openssl:0= )
1433 - libressl? ( dev-libs/libressl:= )
1434 - sys-libs/zlib
1435 - pcre? ( dev-libs/libpcre )
1436 - perl? ( dev-lang/perl:=[-build(-)] )
1437 - tk? ( dev-lang/tk:0= )
1438 - curl? (
1439 - net-misc/curl
1440 - webdav? ( dev-libs/expat )
1441 - )
1442 - emacs? ( virtual/emacs )
1443 - gnome-keyring? ( gnome-base/libgnome-keyring )"
1444 -
1445 -RDEPEND="${CDEPEND}
1446 - gpg? ( app-crypt/gnupg )
1447 - mediawiki? (
1448 - dev-perl/DateTime-Format-ISO8601
1449 - dev-perl/HTML-Tree
1450 - dev-perl/MediaWiki-API
1451 - )
1452 - perl? ( dev-perl/Error
1453 - dev-perl/Net-SMTP-SSL
1454 - dev-perl/Authen-SASL
1455 - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
1456 - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
1457 - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
1458 - )
1459 - python? ( gtk?
1460 - (
1461 - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
1462 - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
1463 - )
1464 - ${PYTHON_DEPS} )"
1465 -
1466 -# This is how info docs are created with Git:
1467 -# .txt/asciidoc --(asciidoc)---------> .xml/docbook
1468 -# .xml/docbook --(docbook2texi.pl)--> .texi
1469 -# .texi --(makeinfo)---------> .info
1470 -DEPEND="${CDEPEND}
1471 - doc? (
1472 - app-text/asciidoc
1473 - app-text/docbook2X
1474 - sys-apps/texinfo
1475 - app-text/xmlto
1476 - )
1477 - nls? ( sys-devel/gettext )
1478 - test? ( app-crypt/gnupg )"
1479 -
1480 -# Live ebuild builds man pages and HTML docs, additionally
1481 -if [[ ${PV} == *9999 ]]; then
1482 - DEPEND="${DEPEND}
1483 - app-text/asciidoc"
1484 -fi
1485 -
1486 -SITEFILE=50${PN}-gentoo.el
1487 -S="${WORKDIR}/${MY_P}"
1488 -
1489 -REQUIRED_USE="
1490 - cgi? ( perl )
1491 - cvs? ( perl )
1492 - mediawiki? ( perl )
1493 - subversion? ( perl )
1494 - webdav? ( curl )
1495 - gtk? ( python )
1496 - python? ( ${PYTHON_REQUIRED_USE} )
1497 -"
1498 -
1499 -pkg_setup() {
1500 - if use subversion && has_version "dev-vcs/subversion[dso]"; then
1501 - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
1502 - ewarn "with USE=dso, there may be weird crashes in git-svn. You"
1503 - ewarn "have been warned."
1504 - fi
1505 - if use python ; then
1506 - python-single-r1_pkg_setup
1507 - fi
1508 -}
1509 -
1510 -# This is needed because for some obscure reasons future calls to make don't
1511 -# pick up these exports if we export them in src_unpack()
1512 -exportmakeopts() {
1513 - local myopts
1514 -
1515 - if use blksha1 ; then
1516 - myopts+=" BLK_SHA1=YesPlease"
1517 - elif use ppcsha1 ; then
1518 - myopts+=" PPC_SHA1=YesPlease"
1519 - fi
1520 -
1521 - if use curl ; then
1522 - use webdav || myopts+=" NO_EXPAT=YesPlease"
1523 - else
1524 - myopts+=" NO_CURL=YesPlease"
1525 - fi
1526 -
1527 - # broken assumptions, because of broken build system ...
1528 - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
1529 - myopts+=" INSTALL=install TAR=tar"
1530 - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
1531 - myopts+=" SANE_TOOL_PATH="
1532 - myopts+=" OLD_ICONV="
1533 - myopts+=" NO_EXTERNAL_GREP="
1534 -
1535 - # For svn-fe
1536 - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
1537 -
1538 - # can't define this to null, since the entire makefile depends on it
1539 - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
1540 -
1541 - use iconv \
1542 - || myopts+=" NO_ICONV=YesPlease"
1543 - use nls \
1544 - || myopts+=" NO_GETTEXT=YesPlease"
1545 - use tk \
1546 - || myopts+=" NO_TCLTK=YesPlease"
1547 - use pcre \
1548 - && myopts+=" USE_LIBPCRE=yes" \
1549 - && extlibs+=" -lpcre"
1550 - use perl \
1551 - && myopts+=" INSTALLDIRS=vendor" \
1552 - || myopts+=" NO_PERL=YesPlease"
1553 - use python \
1554 - || myopts+=" NO_PYTHON=YesPlease"
1555 - use subversion \
1556 - || myopts+=" NO_SVN_TESTS=YesPlease"
1557 - use threads \
1558 - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
1559 - || myopts+=" NO_PTHREADS=YesPlease"
1560 - use cvs \
1561 - || myopts+=" NO_CVS=YesPlease"
1562 -# Disabled until ~m68k-mint can be keyworded again
1563 -# if [[ ${CHOST} == *-mint* ]] ; then
1564 -# myopts+=" NO_MMAP=YesPlease"
1565 -# myopts+=" NO_IPV6=YesPlease"
1566 -# myopts+=" NO_STRLCPY=YesPlease"
1567 -# myopts+=" NO_MEMMEM=YesPlease"
1568 -# myopts+=" NO_MKDTEMP=YesPlease"
1569 -# myopts+=" NO_MKSTEMPS=YesPlease"
1570 -# fi
1571 - if [[ ${CHOST} == ia64-*-hpux* ]]; then
1572 - myopts+=" NO_NSEC=YesPlease"
1573 - fi
1574 - if [[ ${CHOST} == *-*-aix* ]]; then
1575 - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
1576 - fi
1577 - if [[ ${CHOST} == *-solaris* ]]; then
1578 - myopts+=" NEEDS_LIBICONV=YesPlease"
1579 - fi
1580 -
1581 - has_version '>=app-text/asciidoc-8.0' \
1582 - && myopts+=" ASCIIDOC8=YesPlease"
1583 - myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
1584 -
1585 - # Bug 290465:
1586 - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
1587 - [[ "${CHOST}" == *-uclibc* ]] && \
1588 - myopts+=" NO_NSEC=YesPlease"
1589 -
1590 - export MY_MAKEOPTS="${myopts}"
1591 - export EXTLIBS="${extlibs}"
1592 -}
1593 -
1594 -src_unpack() {
1595 - if [[ ${PV} != *9999 ]]; then
1596 - unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
1597 - cd "${S}"
1598 - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
1599 - use doc && \
1600 - cd "${S}"/Documentation && \
1601 - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
1602 - cd "${S}"
1603 - else
1604 - git-2_src_unpack
1605 - cd "${S}"
1606 - #cp "${FILESDIR}"/GIT-VERSION-GEN .
1607 - fi
1608 -
1609 -}
1610 -
1611 -src_prepare() {
1612 - # bug #350330 - automagic CVS when we don't want it is bad.
1613 - epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
1614 -
1615 - # install mediawiki perl modules also in vendor_dir
1616 - # hack, needs better upstream solution
1617 - epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
1618 -
1619 - epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
1620 -
1621 - # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
1622 - epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
1623 -
1624 - epatch_user
1625 -
1626 - sed -i \
1627 - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
1628 - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
1629 - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
1630 - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
1631 - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
1632 - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
1633 - Makefile contrib/svn-fe/Makefile || die "sed failed"
1634 -
1635 - # Never install the private copy of Error.pm (bug #296310)
1636 - sed -i \
1637 - -e '/private-Error.pm/s,^,#,' \
1638 - perl/Makefile.PL
1639 -
1640 - # Fix docbook2texi command
1641 - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
1642 - Documentation/Makefile || die "sed failed"
1643 -
1644 - # Fix git-subtree missing DESTDIR
1645 - sed -i \
1646 - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
1647 - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
1648 - contrib/subtree/Makefile
1649 -}
1650 -
1651 -git_emake() {
1652 - # bug #326625: PERL_PATH, PERL_MM_OPT
1653 - # bug #320647: PYTHON_PATH
1654 - PYTHON_PATH=""
1655 - use python && PYTHON_PATH="${PYTHON}"
1656 - emake ${MY_MAKEOPTS} \
1657 - DESTDIR="${D}" \
1658 - OPTCFLAGS="${CFLAGS}" \
1659 - OPTLDFLAGS="${LDFLAGS}" \
1660 - OPTCC="$(tc-getCC)" \
1661 - OPTAR="$(tc-getAR)" \
1662 - prefix="${EPREFIX}"/usr \
1663 - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
1664 - sysconfdir="${EPREFIX}"/etc \
1665 - PYTHON_PATH="${PYTHON_PATH}" \
1666 - PERL_MM_OPT="" \
1667 - GIT_TEST_OPTS="--no-color" \
1668 - V=1 \
1669 - "$@"
1670 - # This is the fix for bug #326625, but it also causes breakage, see bug
1671 - # #352693.
1672 - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
1673 -}
1674 -
1675 -src_configure() {
1676 - exportmakeopts
1677 -}
1678 -
1679 -src_compile() {
1680 - if use perl ; then
1681 - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
1682 - git_emake perl/perl.mak || die "emake perl/perl.mak failed"
1683 - fi
1684 - git_emake || die "emake failed"
1685 -
1686 - if use emacs ; then
1687 - elisp-compile contrib/emacs/git{,-blame}.el
1688 - fi
1689 -
1690 - if use perl && use cgi ; then
1691 - git_emake \
1692 - gitweb \
1693 - || die "emake gitweb (cgi) failed"
1694 - fi
1695 -
1696 - if [[ ${CHOST} == *-darwin* ]]; then
1697 - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
1698 - git_emake || die "emake credential-osxkeychain"
1699 - fi
1700 -
1701 - cd "${S}"/Documentation
1702 - if [[ ${PV} == *9999 ]] ; then
1703 - git_emake man \
1704 - || die "emake man failed"
1705 - if use doc ; then
1706 - git_emake info html \
1707 - || die "emake info html failed"
1708 - fi
1709 - else
1710 - if use doc ; then
1711 - git_emake info \
1712 - || die "emake info html failed"
1713 - fi
1714 - fi
1715 -
1716 - if use subversion ; then
1717 - cd "${S}"/contrib/svn-fe
1718 - # by defining EXTLIBS we override the detection for libintl and
1719 - # libiconv, bug #516168
1720 - local nlsiconv=
1721 - use nls && use !elibc_glibc && nlsiconv+=" -lintl"
1722 - use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
1723 - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
1724 - if use doc ; then
1725 - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
1726 - fi
1727 - cd "${S}"
1728 - fi
1729 -
1730 - if use gnome-keyring ; then
1731 - cd "${S}"/contrib/credential/gnome-keyring
1732 - git_emake || die "emake git-credential-gnome-keyring failed"
1733 - fi
1734 -
1735 - cd "${S}"/contrib/subtree
1736 - git_emake
1737 - use doc && git_emake doc
1738 -
1739 - if use mediawiki ; then
1740 - cd "${S}"/contrib/mw-to-git
1741 - git_emake
1742 - fi
1743 -}
1744 -
1745 -src_install() {
1746 - git_emake \
1747 - install || \
1748 - die "make install failed"
1749 -
1750 - if [[ ${CHOST} == *-darwin* ]]; then
1751 - dobin contrib/credential/osxkeychain/git-credential-osxkeychain
1752 - fi
1753 -
1754 - # Depending on the tarball and manual rebuild of the documentation, the
1755 - # manpages may exist in either OR both of these directories.
1756 - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
1757 - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
1758 -
1759 - dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
1760 - use doc && dodir /usr/share/doc/${PF}/html
1761 - for d in / /howto/ /technical/ ; do
1762 - docinto ${d}
1763 - dodoc Documentation${d}*.txt
1764 - use doc && dohtml -p ${d} Documentation${d}*.html
1765 - done
1766 - docinto /
1767 - # Upstream does not ship this pre-built :-(
1768 - use doc && doinfo Documentation/{git,gitman}.info
1769 -
1770 - newbashcomp contrib/completion/git-completion.bash ${PN}
1771 - bashcomp_alias git gitk
1772 - # Not really a bash-completion file (bug #477920)
1773 - # but still needed uncompressed (bug #507480)
1774 - insinto /usr/share/${PN}
1775 - doins contrib/completion/git-prompt.sh
1776 -
1777 - if use emacs ; then
1778 - elisp-install ${PN} contrib/emacs/git.{el,elc}
1779 - elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
1780 - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
1781 - # don't add automatically to the load-path, so the sitefile
1782 - # can do a conditional loading
1783 - touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
1784 - elisp-site-file-install "${FILESDIR}"/${SITEFILE}
1785 - fi
1786 -
1787 - if use python && use gtk ; then
1788 - python_doscript "${S}"/contrib/gitview/gitview
1789 - dodoc "${S}"/contrib/gitview/gitview.txt
1790 - fi
1791 -
1792 - #dobin contrib/fast-import/git-p4 # Moved upstream
1793 - #dodoc contrib/fast-import/git-p4.txt # Moved upstream
1794 - newbin contrib/fast-import/import-tars.perl import-tars
1795 - exeinto /usr/libexec/git-core/
1796 - newexe contrib/git-resurrect.sh git-resurrect
1797 -
1798 - # git-subtree
1799 - cd "${S}"/contrib/subtree
1800 - git_emake install || die "Failed to emake install git-subtree"
1801 - if use doc ; then
1802 - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
1803 - fi
1804 - newdoc README README.git-subtree
1805 - dodoc git-subtree.txt
1806 - cd "${S}"
1807 -
1808 - if use mediawiki ; then
1809 - cd "${S}"/contrib/mw-to-git
1810 - git_emake install
1811 - cd "${S}"
1812 - fi
1813 -
1814 - # diff-highlight
1815 - dobin contrib/diff-highlight/diff-highlight
1816 - newdoc contrib/diff-highlight/README README.diff-highlight
1817 -
1818 - # git-jump
1819 - exeinto /usr/libexec/git-core/
1820 - doexe contrib/git-jump/git-jump
1821 - newdoc contrib/git-jump/README git-jump.txt
1822 -
1823 - # git-contacts
1824 - exeinto /usr/libexec/git-core/
1825 - doexe contrib/contacts/git-contacts
1826 - dodoc contrib/contacts/git-contacts.txt
1827 -
1828 - if use gnome-keyring ; then
1829 - cd "${S}"/contrib/credential/gnome-keyring
1830 - dobin git-credential-gnome-keyring
1831 - fi
1832 -
1833 - if use subversion ; then
1834 - cd "${S}"/contrib/svn-fe
1835 - dobin svn-fe
1836 - dodoc svn-fe.txt
1837 - use doc && doman svn-fe.1 && dohtml svn-fe.html
1838 - cd "${S}"
1839 - fi
1840 -
1841 - dodir /usr/share/${PN}/contrib
1842 - # The following are excluded:
1843 - # completion - installed above
1844 - # credential/gnome-keyring TODO
1845 - # diff-highlight - done above
1846 - # emacs - installed above
1847 - # examples - these are stuff that is not used in Git anymore actually
1848 - # git-jump - done above
1849 - # gitview - installed above
1850 - # p4import - excluded because fast-import has a better one
1851 - # patches - stuff the Git guys made to go upstream to other places
1852 - # persistent-https - TODO
1853 - # mw-to-git - TODO
1854 - # subtree - build seperately
1855 - # svnimport - use git-svn
1856 - # thunderbird-patch-inline - fixes thunderbird
1857 - for i in \
1858 - buildsystems convert-objects fast-import \
1859 - hg-to-git hooks remotes2config.sh rerere-train.sh \
1860 - stats workdir \
1861 - ; do
1862 - cp -rf \
1863 - "${S}"/contrib/${i} \
1864 - "${ED}"/usr/share/${PN}/contrib \
1865 - || die "Failed contrib ${i}"
1866 - done
1867 -
1868 - if use perl && use cgi ; then
1869 - # We used to install in /usr/share/${PN}/gitweb
1870 - # but upstream installs in /usr/share/gitweb
1871 - # so we will install a symlink and use their location for compat with other
1872 - # distros
1873 - dosym /usr/share/gitweb /usr/share/${PN}/gitweb
1874 -
1875 - # INSTALL discusses configuration issues, not just installation
1876 - docinto /
1877 - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
1878 - newdoc "${S}"/gitweb/README README.gitweb
1879 -
1880 - find "${ED}"/usr/lib64/perl5/ \
1881 - -name .packlist \
1882 - -exec rm \{\} \;
1883 - else
1884 - rm -rf "${ED}"/usr/share/gitweb
1885 - fi
1886 -
1887 - if ! use subversion ; then
1888 - rm -f "${ED}"/usr/libexec/git-core/git-svn \
1889 - "${ED}"/usr/share/man/man1/git-svn.1*
1890 - fi
1891 -
1892 - if use xinetd ; then
1893 - insinto /etc/xinetd.d
1894 - newins "${FILESDIR}"/git-daemon.xinetd git-daemon
1895 - fi
1896 -
1897 - if use !prefix ; then
1898 - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
1899 - newconfd "${FILESDIR}"/git-daemon.confd git-daemon
1900 - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
1901 - systemd_dounit "${FILESDIR}/git-daemon.socket"
1902 - fi
1903 -
1904 - perl_delete_localpod
1905 -}
1906 -
1907 -src_test() {
1908 - local disabled="" #t7004-tag.sh" #520270
1909 - local tests_cvs="t9200-git-cvsexportcommit.sh \
1910 - t9400-git-cvsserver-server.sh \
1911 - t9401-git-cvsserver-crlf.sh \
1912 - t9402-git-cvsserver-refs.sh \
1913 - t9600-cvsimport.sh \
1914 - t9601-cvsimport-vendor-branch.sh \
1915 - t9602-cvsimport-branches-tags.sh \
1916 - t9603-cvsimport-patchsets.sh \
1917 - t9604-cvsimport-timestamps.sh"
1918 - local tests_perl="t3701-add-interactive.sh \
1919 - t5502-quickfetch.sh \
1920 - t5512-ls-remote.sh \
1921 - t5520-pull.sh \
1922 - t7106-reset-unborn-branch.sh \
1923 - t7501-commit.sh"
1924 - # Bug #225601 - t0004 is not suitable for root perm
1925 - # Bug #219839 - t1004 is not suitable for root perm
1926 - # t0001-init.sh - check for init notices EPERM* fails
1927 - local tests_nonroot="t0001-init.sh \
1928 - t0004-unwritable.sh \
1929 - t0070-fundamental.sh \
1930 - t1004-read-tree-m-u-wf.sh \
1931 - t3700-add.sh \
1932 - t7300-clean.sh"
1933 - # t9100 still fails with symlinks in SVN 1.7
1934 - local test_svn="t9100-git-svn-basic.sh"
1935 -
1936 - # Unzip is used only for the testcase code, not by any normal parts of Git.
1937 - if ! has_version app-arch/unzip ; then
1938 - einfo "Disabling tar-tree tests"
1939 - disabled="${disabled} t5000-tar-tree.sh"
1940 - fi
1941 -
1942 - cvs=0
1943 - use cvs && let cvs=$cvs+1
1944 - if [[ ${EUID} -eq 0 ]]; then
1945 - if [[ $cvs -eq 1 ]]; then
1946 - ewarn "Skipping CVS tests because CVS does not work as root!"
1947 - ewarn "You should retest with FEATURES=userpriv!"
1948 - disabled="${disabled} ${tests_cvs}"
1949 - fi
1950 - einfo "Skipping other tests that require being non-root"
1951 - disabled="${disabled} ${tests_nonroot}"
1952 - else
1953 - [[ $cvs -gt 0 ]] && \
1954 - has_version dev-vcs/cvs && \
1955 - let cvs=$cvs+1
1956 - [[ $cvs -gt 1 ]] && \
1957 - has_version "dev-vcs/cvs[server]" && \
1958 - let cvs=$cvs+1
1959 - if [[ $cvs -lt 3 ]]; then
1960 - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
1961 - disabled="${disabled} ${tests_cvs}"
1962 - fi
1963 - fi
1964 -
1965 - if ! use perl ; then
1966 - einfo "Disabling tests that need Perl"
1967 - disabled="${disabled} ${tests_perl}"
1968 - fi
1969 -
1970 - einfo "Disabling tests that fail with SVN 1.7"
1971 - disabled="${disabled} ${test_svn}"
1972 -
1973 - # Reset all previously disabled tests
1974 - cd "${S}/t"
1975 - for i in *.sh.DISABLED ; do
1976 - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
1977 - done
1978 - einfo "Disabled tests:"
1979 - for i in ${disabled} ; do
1980 - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
1981 - done
1982 -
1983 - # Avoid the test system removing the results because we want them ourselves
1984 - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
1985 - -i "${S}"/t/Makefile
1986 -
1987 - # Clean old results first, must always run
1988 - cd "${S}/t"
1989 - nonfatal git_emake clean
1990 -
1991 - # Now run the tests, keep going if we hit an error, and don't terminate on
1992 - # failure
1993 - cd "${S}"
1994 - einfo "Start test run"
1995 - #MAKEOPTS=-j1
1996 - nonfatal git_emake --keep-going test
1997 - rc=$?
1998 -
1999 - # Display nice results, now print the results
2000 - cd "${S}/t"
2001 - nonfatal git_emake aggregate-results
2002 -
2003 - # And bail if there was a problem
2004 - [ $rc -eq 0 ] || die "tests failed. Please file a bug."
2005 -}
2006 -
2007 -showpkgdeps() {
2008 - local pkg=$1
2009 - shift
2010 - elog " $(printf "%-17s:" ${pkg}) ${@}"
2011 -}
2012 -
2013 -pkg_postinst() {
2014 - use emacs && elisp-site-regen
2015 - einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
2016 - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
2017 - einfo "Note that the prompt bash code is now in that separate script"
2018 - elog "These additional scripts need some dependencies:"
2019 - echo
2020 - showpkgdeps git-quiltimport "dev-util/quilt"
2021 - showpkgdeps git-instaweb \
2022 - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
2023 - echo
2024 -}
2025 -
2026 -pkg_postrm() {
2027 - use emacs && elisp-site-regen
2028 -}
2029
2030 diff --git a/dev-vcs/git/git-2.6.6.ebuild b/dev-vcs/git/git-2.6.6.ebuild
2031 deleted file mode 100644
2032 index 0ddf8e8..00000000
2033 --- a/dev-vcs/git/git-2.6.6.ebuild
2034 +++ /dev/null
2035 @@ -1,637 +0,0 @@
2036 -# Copyright 1999-2016 Gentoo Foundation
2037 -# Distributed under the terms of the GNU General Public License v2
2038 -# $Id$
2039 -
2040 -EAPI=5
2041 -
2042 -GENTOO_DEPEND_ON_PERL=no
2043 -
2044 -# bug #329479: git-remote-testgit is not multiple-version aware
2045 -PYTHON_COMPAT=( python2_7 )
2046 -[[ ${PV} == *9999 ]] && SCM="git-2"
2047 -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
2048 -EGIT_MASTER=pu
2049 -
2050 -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
2051 -
2052 -MY_PV="${PV/_rc/.rc}"
2053 -MY_P="${PN}-${MY_PV}"
2054 -
2055 -DOC_VER=${MY_PV}
2056 -
2057 -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
2058 -HOMEPAGE="http://www.git-scm.com/"
2059 -if [[ ${PV} != *9999 ]]; then
2060 - SRC_URI_SUFFIX="xz"
2061 - SRC_URI_KORG="mirror://kernel/software/scm/git"
2062 - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
2063 - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
2064 - doc? (
2065 - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
2066 - )"
2067 - 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"
2068 -fi
2069 -
2070 -LICENSE="GPL-2"
2071 -SLOT="0"
2072 -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"
2073 -
2074 -# Common to both DEPEND and RDEPEND
2075 -CDEPEND="
2076 - !libressl? ( dev-libs/openssl:0= )
2077 - libressl? ( dev-libs/libressl:= )
2078 - sys-libs/zlib
2079 - pcre? ( dev-libs/libpcre )
2080 - perl? ( dev-lang/perl:=[-build(-)] )
2081 - tk? ( dev-lang/tk:0= )
2082 - curl? (
2083 - net-misc/curl
2084 - webdav? ( dev-libs/expat )
2085 - )
2086 - emacs? ( virtual/emacs )
2087 - gnome-keyring? ( gnome-base/libgnome-keyring )"
2088 -
2089 -RDEPEND="${CDEPEND}
2090 - gpg? ( app-crypt/gnupg )
2091 - mediawiki? (
2092 - dev-perl/DateTime-Format-ISO8601
2093 - dev-perl/HTML-Tree
2094 - dev-perl/MediaWiki-API
2095 - )
2096 - perl? ( dev-perl/Error
2097 - dev-perl/Net-SMTP-SSL
2098 - dev-perl/Authen-SASL
2099 - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
2100 - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
2101 - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
2102 - )
2103 - python? ( gtk?
2104 - (
2105 - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
2106 - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
2107 - )
2108 - ${PYTHON_DEPS} )"
2109 -
2110 -# This is how info docs are created with Git:
2111 -# .txt/asciidoc --(asciidoc)---------> .xml/docbook
2112 -# .xml/docbook --(docbook2texi.pl)--> .texi
2113 -# .texi --(makeinfo)---------> .info
2114 -DEPEND="${CDEPEND}
2115 - doc? (
2116 - app-text/asciidoc
2117 - app-text/docbook2X
2118 - sys-apps/texinfo
2119 - app-text/xmlto
2120 - )
2121 - nls? ( sys-devel/gettext )
2122 - test? ( app-crypt/gnupg )"
2123 -
2124 -# Live ebuild builds man pages and HTML docs, additionally
2125 -if [[ ${PV} == *9999 ]]; then
2126 - DEPEND="${DEPEND}
2127 - app-text/asciidoc"
2128 -fi
2129 -
2130 -SITEFILE=50${PN}-gentoo.el
2131 -S="${WORKDIR}/${MY_P}"
2132 -
2133 -REQUIRED_USE="
2134 - cgi? ( perl )
2135 - cvs? ( perl )
2136 - mediawiki? ( perl )
2137 - subversion? ( perl )
2138 - webdav? ( curl )
2139 - gtk? ( python )
2140 - python? ( ${PYTHON_REQUIRED_USE} )
2141 -"
2142 -
2143 -pkg_setup() {
2144 - if use subversion && has_version "dev-vcs/subversion[dso]"; then
2145 - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
2146 - ewarn "with USE=dso, there may be weird crashes in git-svn. You"
2147 - ewarn "have been warned."
2148 - fi
2149 - if use python ; then
2150 - python-single-r1_pkg_setup
2151 - fi
2152 -}
2153 -
2154 -# This is needed because for some obscure reasons future calls to make don't
2155 -# pick up these exports if we export them in src_unpack()
2156 -exportmakeopts() {
2157 - local myopts
2158 -
2159 - if use blksha1 ; then
2160 - myopts+=" BLK_SHA1=YesPlease"
2161 - elif use ppcsha1 ; then
2162 - myopts+=" PPC_SHA1=YesPlease"
2163 - fi
2164 -
2165 - if use curl ; then
2166 - use webdav || myopts+=" NO_EXPAT=YesPlease"
2167 - else
2168 - myopts+=" NO_CURL=YesPlease"
2169 - fi
2170 -
2171 - # broken assumptions, because of broken build system ...
2172 - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
2173 - myopts+=" INSTALL=install TAR=tar"
2174 - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
2175 - myopts+=" SANE_TOOL_PATH="
2176 - myopts+=" OLD_ICONV="
2177 - myopts+=" NO_EXTERNAL_GREP="
2178 -
2179 - # For svn-fe
2180 - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
2181 -
2182 - # can't define this to null, since the entire makefile depends on it
2183 - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
2184 -
2185 - use iconv \
2186 - || myopts+=" NO_ICONV=YesPlease"
2187 - use nls \
2188 - || myopts+=" NO_GETTEXT=YesPlease"
2189 - use tk \
2190 - || myopts+=" NO_TCLTK=YesPlease"
2191 - use pcre \
2192 - && myopts+=" USE_LIBPCRE=yes" \
2193 - && extlibs+=" -lpcre"
2194 - use perl \
2195 - && myopts+=" INSTALLDIRS=vendor" \
2196 - || myopts+=" NO_PERL=YesPlease"
2197 - use python \
2198 - || myopts+=" NO_PYTHON=YesPlease"
2199 - use subversion \
2200 - || myopts+=" NO_SVN_TESTS=YesPlease"
2201 - use threads \
2202 - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
2203 - || myopts+=" NO_PTHREADS=YesPlease"
2204 - use cvs \
2205 - || myopts+=" NO_CVS=YesPlease"
2206 -# Disabled until ~m68k-mint can be keyworded again
2207 -# if [[ ${CHOST} == *-mint* ]] ; then
2208 -# myopts+=" NO_MMAP=YesPlease"
2209 -# myopts+=" NO_IPV6=YesPlease"
2210 -# myopts+=" NO_STRLCPY=YesPlease"
2211 -# myopts+=" NO_MEMMEM=YesPlease"
2212 -# myopts+=" NO_MKDTEMP=YesPlease"
2213 -# myopts+=" NO_MKSTEMPS=YesPlease"
2214 -# fi
2215 - if [[ ${CHOST} == ia64-*-hpux* ]]; then
2216 - myopts+=" NO_NSEC=YesPlease"
2217 - fi
2218 - if [[ ${CHOST} == *-*-aix* ]]; then
2219 - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
2220 - fi
2221 - if [[ ${CHOST} == *-solaris* ]]; then
2222 - myopts+=" NEEDS_LIBICONV=YesPlease"
2223 - fi
2224 -
2225 - has_version '>=app-text/asciidoc-8.0' \
2226 - && myopts+=" ASCIIDOC8=YesPlease"
2227 - myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
2228 -
2229 - # Bug 290465:
2230 - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
2231 - [[ "${CHOST}" == *-uclibc* ]] && \
2232 - myopts+=" NO_NSEC=YesPlease"
2233 -
2234 - export MY_MAKEOPTS="${myopts}"
2235 - export EXTLIBS="${extlibs}"
2236 -}
2237 -
2238 -src_unpack() {
2239 - if [[ ${PV} != *9999 ]]; then
2240 - unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
2241 - cd "${S}"
2242 - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
2243 - use doc && \
2244 - cd "${S}"/Documentation && \
2245 - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
2246 - cd "${S}"
2247 - else
2248 - git-2_src_unpack
2249 - cd "${S}"
2250 - #cp "${FILESDIR}"/GIT-VERSION-GEN .
2251 - fi
2252 -
2253 -}
2254 -
2255 -src_prepare() {
2256 - # bug #350330 - automagic CVS when we don't want it is bad.
2257 - epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
2258 -
2259 - # install mediawiki perl modules also in vendor_dir
2260 - # hack, needs better upstream solution
2261 - epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
2262 -
2263 - epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
2264 -
2265 - # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
2266 - epatch "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
2267 -
2268 - epatch_user
2269 -
2270 - sed -i \
2271 - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
2272 - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
2273 - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
2274 - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
2275 - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
2276 - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
2277 - Makefile contrib/svn-fe/Makefile || die "sed failed"
2278 -
2279 - # Never install the private copy of Error.pm (bug #296310)
2280 - sed -i \
2281 - -e '/private-Error.pm/s,^,#,' \
2282 - perl/Makefile.PL
2283 -
2284 - # Fix docbook2texi command
2285 - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
2286 - Documentation/Makefile || die "sed failed"
2287 -
2288 - # Fix git-subtree missing DESTDIR
2289 - sed -i \
2290 - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
2291 - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
2292 - contrib/subtree/Makefile
2293 -}
2294 -
2295 -git_emake() {
2296 - # bug #326625: PERL_PATH, PERL_MM_OPT
2297 - # bug #320647: PYTHON_PATH
2298 - PYTHON_PATH=""
2299 - use python && PYTHON_PATH="${PYTHON}"
2300 - emake ${MY_MAKEOPTS} \
2301 - DESTDIR="${D}" \
2302 - OPTCFLAGS="${CFLAGS}" \
2303 - OPTLDFLAGS="${LDFLAGS}" \
2304 - OPTCC="$(tc-getCC)" \
2305 - OPTAR="$(tc-getAR)" \
2306 - prefix="${EPREFIX}"/usr \
2307 - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
2308 - sysconfdir="${EPREFIX}"/etc \
2309 - PYTHON_PATH="${PYTHON_PATH}" \
2310 - PERL_MM_OPT="" \
2311 - GIT_TEST_OPTS="--no-color" \
2312 - V=1 \
2313 - "$@"
2314 - # This is the fix for bug #326625, but it also causes breakage, see bug
2315 - # #352693.
2316 - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
2317 -}
2318 -
2319 -src_configure() {
2320 - exportmakeopts
2321 -}
2322 -
2323 -src_compile() {
2324 - if use perl ; then
2325 - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
2326 - git_emake perl/perl.mak || die "emake perl/perl.mak failed"
2327 - fi
2328 - git_emake || die "emake failed"
2329 -
2330 - if use emacs ; then
2331 - elisp-compile contrib/emacs/git{,-blame}.el
2332 - fi
2333 -
2334 - if use perl && use cgi ; then
2335 - git_emake \
2336 - gitweb \
2337 - || die "emake gitweb (cgi) failed"
2338 - fi
2339 -
2340 - if [[ ${CHOST} == *-darwin* ]]; then
2341 - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
2342 - git_emake || die "emake credential-osxkeychain"
2343 - fi
2344 -
2345 - cd "${S}"/Documentation
2346 - if [[ ${PV} == *9999 ]] ; then
2347 - git_emake man \
2348 - || die "emake man failed"
2349 - if use doc ; then
2350 - git_emake info html \
2351 - || die "emake info html failed"
2352 - fi
2353 - else
2354 - if use doc ; then
2355 - git_emake info \
2356 - || die "emake info html failed"
2357 - fi
2358 - fi
2359 -
2360 - if use subversion ; then
2361 - cd "${S}"/contrib/svn-fe
2362 - # by defining EXTLIBS we override the detection for libintl and
2363 - # libiconv, bug #516168
2364 - local nlsiconv=
2365 - use nls && use !elibc_glibc && nlsiconv+=" -lintl"
2366 - use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
2367 - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
2368 - if use doc ; then
2369 - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
2370 - fi
2371 - cd "${S}"
2372 - fi
2373 -
2374 - if use gnome-keyring ; then
2375 - cd "${S}"/contrib/credential/gnome-keyring
2376 - git_emake || die "emake git-credential-gnome-keyring failed"
2377 - fi
2378 -
2379 - cd "${S}"/contrib/subtree
2380 - git_emake
2381 - use doc && git_emake doc
2382 -
2383 - if use mediawiki ; then
2384 - cd "${S}"/contrib/mw-to-git
2385 - git_emake
2386 - fi
2387 -}
2388 -
2389 -src_install() {
2390 - git_emake \
2391 - install || \
2392 - die "make install failed"
2393 -
2394 - if [[ ${CHOST} == *-darwin* ]]; then
2395 - dobin contrib/credential/osxkeychain/git-credential-osxkeychain
2396 - fi
2397 -
2398 - # Depending on the tarball and manual rebuild of the documentation, the
2399 - # manpages may exist in either OR both of these directories.
2400 - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
2401 - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
2402 -
2403 - dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
2404 - use doc && dodir /usr/share/doc/${PF}/html
2405 - for d in / /howto/ /technical/ ; do
2406 - docinto ${d}
2407 - dodoc Documentation${d}*.txt
2408 - use doc && dohtml -p ${d} Documentation${d}*.html
2409 - done
2410 - docinto /
2411 - # Upstream does not ship this pre-built :-(
2412 - use doc && doinfo Documentation/{git,gitman}.info
2413 -
2414 - newbashcomp contrib/completion/git-completion.bash ${PN}
2415 - bashcomp_alias git gitk
2416 - # Not really a bash-completion file (bug #477920)
2417 - # but still needed uncompressed (bug #507480)
2418 - insinto /usr/share/${PN}
2419 - doins contrib/completion/git-prompt.sh
2420 -
2421 - if use emacs ; then
2422 - elisp-install ${PN} contrib/emacs/git.{el,elc}
2423 - elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
2424 - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
2425 - # don't add automatically to the load-path, so the sitefile
2426 - # can do a conditional loading
2427 - touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
2428 - elisp-site-file-install "${FILESDIR}"/${SITEFILE}
2429 - fi
2430 -
2431 - if use python && use gtk ; then
2432 - python_doscript "${S}"/contrib/gitview/gitview
2433 - dodoc "${S}"/contrib/gitview/gitview.txt
2434 - fi
2435 -
2436 - #dobin contrib/fast-import/git-p4 # Moved upstream
2437 - #dodoc contrib/fast-import/git-p4.txt # Moved upstream
2438 - newbin contrib/fast-import/import-tars.perl import-tars
2439 - exeinto /usr/libexec/git-core/
2440 - newexe contrib/git-resurrect.sh git-resurrect
2441 -
2442 - # git-subtree
2443 - cd "${S}"/contrib/subtree
2444 - git_emake install || die "Failed to emake install git-subtree"
2445 - if use doc ; then
2446 - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
2447 - fi
2448 - newdoc README README.git-subtree
2449 - dodoc git-subtree.txt
2450 - cd "${S}"
2451 -
2452 - if use mediawiki ; then
2453 - cd "${S}"/contrib/mw-to-git
2454 - git_emake install
2455 - cd "${S}"
2456 - fi
2457 -
2458 - # diff-highlight
2459 - dobin contrib/diff-highlight/diff-highlight
2460 - newdoc contrib/diff-highlight/README README.diff-highlight
2461 -
2462 - # git-jump
2463 - exeinto /usr/libexec/git-core/
2464 - doexe contrib/git-jump/git-jump
2465 - newdoc contrib/git-jump/README git-jump.txt
2466 -
2467 - # git-contacts
2468 - exeinto /usr/libexec/git-core/
2469 - doexe contrib/contacts/git-contacts
2470 - dodoc contrib/contacts/git-contacts.txt
2471 -
2472 - if use gnome-keyring ; then
2473 - cd "${S}"/contrib/credential/gnome-keyring
2474 - dobin git-credential-gnome-keyring
2475 - fi
2476 -
2477 - if use subversion ; then
2478 - cd "${S}"/contrib/svn-fe
2479 - dobin svn-fe
2480 - dodoc svn-fe.txt
2481 - use doc && doman svn-fe.1 && dohtml svn-fe.html
2482 - cd "${S}"
2483 - fi
2484 -
2485 - dodir /usr/share/${PN}/contrib
2486 - # The following are excluded:
2487 - # completion - installed above
2488 - # credential/gnome-keyring TODO
2489 - # diff-highlight - done above
2490 - # emacs - installed above
2491 - # examples - these are stuff that is not used in Git anymore actually
2492 - # git-jump - done above
2493 - # gitview - installed above
2494 - # p4import - excluded because fast-import has a better one
2495 - # patches - stuff the Git guys made to go upstream to other places
2496 - # persistent-https - TODO
2497 - # mw-to-git - TODO
2498 - # subtree - build seperately
2499 - # svnimport - use git-svn
2500 - # thunderbird-patch-inline - fixes thunderbird
2501 - for i in \
2502 - buildsystems convert-objects fast-import \
2503 - hg-to-git hooks remotes2config.sh rerere-train.sh \
2504 - stats workdir \
2505 - ; do
2506 - cp -rf \
2507 - "${S}"/contrib/${i} \
2508 - "${ED}"/usr/share/${PN}/contrib \
2509 - || die "Failed contrib ${i}"
2510 - done
2511 -
2512 - if use perl && use cgi ; then
2513 - # We used to install in /usr/share/${PN}/gitweb
2514 - # but upstream installs in /usr/share/gitweb
2515 - # so we will install a symlink and use their location for compat with other
2516 - # distros
2517 - dosym /usr/share/gitweb /usr/share/${PN}/gitweb
2518 -
2519 - # INSTALL discusses configuration issues, not just installation
2520 - docinto /
2521 - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
2522 - newdoc "${S}"/gitweb/README README.gitweb
2523 -
2524 - find "${ED}"/usr/lib64/perl5/ \
2525 - -name .packlist \
2526 - -exec rm \{\} \;
2527 - else
2528 - rm -rf "${ED}"/usr/share/gitweb
2529 - fi
2530 -
2531 - if ! use subversion ; then
2532 - rm -f "${ED}"/usr/libexec/git-core/git-svn \
2533 - "${ED}"/usr/share/man/man1/git-svn.1*
2534 - fi
2535 -
2536 - if use xinetd ; then
2537 - insinto /etc/xinetd.d
2538 - newins "${FILESDIR}"/git-daemon.xinetd git-daemon
2539 - fi
2540 -
2541 - if use !prefix ; then
2542 - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
2543 - newconfd "${FILESDIR}"/git-daemon.confd git-daemon
2544 - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
2545 - systemd_dounit "${FILESDIR}/git-daemon.socket"
2546 - fi
2547 -
2548 - perl_delete_localpod
2549 -}
2550 -
2551 -src_test() {
2552 - local disabled="" #t7004-tag.sh" #520270
2553 - local tests_cvs="t9200-git-cvsexportcommit.sh \
2554 - t9400-git-cvsserver-server.sh \
2555 - t9401-git-cvsserver-crlf.sh \
2556 - t9402-git-cvsserver-refs.sh \
2557 - t9600-cvsimport.sh \
2558 - t9601-cvsimport-vendor-branch.sh \
2559 - t9602-cvsimport-branches-tags.sh \
2560 - t9603-cvsimport-patchsets.sh \
2561 - t9604-cvsimport-timestamps.sh"
2562 - local tests_perl="t3701-add-interactive.sh \
2563 - t5502-quickfetch.sh \
2564 - t5512-ls-remote.sh \
2565 - t5520-pull.sh \
2566 - t7106-reset-unborn-branch.sh \
2567 - t7501-commit.sh"
2568 - # Bug #225601 - t0004 is not suitable for root perm
2569 - # Bug #219839 - t1004 is not suitable for root perm
2570 - # t0001-init.sh - check for init notices EPERM* fails
2571 - local tests_nonroot="t0001-init.sh \
2572 - t0004-unwritable.sh \
2573 - t0070-fundamental.sh \
2574 - t1004-read-tree-m-u-wf.sh \
2575 - t3700-add.sh \
2576 - t7300-clean.sh"
2577 - # t9100 still fails with symlinks in SVN 1.7
2578 - local test_svn="t9100-git-svn-basic.sh"
2579 -
2580 - # Unzip is used only for the testcase code, not by any normal parts of Git.
2581 - if ! has_version app-arch/unzip ; then
2582 - einfo "Disabling tar-tree tests"
2583 - disabled="${disabled} t5000-tar-tree.sh"
2584 - fi
2585 -
2586 - cvs=0
2587 - use cvs && let cvs=$cvs+1
2588 - if [[ ${EUID} -eq 0 ]]; then
2589 - if [[ $cvs -eq 1 ]]; then
2590 - ewarn "Skipping CVS tests because CVS does not work as root!"
2591 - ewarn "You should retest with FEATURES=userpriv!"
2592 - disabled="${disabled} ${tests_cvs}"
2593 - fi
2594 - einfo "Skipping other tests that require being non-root"
2595 - disabled="${disabled} ${tests_nonroot}"
2596 - else
2597 - [[ $cvs -gt 0 ]] && \
2598 - has_version dev-vcs/cvs && \
2599 - let cvs=$cvs+1
2600 - [[ $cvs -gt 1 ]] && \
2601 - has_version "dev-vcs/cvs[server]" && \
2602 - let cvs=$cvs+1
2603 - if [[ $cvs -lt 3 ]]; then
2604 - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
2605 - disabled="${disabled} ${tests_cvs}"
2606 - fi
2607 - fi
2608 -
2609 - if ! use perl ; then
2610 - einfo "Disabling tests that need Perl"
2611 - disabled="${disabled} ${tests_perl}"
2612 - fi
2613 -
2614 - einfo "Disabling tests that fail with SVN 1.7"
2615 - disabled="${disabled} ${test_svn}"
2616 -
2617 - # Reset all previously disabled tests
2618 - cd "${S}/t"
2619 - for i in *.sh.DISABLED ; do
2620 - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
2621 - done
2622 - einfo "Disabled tests:"
2623 - for i in ${disabled} ; do
2624 - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
2625 - done
2626 -
2627 - # Avoid the test system removing the results because we want them ourselves
2628 - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
2629 - -i "${S}"/t/Makefile
2630 -
2631 - # Clean old results first, must always run
2632 - cd "${S}/t"
2633 - nonfatal git_emake clean
2634 -
2635 - # Now run the tests, keep going if we hit an error, and don't terminate on
2636 - # failure
2637 - cd "${S}"
2638 - einfo "Start test run"
2639 - #MAKEOPTS=-j1
2640 - nonfatal git_emake --keep-going test
2641 - rc=$?
2642 -
2643 - # Display nice results, now print the results
2644 - cd "${S}/t"
2645 - nonfatal git_emake aggregate-results
2646 -
2647 - # And bail if there was a problem
2648 - [ $rc -eq 0 ] || die "tests failed. Please file a bug."
2649 -}
2650 -
2651 -showpkgdeps() {
2652 - local pkg=$1
2653 - shift
2654 - elog " $(printf "%-17s:" ${pkg}) ${@}"
2655 -}
2656 -
2657 -pkg_postinst() {
2658 - use emacs && elisp-site-regen
2659 - einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
2660 - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
2661 - einfo "Note that the prompt bash code is now in that separate script"
2662 - elog "These additional scripts need some dependencies:"
2663 - echo
2664 - showpkgdeps git-quiltimport "dev-util/quilt"
2665 - showpkgdeps git-instaweb \
2666 - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
2667 - echo
2668 -}
2669 -
2670 -pkg_postrm() {
2671 - use emacs && elisp-site-regen
2672 -}