mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-30 18:12:08 +02:00
Merge pull request #325 from flatcar-linux/dongsu/git-2.35.3
dev-vcs/git: update to 2.35.3
This commit is contained in:
Dongsu Park
GitHub
commit
5c7150679e
1
sdk_container/src/third_party/portage-stable/changelog/security/2022-05-05-git-2.35.3.md
vendored
Normal file
1
sdk_container/src/third_party/portage-stable/changelog/security/2022-05-05-git-2.35.3.md
vendored
Normal file
@ -0,0 +1 @@
|
||||
- git ([CVE-2022-24765](https://nvd.nist.gov/vuln/detail/CVE-2022-24765))
|
||||
1
sdk_container/src/third_party/portage-stable/changelog/updates/2022-05-05-git-2.35.3.md
vendored
Normal file
1
sdk_container/src/third_party/portage-stable/changelog/updates/2022-05-05-git-2.35.3.md
vendored
Normal file
@ -0,0 +1 @@
|
||||
- git ([2.35.3](https://github.com/git/git/blob/v2.35.3/Documentation/RelNotes/2.35.3.txt))
|
||||
@ -1,21 +1,21 @@
|
||||
DIST git-2.26.3.tar.xz 6009184 BLAKE2B 12c0b8fb460024e7767919cac3e36ecb215e25566eb907e11495c086e1d43d790c2aa8edd178d53abc3f7eaee968a6c89e92a6575d4d11f9740567b357056aee SHA512 a88f8ab156f12770590110b30da83631f19a349f3b7af25fd0a5e8f03c78daec0a4935e9a1a5637f100c147cc57fca4aa3386e18756a6382983e7baa7456e398
|
||||
DIST git-2.28.1.tar.xz 6119248 BLAKE2B 69999a39d1c5c1dc69b8c7721a594104b51d2af691e1f2ef6a2f2bee99bd5b319c856cfccc4166cfd3426cf8eb58b3b4aea5ed2ae15061fba0f0f3e44c7d24e4 SHA512 6acd7f42eeaf4fcb085fe2ab3d65f53a264fd38ef84321b77eb7c21bbb146e42ec9f27cc36cd9f3569f6d1758742119efd0af9bf6414fe7c577c434ed154fb8f
|
||||
DIST git-2.29.3.tar.xz 6189996 BLAKE2B 9e30b7c4eab0d74a7d3d1387774958fc1ce7fde6239bd8daaa277304cde1f3249484fd703a1827c703ec9400ac2c1e7c288bd2956a3854521bf561437de58617 SHA512 3a21be5005675e5406964519f3c8441826b311274de8c5bacdc3ede564efef3d87f085682f31c89166a5022738a3cbd8e767d2bca3bd57d6f55b2451e36681dd
|
||||
DIST git-2.30.2.tar.xz 6329820 BLAKE2B 1c553c183d5426c524852bfba38b39196d9f0fb83854fec3291959474374db41a68a4118785412037ba16230662d94f03b05bb7ea577f0272552e63b68086f95 SHA512 4f7e1c30f8eee849d1febeda872d56c60c5d051a31726505a4c7bab11b274d3a2ab5588f910b7b49c5c0ec5228a18457f705c7b66e8bbdf809d3c75c59032b7e
|
||||
DIST git-2.31.1.tar.xz 6413368 BLAKE2B 2d40aa3e5336e57b3cab42c36dd07698be7a811e2890f4c9ecaaa375f985313bb8e14fe7a70c1beff3009a9102b935e4a6065019ab3b2520f09339e2a0fcdb93 SHA512 9aa334a3e8519700ff5d112153ec42677722980094caa9d22aa91afdb65166bd9a98fa445c0d327c428ebfa73bf4832e9b3836109a1d9319feafe3191cfd170e
|
||||
DIST git-2.32.0.tar.xz 6551348 BLAKE2B 546203ce3f749ba806866a9e9767bc807794cec435fd0b60306ae6cd2b1b17a0159ef9774c79c4f59d0dba45b36941085b55f103e1820450d560bffa41d1058f SHA512 1ab3e7022ccee411d14a7da5c37d6259ef5c0f85ebed8f49698e25c65cbc7a46f8096919fcb6568360bfe284dd7475b596eee1a167db966096255a405853837c
|
||||
DIST git-2.33.0.tar.xz 6548308 BLAKE2B 52310a54a059ca1926ed14326bad5430f0bc8b19601c640fcaf6be58e2f9e9b2c0b7b34c4a3b80e84bb52cbd7c8c6a1b8b53c977af11f6714d32c34121221a63 SHA512 1abbcdf9ff640c95934b6a78341baa76ac3a5838c4751f513f334fdf5a3760c730e309f05ad16ffec115896e3e0c750c116683f6a787d92757ee9d916a346bfd
|
||||
DIST git-htmldocs-2.26.3.tar.xz 1305208 BLAKE2B d5bb834b00a9d0cd3cdcd671e33142595e4ac28be8eab2326263f548718d52cf141b7fa6afee8da05a15ac75252455945dd34d60ffe5cda6cf1d612b7ee35953 SHA512 ff6c912572d32a1f32ec4c73e07e1404155ccbf81509a741e25e9dbcf42e5348dce59c40b0bb5d64993d8a981e2afd773393b2aeacde457870aa1f03feb9a1a6
|
||||
DIST git-htmldocs-2.28.1.tar.xz 1348296 BLAKE2B 6bbaf94a963204d85100554578fb2520c44b74332e6dfd0f468fa3217efad2a484ef427359411569ca503a809aec00edde21ab577ee9ddc9779f0b702402ed4c SHA512 9e672673f271a136f9c2d1ed827dbc76656b40315cb5d11d95aa18c006fad8ea2c2535f2092f1b6514a6ae7f88589178fc90299b496f446debb673e8f36f8909
|
||||
DIST git-htmldocs-2.29.3.tar.xz 1365468 BLAKE2B b8b2d46a5b35f6962f06bd9837ddc613aa5f4096dcdabea4308fcc52bf4f639fbdade2f91e01738cce6befb8b63faf57f8ecab1200048794d873f12055f04bdd SHA512 217a313636b5e7470e58d21428c81262f9d9909227f6a47c8445eb301bb20dd8393d0e600b8e7dad04b030a688561f93cdce317ad714cecd0505c198e1fe44a2
|
||||
DIST git-htmldocs-2.30.2.tar.xz 1342648 BLAKE2B a81b2111a79b7b211f99c0ac2b3d397d627316fc1eab56f091088b4ff26d80c353efcea4154f84640dea952dddaf496f3c8f63d2c371d6ce97bf888fad2db237 SHA512 7fc8bb1a9e484f5f49ad41c89ee8e5059970e3091e1d72b86800f8d255fe00be3d8072194cbc913ef6d98aa014ba9e8efae062a9ae595f4dcafaa0c3e637d297
|
||||
DIST git-htmldocs-2.31.1.tar.xz 1357592 BLAKE2B 54b48cfe2bb8e5dad9fdff862aa91e5805b0cd331b459d51a71ed913ca68d1aea6c6c69cfadbe8b6101b4d7be63c3811027a2ed42f9d2b0d3509664726b8ad78 SHA512 d243f4e3047c0e29bdd9127ff529c7fab5ebf40a4afaa04c3a9261ae398aa61c16a4413b7bf580c7f874d632b866908d92322ea0502141d811b78b7636c8d28b
|
||||
DIST git-2.33.1.tar.xz 6558636 BLAKE2B f4959d5309f85e063448673a3f06f1d3cdd65ced5f5173cfe5a38df3b5547cae1c08275bda02e48307e8290628735e2ea1ff49222262e7cd29b252a6aa4d4a15 SHA512 16d417183232e1057bea754d59cdf4bbacc5f1527d1de6ee04cdd293a2512bfa7208e20f6130816605528b59cb1bc3188c5bddf1a42c1413095ee74e44dd2f91
|
||||
DIST git-2.34.1.tar.xz 6623760 BLAKE2B 9b5d7a450ec495898bcc0e1f6ae87c0ad102d039cf7c4106cdfe3ada501d9bfaf22b83c522de383d3c01f7d5a29dbfd7fc44b371efa8fc3a418ab3c609a692c1 SHA512 a1a8e9e6f64b1da25508fbd2f783564dcdbe181fb5ff1ebab3bdac6db6094e18acc334479a1abf22ac17ce4f733cc3e10a664db9ab234cd523735a3f027b42db
|
||||
DIST git-2.35.1.tar.xz 6874520 BLAKE2B 028ff97b47748871da145720d0d258a0dcf4acc60b10c787dee5703fcab5f6e621c5671ee9e7a25009e82a2830400f35fa232d88c62606a6687260c744680025 SHA512 926c6813ef61931e1a1c43dfd7b15e20dc5878c1752876bd08f039249c9ed09f20f096b2f01947de9c9522c942e9fa8c1363d7d31a488bbe3f93c0cff31fcbcb
|
||||
DIST git-2.35.2.tar.xz 6876028 BLAKE2B 2d59f0ef195770b3bd57ef8160ab24da5e14025316bb0cce30048116c71e9c45f0818a12a95a84f680071454ef80e3071b615c64a165771c1c8720c20ff4dba8 SHA512 fac143daf547f4f1952101bc0006b53ac50c1741394a8c75dc517f595ce58b183c7daabcb23a7f9fc87fe22250e298441b0b7cc7af93820110877d65c036b76a
|
||||
DIST git-2.35.3.tar.xz 6876328 BLAKE2B f584e9d94d167ba19bd2a00377f04eb4edf69cddbd2993a324178338b2e20e7fd126b51882ac7c7914c5118d0eab1ff9beddeb96a901a18fdfe027e21351ab61 SHA512 c92f8663988c57702bb5ee542ac8f36e8a43d377d16106ee462ce0b0a575b9d51baaafc654bf1821fbea2fe476ffd64d7fb87084c7de4dd8065b01d5083492c5
|
||||
DIST git-2.36.0.tar.xz 7003024 BLAKE2B 72bb148fc5fded2976554788eaf599d20fe9f200ac1dd1ddd4ed89f7f5c8d6c1025907080620bab477b4efadf41d883e890dff73c80d0ff5f0becd83f13ebd88 SHA512 dce0d7dbe684af070271830a01bf1b9cc289182f5106f6e3303b1b3a0d5dc74bebf6ac0174373db05a28f5acc62acb095bc9385dabeeecc1d6e8567dce29b766
|
||||
DIST git-htmldocs-2.32.0.tar.xz 1381664 BLAKE2B d1b47aa99d32a252fd20df26eff44a558044f3a389379b161bb43621eb28375eb0621969849a31938ba7fc9fc58b140d27d703559ea5735d0a0ffd2e93cd9692 SHA512 12b84e342f0d19afe385ab8a685ae625e86c3295d1555992e0c427b361aa2cdfc89a679e7dbc468d3568a325dafbf699468aadcdb02f93e372eff3dd96a7cf7f
|
||||
DIST git-htmldocs-2.33.0.tar.xz 1393260 BLAKE2B 4a43ce9d184a9c69d27a4c80e93ed5e138bb9d043272fbbda5399af00e089e138bd6d68d3f77b1907ae5edfe4d8a83a33ce0b8c38e20e0b363f5ac6367d16f7f SHA512 8cb2210be8022f9152045f72d0be30eb45134ec78edb47f99c83fa47d9fe7247fa918692d30bdefb24b246c143f3f987930c14a0a06b45448bb230c12036e0bc
|
||||
DIST git-manpages-2.26.3.tar.xz 462116 BLAKE2B 3191f719c5f2f0df34a66a041ab8590cbb43ed8df6d4b430df04e4255544048a982c00dbcbc7d7d9057830d5354c595d853e9f7558efdd6049be74e81d61a20d SHA512 8f9b64b0554867a56a647ac4f76351858342f84a38fd9977c606612c034dcad552afba8489a81ce227ed48a90d78f23d203452086175e218efb3f0fe8429f9f9
|
||||
DIST git-manpages-2.28.1.tar.xz 472404 BLAKE2B d6b411dee47439b91e61f93fdca24fc5a707807c9445b69df81be8cdf6b78e24ea8424c0a36a3b4bd7db82e303b4139449a3fdc7de43d65d50f8b9e936e73669 SHA512 b543934fb9a91636033a2a7262180bf62b5493be3c222fb882aa992fe15f9fc0b9cc6723f3afa65fe8c60b8909af4337139bc0c355df0ac063f9e915d4b574bd
|
||||
DIST git-manpages-2.29.3.tar.xz 478456 BLAKE2B e568b92badda851be5d5c0524455d1eb728e4633dd88144edc8e22d84c64ad195538d906ae3443789ea14607be536d1de0f30b448ab0860d605b65a6476455fb SHA512 5d1a26c1342c31ca3501f2e40ec55c6e5dddd1ee2de909ec65425dea92455f00ca23a10e7475dcfe5b9a60dc4c2012778e86797cc8922de20638fcc07c60d941
|
||||
DIST git-manpages-2.30.2.tar.xz 482180 BLAKE2B 97180d13ba73f229d205b662ca16d497baff57a23b9b621fab69bc1bb4f2ac4f52b861443917ae01ebab7130640e1b7352aa193d7c0cd945cb552749ee1367c9 SHA512 fcb2ab9dd4c29593d08b80f6731ccc3b9a54514d6cc002434f8e36277fd814d4be7e69f0563291cea4f16c35e4822def57ade50d7d10a897619b13c6a6893aa7
|
||||
DIST git-manpages-2.31.1.tar.xz 487784 BLAKE2B 9fe67839cca51f18b0aca16678eadb9ee8e609cbbae26bf1804c39b8bf5415e1069cb50162b75f9f8ec69bd6511f271d3116ac33016af2e57e65b88ad6c4b165 SHA512 a5fb8a1c3f08707d4d2d835a55b295677559856984ffeeb650827b433625a74f22ef4aac10e1b14eba5860e11567543b146d52dd055b2613e5a510e0f4f3c3fd
|
||||
DIST git-htmldocs-2.33.1.tar.xz 1396744 BLAKE2B cbd65cf08fc7ea466fcd72820ba3e2135ade37f69c436a4ee7276dc71fb62f6270b71e2f46d981f5681a0fd3c30613d61680c2ef2460d0d7d292f7455e114128 SHA512 5b856b919067e1f644539d43a85aab6f602537ea0970b6248b471e3fa6756a8494f0525a69d22ad3795fcf9e106ff8439e0f6716ba0b8c895d7aad8c59e5bd74
|
||||
DIST git-htmldocs-2.34.1.tar.xz 1406464 BLAKE2B 6ee2f58df3c1622d96ac4b1a70d4dc3d0c973635774dd6bb89fea3e502dd82d99d676e2f9cb33c14c429c3d4680cd6020213154099b3f7fe71ad67602ca9bc6c SHA512 cf9fa952d43e477528deece9f22d1bb63fa50b3a831fae20812c6af31c1dbaf193abe2fed48ac9966bcf1787442ceed19f00c00e524a1911f0ea31952a52fc8f
|
||||
DIST git-htmldocs-2.35.1.tar.xz 1410148 BLAKE2B 68c3d12341271b861f42135bd4bd6e68ebcc6466931d383378b49aac42f77187f3fadc237974349cb0b50e4c5fb7a8ab185114341dd3012d159e420405d9ef91 SHA512 52a40644a7cd38caddecc43182863ca2f456644fff918ed4c8f826cbf269352c73d6bdc9119d25fcf537bc2fa38750791013329e4b0e32c8d14f0769dab85804
|
||||
DIST git-htmldocs-2.35.2.tar.xz 1411248 BLAKE2B d4f318f6277015bb6aef3a556bbf7a9a6b02a7cf2f1ed696bb730b6a5fb32fe3dbdf01cf1737e2931f182bf451589349de53e7d02a868d40b013018973c5fe89 SHA512 118576bfeafd92b8b0dd92318504d74341a003358d937545c16fefcfde6b956fbaee0601e50b9a21719d2575a5a37585e36628b4ade8e42d9d0fec4ae616eaa0
|
||||
DIST git-htmldocs-2.35.3.tar.xz 1411664 BLAKE2B c7d849b9573a257de47fc8d654f7f791d21917cf65315b4ae6909ba2ebbe90970bc9e6c9949266913b1e529e662bfc375acee26ebf9304162eeccc87ce3da067 SHA512 52b97dab838fff1a865ae4d449fbb77fbac3c528666d1b936c73bffac856f16583d1b182379bc4e6851f78bccab519c3ea7e5902fc502b2e8ab7bb85043c7eea
|
||||
DIST git-htmldocs-2.36.0.tar.xz 1426148 BLAKE2B ba121e8f7d6a232f3df2b5a50c0f4a798c80808562c710f306f26fa79c124e5e1580c0626a2fce04f4a17b96d40a2683809550f37028cbc436b359de91100599 SHA512 62ee14c2f1ff34c0fbdf281ea2bb08bf6a24850d1d8dc68ffb12ae15e343c167ac869559395769fb352bd441baa8f2d45d696923a04e2f04bca921c990d75a9d
|
||||
DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e
|
||||
DIST git-manpages-2.33.0.tar.xz 492900 BLAKE2B 3f5e5cc8e9b493b272f2c9bd8b43a3bfd2f571bbcea8552471386cf8275d184d1559f61565bf33230cbba4ad9d36165173f016f53bf7240ca5e69bc5f5dd5cc3 SHA512 82b1e76cb457bd740dcc9614e0523064c1f6ef44654caa159efda555d201c8febf094f19cda0cdb3a828fefff30419a323976e64279eb361c1a6370e96245ed5
|
||||
DIST git-manpages-2.33.1.tar.xz 494288 BLAKE2B 1f8bd4f23de31a285d3f4327e562dddafdf9f28e8b36334e54f5e280c81fc8170e8b153ca42baa642d02d8e6fdfcac9a8fdd3cee1e32c29bcd53f689d1a6c463 SHA512 d465a7b491046b7a5da6ad1fc6c62b351c69905932e0672263de5a1d3abe1113660cff9fe30c7be1d1695c6170ceca5a11b3f65e9b2d1545f35cc653e4c6ad62
|
||||
DIST git-manpages-2.34.1.tar.xz 497280 BLAKE2B aa3c67cec861eb40eda3e7827d3e380fdfb6f189027fb7e5618258b80ac33918cb3c2ca4d2f8dc5fbee959578766564137e9c4818672f5138304270c486658fe SHA512 8f3b56fa477e5aafec3ef29933234c362a372f59ed95694c4fb82ebb82d2a8ebc0ac17ae36caa9185964eef1700ea8732816e73df4ddd918afc949a8371fa0d8
|
||||
DIST git-manpages-2.35.1.tar.xz 497284 BLAKE2B 2d0d633320982243316575cc278df6c6a9ef181bf45ea9c1c8288e2677e4e71a33af96bada9bd90b03310be7dd33f2762b6b95489e267e2c191dcc7d1a715fe7 SHA512 0f4c46880f0e6d493112dcd4753fbe3702c06aa68be09bcbfc90263a355deba080995a08916b1f2404e4e17d720ee0de46a55e450c6cabeb1c147dcb2cd919d5
|
||||
DIST git-manpages-2.35.2.tar.xz 497548 BLAKE2B 5e7c9e85879e57e5b157dc8d0a8b836d86e56e91c512079e46869b6e251cfd40d3a7016996cdb2d2323ca47180e50eb5d5f4bc93ce87713d61b34dcf714ba90e SHA512 70d483f2b14f5957c0b71cfc1131b0cfd8038e824ed93dea4b866fa539d582eb531edc284d89b70c188c85d0bd74096c171bbe42f0be550c6c14711b101a4046
|
||||
DIST git-manpages-2.35.3.tar.xz 497672 BLAKE2B aef5a7c579392f55fa63f1ce36c03579f4fcce443e867ac2a162a3d72344639ee11949748a51547315579b37e0fc6d5915ea203ddc556b2511125781428ce001 SHA512 25ac8f1690ccbc0e36b7d05115aebde1911909307ac29d930158b61ecd68972b8a9c3af018d73f34251d42cabf8d3d392173a448ec948df0a3119c2a2b87bd60
|
||||
DIST git-manpages-2.36.0.tar.xz 503604 BLAKE2B 438f533dce6628143c0ca348bc372017f049126933bf07a63ce9150114632a048778d8e0876970b406144aa584d512470ae4426be9c5bb8a3a581680ac9443a1 SHA512 67c2fb1c974ffe15aa09b9c36338f3ae9805573b35291e128210fc99c9fd97b1e26be571819d6b073c5adfe4c6f688c15e31790aa9eb62c1effacfb8aa21eb1c
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- git-2.2.0/contrib/svn-fe/Makefile
|
||||
+++ git-2.2.0/contrib/svn-fe/Makefile
|
||||
@@ -74,7 +74,7 @@
|
||||
endif
|
||||
|
||||
svn-fe$X: svn-fe.o $(VCSSVN_LIB) $(XDIFF_LIB) $(GIT_LIB)
|
||||
- $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(EXTLIBS) -o $@ svn-fe.o $(LIBS)
|
||||
+ $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ svn-fe.o $(LIBS) $(EXTLIBS)
|
||||
|
||||
svn-fe.o: svn-fe.c ../../vcs-svn/svndump.h
|
||||
$(QUIET_CC)$(CC) $(CFLAGS) -I../../vcs-svn -o $*.o -c $<
|
||||
@ -1,454 +0,0 @@
|
||||
From 1d3a35734efa1a1778612bb60cbbb495f65d3fc0 Mon Sep 17 00:00:00 2001
|
||||
From: Robin Johnson <robbat2@gentoo.org>
|
||||
Date: Tue, 14 May 2019 08:53:06 +0200
|
||||
Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
|
||||
utilities
|
||||
|
||||
Forward-ported from 1.7.12 to current git.git v1.8.4
|
||||
Forward-ported from v1.8.4 to v1.8.5.1
|
||||
Forward-ported from v1.8.5.3 to v1.9.0_rc3
|
||||
Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0
|
||||
Forward-ported from v2.0.0_rc0 to v2.0.0
|
||||
Forward-ported from v2.0.0 to v2.2.2
|
||||
Forward-ported from v2.2.2 to v2.8.4
|
||||
Forward-ported from v2.8.4 to v2.10.0
|
||||
Forward-ported from v2.10.0 to v2.12.0
|
||||
Forward-ported from v2.12.0 to v2.17.0-rc1
|
||||
Forward-ported from v2.17.0-rc1 to v2.18.0-rc1
|
||||
Forward-ported from v2.18.0-rc1 to v2.22.0-rc0
|
||||
|
||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
||||
---
|
||||
Makefile | 48 ++++++++++++++++++++++--------
|
||||
t/t9200-git-cvsexportcommit.sh | 5 ++++
|
||||
t/t9400-git-cvsserver-server.sh | 8 ++++-
|
||||
t/t9401-git-cvsserver-crlf.sh | 15 ++++++----
|
||||
t/t9600-cvsimport.sh | 41 +++++++++++++++----------
|
||||
t/t9601-cvsimport-vendor-branch.sh | 11 +++++++
|
||||
t/t9602-cvsimport-branches-tags.sh | 11 +++++++
|
||||
t/t9603-cvsimport-patchsets.sh | 11 +++++++
|
||||
t/test-lib.sh | 1 +
|
||||
9 files changed, 118 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index f965509b3c..ab8b22faf1 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -327,6 +327,8 @@ all::
|
||||
# Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep
|
||||
# and egrep that are pickier when their input contains non-ASCII data.
|
||||
#
|
||||
+# Define NO_CVS if you do not want any CVS interface utilities.
|
||||
+#
|
||||
# The TCL_PATH variable governs the location of the Tcl interpreter
|
||||
# used to optimize git-gui for your system. Only used if NO_TCLTK
|
||||
# is not set. Defaults to the bare 'tclsh'.
|
||||
@@ -597,6 +599,7 @@ PROGRAM_OBJS =
|
||||
PROGRAMS =
|
||||
EXCLUDED_PROGRAMS =
|
||||
SCRIPT_PERL =
|
||||
+SCRIPT_PERL_CVS =
|
||||
SCRIPT_PYTHON =
|
||||
SCRIPT_SH =
|
||||
SCRIPT_LIB =
|
||||
@@ -632,31 +635,33 @@ SCRIPT_LIB += git-sh-i18n
|
||||
|
||||
SCRIPT_PERL += git-add--interactive.perl
|
||||
SCRIPT_PERL += git-archimport.perl
|
||||
-SCRIPT_PERL += git-cvsexportcommit.perl
|
||||
-SCRIPT_PERL += git-cvsimport.perl
|
||||
-SCRIPT_PERL += git-cvsserver.perl
|
||||
SCRIPT_PERL += git-send-email.perl
|
||||
SCRIPT_PERL += git-svn.perl
|
||||
|
||||
+SCRIPT_PERL_CVS += git-cvsexportcommit.perl
|
||||
+SCRIPT_PERL_CVS += git-cvsimport.perl
|
||||
+SCRIPT_PERL_CVS += git-cvsserver.perl
|
||||
+
|
||||
SCRIPT_PYTHON += git-p4.py
|
||||
|
||||
# Generated files for scripts
|
||||
SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
|
||||
SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
|
||||
+SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS))
|
||||
SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
|
||||
|
||||
# Individual rules to allow e.g.
|
||||
# "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script"
|
||||
# from subdirectories like contrib/*/
|
||||
.PHONY: build-perl-script build-sh-script build-python-script
|
||||
-build-perl-script: $(SCRIPT_PERL_GEN)
|
||||
+build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
|
||||
build-sh-script: $(SCRIPT_SH_GEN)
|
||||
build-python-script: $(SCRIPT_PYTHON_GEN)
|
||||
|
||||
.PHONY: install-perl-script install-sh-script install-python-script
|
||||
install-sh-script: $(SCRIPT_SH_GEN)
|
||||
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
|
||||
-install-perl-script: $(SCRIPT_PERL_GEN)
|
||||
+install-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
|
||||
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
|
||||
install-python-script: $(SCRIPT_PYTHON_GEN)
|
||||
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
|
||||
@@ -665,12 +670,13 @@ install-python-script: $(SCRIPT_PYTHON_GEN)
|
||||
clean-sh-script:
|
||||
$(RM) $(SCRIPT_SH_GEN)
|
||||
clean-perl-script:
|
||||
- $(RM) $(SCRIPT_PERL_GEN)
|
||||
+ $(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
|
||||
clean-python-script:
|
||||
$(RM) $(SCRIPT_PYTHON_GEN)
|
||||
|
||||
SCRIPTS = $(SCRIPT_SH_GEN) \
|
||||
$(SCRIPT_PERL_GEN) \
|
||||
+ $(SCRIPT_PERL_CVS_GEN) \
|
||||
$(SCRIPT_PYTHON_GEN) \
|
||||
git-instaweb
|
||||
|
||||
@@ -2189,13 +2195,27 @@ git.res: git.rc GIT-VERSION-FILE GIT-PREFIX
|
||||
-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
|
||||
|
||||
# This makes sure we depend on the NO_PERL setting itself.
|
||||
-$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
|
||||
+$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS
|
||||
+
|
||||
+_SCRIPT_PERL_GEN =
|
||||
+_SCRIPT_PERL_NOGEN =
|
||||
|
||||
# Used for substitution in Perl modules. Disabled when using RUNTIME_PREFIX
|
||||
# since the locale directory is injected.
|
||||
perl_localedir_SQ = $(localedir_SQ)
|
||||
|
||||
ifndef NO_PERL
|
||||
+_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN)
|
||||
+
|
||||
+ifndef NO_CVS
|
||||
+_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN)
|
||||
+else
|
||||
+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN)
|
||||
+_REASON = NO_CVS
|
||||
+_REASON_CONTENT = $(NO_CVS)
|
||||
+endif # NO_CVS
|
||||
+
|
||||
+$(_SCRIPT_PERL_GEN):
|
||||
PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl
|
||||
PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ):$(perllibdir_SQ)
|
||||
|
||||
@@ -2216,7 +2236,7 @@ endif
|
||||
|
||||
PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir)
|
||||
|
||||
-$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
|
||||
+$(_SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
|
||||
$(QUIET_GEN)$(RM) $@ $@+ && \
|
||||
sed -e '1{' \
|
||||
-e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \
|
||||
@@ -2262,14 +2282,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
|
||||
chmod +x $@+ && \
|
||||
mv $@+ $@
|
||||
else # NO_PERL
|
||||
-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
|
||||
+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb
|
||||
+_REASON = NO_PERL
|
||||
+_REASON_CONTENT = $(NO_PERL)
|
||||
+endif # NO_PERL
|
||||
+
|
||||
+$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh
|
||||
$(QUIET_GEN)$(RM) $@ $@+ && \
|
||||
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
||||
- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
|
||||
+ -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \
|
||||
unimplemented.sh >$@+ && \
|
||||
chmod +x $@+ && \
|
||||
mv $@+ $@
|
||||
-endif # NO_PERL
|
||||
|
||||
# This makes sure we depend on the NO_PYTHON setting itself.
|
||||
$(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
|
||||
@@ -2518,7 +2542,7 @@ LOCALIZED_SH = $(SCRIPT_SH)
|
||||
LOCALIZED_SH += git-parse-remote.sh
|
||||
LOCALIZED_SH += git-rebase--preserve-merges.sh
|
||||
LOCALIZED_SH += git-sh-setup.sh
|
||||
-LOCALIZED_PERL = $(SCRIPT_PERL)
|
||||
+LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS)
|
||||
|
||||
ifdef XGETTEXT_INCLUDE_TESTS
|
||||
LOCALIZED_C += t/t0200/test.c
|
||||
diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
|
||||
index c5946cb0b8..223fd5409b 100755
|
||||
--- a/t/t9200-git-cvsexportcommit.sh
|
||||
+++ b/t/t9200-git-cvsexportcommit.sh
|
||||
@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then
|
||||
test_done
|
||||
fi
|
||||
|
||||
+if ! test_have_prereq CVS; then
|
||||
+ skip_all='skipping git cvsexportcommit tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
cvs >/dev/null 2>&1
|
||||
if test $? -ne 1
|
||||
then
|
||||
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
|
||||
index a5e5dca753..ef6d9c911c 100755
|
||||
--- a/t/t9400-git-cvsserver-server.sh
|
||||
+++ b/t/t9400-git-cvsserver-server.sh
|
||||
@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server'
|
||||
. ./test-lib.sh
|
||||
|
||||
if ! test_have_prereq PERL; then
|
||||
- skip_all='skipping git cvsserver tests, perl not available'
|
||||
+ skip_all='skipping git-cvsserver tests, perl not available'
|
||||
test_done
|
||||
fi
|
||||
+
|
||||
+if ! test_have_prereq CVS; then
|
||||
+ skip_all='skipping git-cvsserver tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
cvs >/dev/null 2>&1
|
||||
if test $? -ne 1
|
||||
then
|
||||
diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
|
||||
index 84787eee9a..eecba88527 100755
|
||||
--- a/t/t9401-git-cvsserver-crlf.sh
|
||||
+++ b/t/t9401-git-cvsserver-crlf.sh
|
||||
@@ -57,15 +57,20 @@ check_status_options() {
|
||||
return $stat
|
||||
}
|
||||
|
||||
-cvs >/dev/null 2>&1
|
||||
-if test $? -ne 1
|
||||
+if ! test_have_prereq PERL
|
||||
then
|
||||
- skip_all='skipping git-cvsserver tests, cvs not found'
|
||||
+ skip_all='skipping git-cvsserver tests, perl not available'
|
||||
test_done
|
||||
fi
|
||||
-if ! test_have_prereq PERL
|
||||
+if ! test_have_prereq CVS
|
||||
then
|
||||
- skip_all='skipping git-cvsserver tests, perl not available'
|
||||
+ skip_all='skipping git-cvsserver tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+cvs >/dev/null 2>&1
|
||||
+if test $? -ne 1
|
||||
+then
|
||||
+ skip_all='skipping git-cvsserver tests, cvs not found'
|
||||
test_done
|
||||
fi
|
||||
perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
|
||||
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
|
||||
index 251fdd66c4..596cd9d35d 100755
|
||||
--- a/t/t9600-cvsimport.sh
|
||||
+++ b/t/t9600-cvsimport.sh
|
||||
@@ -8,14 +8,25 @@ if ! test_have_prereq NOT_ROOT; then
|
||||
test_done
|
||||
fi
|
||||
|
||||
-test_expect_success PERL 'setup cvsroot environment' '
|
||||
+if ! test_have_prereq PERL
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, perl not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+if ! test_have_prereq CVS
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
+test_expect_success 'setup cvsroot environment' '
|
||||
CVSROOT=$(pwd)/cvsroot &&
|
||||
export CVSROOT
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'setup cvsroot' '$CVS init'
|
||||
+test_expect_success 'setup cvsroot' '$CVS init'
|
||||
|
||||
-test_expect_success PERL 'setup a cvs module' '
|
||||
+test_expect_success 'setup a cvs module' '
|
||||
|
||||
mkdir "$CVSROOT/module" &&
|
||||
$CVS co -d module-cvs module &&
|
||||
@@ -47,23 +58,23 @@ EOF
|
||||
)
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'import a trivial module' '
|
||||
+test_expect_success 'import a trivial module' '
|
||||
|
||||
git cvsimport -a -R -z 0 -C module-git module &&
|
||||
test_cmp module-cvs/o_fortuna module-git/o_fortuna
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
|
||||
+test_expect_success 'pack refs' '(cd module-git && git gc)'
|
||||
|
||||
-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
|
||||
+test_expect_success 'initial import has correct .git/cvs-revisions' '
|
||||
|
||||
(cd module-git &&
|
||||
git log --format="o_fortuna 1.1 %H" -1) > expected &&
|
||||
test_cmp expected module-git/.git/cvs-revisions
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'update cvs module' '
|
||||
+test_expect_success 'update cvs module' '
|
||||
(cd module-cvs &&
|
||||
cat <<EOF >o_fortuna &&
|
||||
O Fortune,
|
||||
@@ -91,7 +102,7 @@ EOF
|
||||
)
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'update git module' '
|
||||
+test_expect_success 'update git module' '
|
||||
|
||||
(cd module-git &&
|
||||
git config cvsimport.trackRevisions true &&
|
||||
@@ -102,7 +113,7 @@ test_expect_success PERL 'update git module' '
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'update has correct .git/cvs-revisions' '
|
||||
+test_expect_success 'update has correct .git/cvs-revisions' '
|
||||
|
||||
(cd module-git &&
|
||||
git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
|
||||
@@ -110,7 +121,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' '
|
||||
test_cmp expected module-git/.git/cvs-revisions
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'update cvs module' '
|
||||
+test_expect_success 'update cvs module' '
|
||||
|
||||
(cd module-cvs &&
|
||||
echo 1 >tick &&
|
||||
@@ -119,7 +130,7 @@ test_expect_success PERL 'update cvs module' '
|
||||
)
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'cvsimport.module config works' '
|
||||
+test_expect_success 'cvsimport.module config works' '
|
||||
|
||||
(cd module-git &&
|
||||
git config cvsimport.module module &&
|
||||
@@ -131,7 +142,7 @@ test_expect_success PERL 'cvsimport.module config works' '
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
|
||||
+test_expect_success 'second update has correct .git/cvs-revisions' '
|
||||
|
||||
(cd module-git &&
|
||||
git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
|
||||
@@ -140,7 +151,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' '
|
||||
test_cmp expected module-git/.git/cvs-revisions
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'import from a CVS working tree' '
|
||||
+test_expect_success 'import from a CVS working tree' '
|
||||
|
||||
$CVS co -d import-from-wt module &&
|
||||
(cd import-from-wt &&
|
||||
@@ -153,12 +164,12 @@ test_expect_success PERL 'import from a CVS working tree' '
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'no .git/cvs-revisions created by default' '
|
||||
+test_expect_success 'no .git/cvs-revisions created by default' '
|
||||
|
||||
! test -e import-from-wt/.git/cvs-revisions
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
|
||||
+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
|
||||
|
||||
test_done
|
||||
diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
|
||||
index 827d39f5bf..d730a41f67 100755
|
||||
--- a/t/t9601-cvsimport-vendor-branch.sh
|
||||
+++ b/t/t9601-cvsimport-vendor-branch.sh
|
||||
@@ -34,6 +34,17 @@
|
||||
test_description='git cvsimport handling of vendor branches'
|
||||
. ./lib-cvs.sh
|
||||
|
||||
+if ! test_have_prereq PERL
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, perl not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+if ! test_have_prereq CVS
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
setup_cvs_test_repository t9601
|
||||
|
||||
test_expect_success PERL 'import a module with a vendor branch' '
|
||||
diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
|
||||
index e1db323f54..68f097401f 100755
|
||||
--- a/t/t9602-cvsimport-branches-tags.sh
|
||||
+++ b/t/t9602-cvsimport-branches-tags.sh
|
||||
@@ -6,6 +6,17 @@
|
||||
test_description='git cvsimport handling of branches and tags'
|
||||
. ./lib-cvs.sh
|
||||
|
||||
+if ! test_have_prereq PERL
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, perl not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+if ! test_have_prereq CVS
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
setup_cvs_test_repository t9602
|
||||
|
||||
test_expect_success PERL 'import module' '
|
||||
diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
|
||||
index 3e64b11eac..606980b05c 100755
|
||||
--- a/t/t9603-cvsimport-patchsets.sh
|
||||
+++ b/t/t9603-cvsimport-patchsets.sh
|
||||
@@ -14,6 +14,17 @@
|
||||
test_description='git cvsimport testing for correct patchset estimation'
|
||||
. ./lib-cvs.sh
|
||||
|
||||
+if ! test_have_prereq PERL
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, perl not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+if ! test_have_prereq CVS
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
setup_cvs_test_repository t9603
|
||||
|
||||
test_expect_failure PERL 'import with criss cross times on revisions' '
|
||||
diff --git a/t/test-lib.sh b/t/test-lib.sh
|
||||
index 908ddb9c46..9a06440599 100644
|
||||
--- a/t/test-lib.sh
|
||||
+++ b/t/test-lib.sh
|
||||
@@ -1428,6 +1428,7 @@ case $uname_s in
|
||||
esac
|
||||
|
||||
( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
|
||||
+test -z "$NO_CVS" && test_set_prereq CVS
|
||||
test -z "$NO_PERL" && test_set_prereq PERL
|
||||
test -z "$NO_PTHREADS" && test_set_prereq PTHREADS
|
||||
test -z "$NO_PYTHON" && test_set_prereq PYTHON
|
||||
--
|
||||
2.21.0
|
||||
|
||||
14
sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon-r2.initd
vendored
Normal file
14
sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon-r2.initd
vendored
Normal file
@ -0,0 +1,14 @@
|
||||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
pidfile="/run/git-daemon.pid"
|
||||
command="/usr/bin/git"
|
||||
command_args="daemon ${GITDAEMON_OPTS}"
|
||||
command_user="${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
|
||||
start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME="
|
||||
command_background="yes"
|
||||
|
||||
depend() {
|
||||
use logger
|
||||
}
|
||||
@ -1,714 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
# bug #329479: git-remote-testgit is not multiple-version aware
|
||||
PYTHON_COMPAT=( python3_{7,8} )
|
||||
|
||||
inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
|
||||
|
||||
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
|
||||
# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
|
||||
# See https://git-scm.com/docs/gitworkflows#_graduation
|
||||
# In order of stability:
|
||||
# 9999-r0: maint
|
||||
# 9999-r1: master
|
||||
# 9999-r2: next
|
||||
# 9999-r3: seen
|
||||
case "${PVR}" in
|
||||
9999) EGIT_BRANCH=maint ;;
|
||||
9999-r1) EGIT_BRANCH=master ;;
|
||||
9999-r2) EGIT_BRANCH=next;;
|
||||
9999-r3) EGIT_BRANCH=seen ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
MY_PV="${PV/_rc/.rc}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
|
||||
DOC_VER="${MY_PV}"
|
||||
|
||||
DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
|
||||
HOMEPAGE="https://www.git-scm.com/"
|
||||
if [[ ${PV} != *9999 ]]; then
|
||||
SRC_URI_SUFFIX="xz"
|
||||
SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
|
||||
[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
|
||||
SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
doc? (
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
DEPEND="
|
||||
gnome-keyring? (
|
||||
app-crypt/libsecret
|
||||
dev-libs/glib:2
|
||||
)
|
||||
dev-libs/openssl:0=
|
||||
sys-libs/zlib
|
||||
pcre? (
|
||||
pcre-jit? ( dev-libs/libpcre2[jit(+)] )
|
||||
!pcre-jit? ( dev-libs/libpcre )
|
||||
)
|
||||
perl? ( dev-lang/perl:=[-build(-)] )
|
||||
tk? ( dev-lang/tk:0= )
|
||||
curl? (
|
||||
net-misc/curl
|
||||
webdav? ( dev-libs/expat )
|
||||
)
|
||||
iconv? ( virtual/libiconv )
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
gpg? ( app-crypt/gnupg )
|
||||
perl? (
|
||||
dev-perl/Error
|
||||
dev-perl/MailTools
|
||||
dev-perl/Authen-SASL
|
||||
cgi? (
|
||||
dev-perl/CGI
|
||||
highlight? ( app-text/highlight )
|
||||
)
|
||||
cvs? (
|
||||
>=dev-vcs/cvsps-2.1:0
|
||||
dev-perl/DBI
|
||||
dev-perl/DBD-SQLite
|
||||
)
|
||||
mediawiki? (
|
||||
dev-perl/DateTime-Format-ISO8601
|
||||
dev-perl/HTML-Tree
|
||||
dev-perl/MediaWiki-API
|
||||
)
|
||||
subversion? (
|
||||
dev-vcs/subversion[-dso(-),perl]
|
||||
dev-perl/libwww-perl
|
||||
dev-perl/TermReadKey
|
||||
)
|
||||
)
|
||||
perforce? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
|
||||
# This is how info docs are created with Git:
|
||||
# .txt/asciidoc --(asciidoc)---------> .xml/docbook
|
||||
# .xml/docbook --(docbook2texi.pl)--> .texi
|
||||
# .texi --(makeinfo)---------> .info
|
||||
BDEPEND="
|
||||
doc? (
|
||||
app-text/asciidoc
|
||||
app-text/docbook2X
|
||||
app-text/xmlto
|
||||
sys-apps/texinfo
|
||||
)
|
||||
emacs? ( >=app-editors/emacs-23.1:* )
|
||||
gnome-keyring? ( virtual/pkgconfig )
|
||||
nls? ( sys-devel/gettext )
|
||||
test? ( app-crypt/gnupg )
|
||||
"
|
||||
|
||||
# Live ebuild builds man pages and HTML docs, additionally
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
BDEPEND="${BDEPEND}
|
||||
app-text/asciidoc"
|
||||
fi
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
REQUIRED_USE="
|
||||
cgi? ( perl )
|
||||
cvs? ( perl )
|
||||
mediawiki? ( perl )
|
||||
mediawiki-experimental? ( mediawiki )
|
||||
subversion? ( perl )
|
||||
webdav? ( curl )
|
||||
pcre-jit? ( pcre )
|
||||
perforce? ( ${PYTHON_REQUIRED_USE} )
|
||||
"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
|
||||
|
||||
"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use subversion && has_version "dev-vcs/subversion[dso]"; then
|
||||
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
|
||||
ewarn "with USE=dso, there may be weird crashes in git-svn. You"
|
||||
ewarn "have been warned."
|
||||
fi
|
||||
if use perforce ; then
|
||||
python-single-r1_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
# This is needed because for some obscure reasons future calls to make don't
|
||||
# pick up these exports if we export them in src_unpack()
|
||||
exportmakeopts() {
|
||||
local extlibs myopts
|
||||
|
||||
myopts=(
|
||||
ASCIIDOC_NO_ROFF=YesPlease
|
||||
$(usex cvs '' NO_CVS=YesPlease)
|
||||
$(usex elibc_musl NO_REGEX=YesPlease '')
|
||||
$(usex iconv '' NO_ICONV=YesPlease)
|
||||
$(usex nls '' NO_GETTEXT=YesPlease)
|
||||
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
|
||||
$(usex perforce '' NO_PYTHON=YesPlease)
|
||||
$(usex subversion '' NO_SVN_TESTS=YesPlease)
|
||||
$(usex threads '' NO_PTHREADS=YesPlease)
|
||||
$(usex tk '' NO_TCLTK=YesPlease)
|
||||
)
|
||||
|
||||
if use blksha1 ; then
|
||||
myopts+=( BLK_SHA1=YesPlease )
|
||||
elif use ppcsha1 ; then
|
||||
myopts+=( PPC_SHA1=YesPlease )
|
||||
fi
|
||||
|
||||
if use curl ; then
|
||||
use webdav || myopts+=( NO_EXPAT=YesPlease )
|
||||
else
|
||||
myopts+=( NO_CURL=YesPlease )
|
||||
fi
|
||||
|
||||
# broken assumptions, because of static build system ...
|
||||
myopts+=(
|
||||
NO_FINK=YesPlease
|
||||
NO_DARWIN_PORTS=YesPlease
|
||||
INSTALL=install
|
||||
TAR=tar
|
||||
SHELL_PATH="${EPREFIX}/bin/sh"
|
||||
SANE_TOOL_PATH=
|
||||
OLD_ICONV=
|
||||
NO_EXTERNAL_GREP=
|
||||
)
|
||||
|
||||
# For svn-fe
|
||||
extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') )
|
||||
|
||||
# can't define this to null, since the entire makefile depends on it
|
||||
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
|
||||
|
||||
if use pcre; then
|
||||
if use pcre-jit; then
|
||||
myopts+=( USE_LIBPCRE2=YesPlease )
|
||||
extlibs+=( -lpcre2-8 )
|
||||
else
|
||||
myopts+=(
|
||||
USE_LIBPCRE1=YesPlease
|
||||
NO_LIBPCRE1_JIT=YesPlease
|
||||
)
|
||||
extlibs+=( -lpcre )
|
||||
fi
|
||||
fi
|
||||
if [[ ${CHOST} == *-solaris* ]]; then
|
||||
myopts+=(
|
||||
NEEDS_LIBICONV=YesPlease
|
||||
HAVE_CLOCK_MONOTONIC=1
|
||||
)
|
||||
if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
|
||||
myopts+=( HAVE_GETDELIM=1 )
|
||||
fi
|
||||
fi
|
||||
|
||||
if has_version '>=app-text/asciidoc-8.0' ; then
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
# Bug 290465:
|
||||
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
|
||||
if [[ "${CHOST}" == *-uclibc* ]] ; then
|
||||
myopts+=( NO_NSEC=YesPlease )
|
||||
use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} != *9999 ]]; then
|
||||
unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
cd "${S}" || die
|
||||
unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
if use doc ; then
|
||||
pushd "${S}"/Documentation &>/dev/null || die
|
||||
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
else
|
||||
git-r3_src_unpack
|
||||
#cp "${FILESDIR}"/GIT-VERSION-GEN .
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# add experimental patches to improve mediawiki support
|
||||
# see patches for origin
|
||||
if use mediawiki-experimental ; then
|
||||
PATCHES+=(
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
|
||||
)
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
|
||||
-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
|
||||
-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
|
||||
-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
|
||||
-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
Makefile contrib/svn-fe/Makefile || die
|
||||
|
||||
# Fix docbook2texi command
|
||||
sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
|
||||
Documentation/Makefile || die
|
||||
}
|
||||
|
||||
git_emake() {
|
||||
# bug #320647: PYTHON_PATH
|
||||
local PYTHON_PATH=""
|
||||
use perforce && PYTHON_PATH="${PYTHON}"
|
||||
emake ${MY_MAKEOPTS} \
|
||||
prefix="${EPREFIX}"/usr \
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
DESTDIR="${D}" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
OPTCFLAGS="${CFLAGS}" \
|
||||
OPTLDFLAGS="${LDFLAGS}" \
|
||||
PERL_PATH="${EPREFIX}/usr/bin/perl" \
|
||||
PERL_MM_OPT="" \
|
||||
PYTHON_PATH="${PYTHON_PATH}" \
|
||||
V=1 \
|
||||
"$@"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
exportmakeopts
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
git_emake || die "emake failed"
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile contrib/emacs/git{,-blame}.el
|
||||
fi
|
||||
|
||||
if use perl && use cgi ; then
|
||||
git_emake \
|
||||
gitweb \
|
||||
|| die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
pushd Documentation &>/dev/null || die
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
git_emake man \
|
||||
|| die "emake man failed"
|
||||
if use doc ; then
|
||||
git_emake info html \
|
||||
|| die "emake info html failed"
|
||||
fi
|
||||
else
|
||||
if use doc ; then
|
||||
git_emake info \
|
||||
|| die "emake info html failed"
|
||||
fi
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use subversion ; then
|
||||
pushd contrib/svn-fe &>/dev/null || die
|
||||
# by defining EXTLIBS we override the detection for libintl and
|
||||
# libiconv, bug #516168
|
||||
local nlsiconv=()
|
||||
use nls && use !elibc_glibc && nlsiconv+=( -lintl )
|
||||
use iconv && use !elibc_glibc && nlsiconv+=( -liconv )
|
||||
git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \
|
||||
|| die "emake svn-fe failed"
|
||||
if use doc ; then
|
||||
# svn-fe.1 requires the full USE=doc dependency stack
|
||||
git_emake svn-fe.1 \
|
||||
|| die "emake svn-fe.1 failed"
|
||||
git_emake svn-fe.html \
|
||||
|| die "svn-fe.html failed"
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
if use gnome-keyring ; then
|
||||
pushd contrib/credential/libsecret &>/dev/null || die
|
||||
git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake git-subtree
|
||||
# git-subtree.1 requires the full USE=doc dependency stack
|
||||
use doc && git_emake git-subtree.html git-subtree.1
|
||||
popd &>/dev/null || die
|
||||
|
||||
pushd contrib/diff-highlight &>/dev/null || die
|
||||
git_emake
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake
|
||||
popd &>/dev/null || die
|
||||
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
# Depending on the tarball and manual rebuild of the documentation, the
|
||||
# manpages may exist in either OR both of these directories.
|
||||
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
|
||||
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
|
||||
dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
|
||||
use doc && dodir /usr/share/doc/${PF}/html
|
||||
local d
|
||||
for d in / /howto/ /technical/ ; do
|
||||
docinto ${d}
|
||||
dodoc Documentation${d}*.txt
|
||||
if use doc ; then
|
||||
docinto ${d}/html
|
||||
dodoc Documentation${d}*.html
|
||||
fi
|
||||
done
|
||||
docinto /
|
||||
# Upstream does not ship this pre-built :-(
|
||||
use doc && doinfo Documentation/{git,gitman}.info
|
||||
|
||||
newbashcomp contrib/completion/git-completion.bash ${PN}
|
||||
bashcomp_alias git gitk
|
||||
# Not really a bash-completion file (bug #477920)
|
||||
# but still needed uncompressed (bug #507480)
|
||||
insinto /usr/share/${PN}
|
||||
doins contrib/completion/git-prompt.sh
|
||||
|
||||
if use emacs ; then
|
||||
elisp-install ${PN} contrib/emacs/git.{el,elc}
|
||||
elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
|
||||
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
|
||||
# don't add automatically to the load-path, so the sitefile
|
||||
# can do a conditional loading
|
||||
touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
|
||||
elisp-site-file-install "${FILESDIR}"/${SITEFILE}
|
||||
fi
|
||||
|
||||
#dobin contrib/fast-import/git-p4 # Moved upstream
|
||||
#dodoc contrib/fast-import/git-p4.txt # Moved upstream
|
||||
newbin contrib/fast-import/import-tars.perl import-tars
|
||||
exeinto /usr/libexec/git-core/
|
||||
newexe contrib/git-resurrect.sh git-resurrect
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
# diff-highlight
|
||||
dobin contrib/diff-highlight/diff-highlight
|
||||
newdoc contrib/diff-highlight/README README.diff-highlight
|
||||
|
||||
# git-jump
|
||||
exeinto /usr/libexec/git-core/
|
||||
doexe contrib/git-jump/git-jump
|
||||
newdoc contrib/git-jump/README git-jump.txt
|
||||
|
||||
# git-contacts
|
||||
exeinto /usr/libexec/git-core/
|
||||
doexe contrib/contacts/git-contacts
|
||||
dodoc contrib/contacts/git-contacts.txt
|
||||
|
||||
if use gnome-keyring ; then
|
||||
pushd contrib/credential/libsecret &>/dev/null || die
|
||||
dobin git-credential-libsecret
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
if use subversion ; then
|
||||
pushd contrib/svn-fe &>/dev/null || die
|
||||
dobin svn-fe
|
||||
dodoc svn-fe.txt
|
||||
if use doc ; then
|
||||
# Do not move svn-fe.1 outside USE=doc!
|
||||
doman svn-fe.1
|
||||
docinto html
|
||||
dodoc svn-fe.html
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
dodir /usr/share/${PN}/contrib
|
||||
# The following are excluded:
|
||||
# completion - installed above
|
||||
# diff-highlight - done above
|
||||
# emacs - installed above
|
||||
# examples - these are stuff that is not used in Git anymore actually
|
||||
# git-jump - done above
|
||||
# gitview - installed above
|
||||
# p4import - excluded because fast-import has a better one
|
||||
# patches - stuff the Git guys made to go upstream to other places
|
||||
# persistent-https - TODO
|
||||
# mw-to-git - TODO
|
||||
# subtree - build seperately
|
||||
# svnimport - use git-svn
|
||||
# thunderbird-patch-inline - fixes thunderbird
|
||||
local contrib_objects=(
|
||||
buildsystems
|
||||
fast-import
|
||||
hg-to-git
|
||||
hooks
|
||||
remotes2config.sh
|
||||
rerere-train.sh
|
||||
stats
|
||||
workdir
|
||||
)
|
||||
local i
|
||||
for i in "${contrib_objects[@]}" ; do
|
||||
cp -rf \
|
||||
"${S}"/contrib/${i} \
|
||||
"${ED}"/usr/share/${PN}/contrib \
|
||||
|| die "Failed contrib ${i}"
|
||||
done
|
||||
|
||||
if use perl && use cgi ; then
|
||||
# We used to install in /usr/share/${PN}/gitweb
|
||||
# but upstream installs in /usr/share/gitweb
|
||||
# so we will install a symlink and use their location for compat with other
|
||||
# distros
|
||||
dosym ../gitweb /usr/share/${PN}/gitweb
|
||||
|
||||
# INSTALL discusses configuration issues, not just installation
|
||||
docinto /
|
||||
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
|
||||
newdoc "${S}"/gitweb/README README.gitweb
|
||||
|
||||
for d in "${ED}"/usr/lib{,64}/perl5/ ; do
|
||||
if test -d "${d}" ; then find "${d}" \
|
||||
-name .packlist \
|
||||
-delete || die
|
||||
fi
|
||||
done
|
||||
else
|
||||
rm -rf "${ED}"/usr/share/gitweb
|
||||
fi
|
||||
|
||||
if ! use subversion ; then
|
||||
rm -f "${ED}"/usr/libexec/git-core/git-svn \
|
||||
"${ED}"/usr/share/man/man1/git-svn.1*
|
||||
fi
|
||||
|
||||
if use xinetd ; then
|
||||
insinto /etc/xinetd.d
|
||||
newins "${FILESDIR}"/git-daemon.xinetd git-daemon
|
||||
fi
|
||||
|
||||
if use !prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
|
||||
systemd_dounit "${FILESDIR}/git-daemon.socket"
|
||||
fi
|
||||
|
||||
perl_delete_localpod
|
||||
|
||||
# Remove disabled linguas
|
||||
# we could remove sources in src_prepare, but install does not
|
||||
# handle missing locale dir well
|
||||
rm_loc() {
|
||||
if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
|
||||
rm -r "${ED}/usr/share/locale/${1}" || die
|
||||
fi
|
||||
}
|
||||
plocale_for_each_disabled_locale rm_loc
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local disabled=()
|
||||
local tests_cvs=(
|
||||
t9200-git-cvsexportcommit.sh
|
||||
t9400-git-cvsserver-server.sh
|
||||
t9401-git-cvsserver-crlf.sh
|
||||
t9402-git-cvsserver-refs.sh
|
||||
t9600-cvsimport.sh
|
||||
t9601-cvsimport-vendor-branch.sh
|
||||
t9602-cvsimport-branches-tags.sh
|
||||
t9603-cvsimport-patchsets.sh
|
||||
t9604-cvsimport-timestamps.sh
|
||||
)
|
||||
local tests_perl=(
|
||||
t3701-add-interactive.sh
|
||||
t5502-quickfetch.sh
|
||||
t5512-ls-remote.sh
|
||||
t5520-pull.sh
|
||||
t7106-reset-unborn-branch.sh
|
||||
t7501-commit.sh
|
||||
)
|
||||
# Bug #225601 - t0004 is not suitable for root perm
|
||||
# Bug #219839 - t1004 is not suitable for root perm
|
||||
# t0001-init.sh - check for init notices EPERM* fails
|
||||
local tests_nonroot=(
|
||||
t0001-init.sh
|
||||
t0004-unwritable.sh
|
||||
t0070-fundamental.sh
|
||||
t1004-read-tree-m-u-wf.sh
|
||||
t3700-add.sh
|
||||
t7300-clean.sh
|
||||
)
|
||||
# t9100 still fails with symlinks in SVN 1.7
|
||||
local test_svn=( t9100-git-svn-basic.sh )
|
||||
|
||||
# Unzip is used only for the testcase code, not by any normal parts of Git.
|
||||
if ! has_version app-arch/unzip ; then
|
||||
einfo "Disabling tar-tree tests"
|
||||
disabled+=( t5000-tar-tree.sh )
|
||||
fi
|
||||
|
||||
local cvs=0
|
||||
use cvs && let cvs=${cvs}+1
|
||||
if [[ ${EUID} -eq 0 ]]; then
|
||||
if [[ ${cvs} -eq 1 ]]; then
|
||||
ewarn "Skipping CVS tests because CVS does not work as root!"
|
||||
ewarn "You should retest with FEATURES=userpriv!"
|
||||
disabled+=( ${tests_cvs[@]} )
|
||||
fi
|
||||
einfo "Skipping other tests that require being non-root"
|
||||
disabled+=( ${tests_nonroot[@]} )
|
||||
else
|
||||
[[ ${cvs} -gt 0 ]] && \
|
||||
has_version dev-vcs/cvs && \
|
||||
let cvs=${cvs}+1
|
||||
[[ ${cvs} -gt 1 ]] && \
|
||||
has_version "dev-vcs/cvs[server]" && \
|
||||
let cvs=${cvs}+1
|
||||
if [[ ${cvs} -lt 3 ]]; then
|
||||
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
|
||||
disabled+=( ${tests_cvs[@]} )
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! use perl ; then
|
||||
einfo "Disabling tests that need Perl"
|
||||
disabled+=( ${tests_perl[@]} )
|
||||
fi
|
||||
|
||||
einfo "Disabling tests that fail with SVN 1.7"
|
||||
disabled+=( ${test_svn[@]} )
|
||||
|
||||
# Reset all previously disabled tests
|
||||
pushd t &>/dev/null || die
|
||||
local i
|
||||
for i in *.sh.DISABLED ; do
|
||||
[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
|
||||
done
|
||||
einfo "Disabled tests:"
|
||||
for i in ${disabled[@]} ; do
|
||||
[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
|
||||
done
|
||||
|
||||
# Avoid the test system removing the results because we want them ourselves
|
||||
sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
|
||||
-i Makefile || die
|
||||
|
||||
# Clean old results first, must always run
|
||||
nonfatal git_emake clean
|
||||
popd &>/dev/null || die
|
||||
|
||||
# Now run the tests, keep going if we hit an error, and don't terminate on
|
||||
# failure
|
||||
local rc
|
||||
einfo "Start test run"
|
||||
#MAKEOPTS=-j1
|
||||
nonfatal git_emake --keep-going test
|
||||
rc=$?
|
||||
|
||||
# Display nice results, now print the results
|
||||
pushd t &>/dev/null || die
|
||||
nonfatal git_emake aggregate-results
|
||||
|
||||
# And bail if there was a problem
|
||||
[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
|
||||
}
|
||||
|
||||
showpkgdeps() {
|
||||
local pkg=$1
|
||||
shift
|
||||
elog " $(printf "%-17s:" ${pkg}) ${@}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
|
||||
elog "completion."
|
||||
elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
|
||||
elog "Note that the prompt bash code is now in that separate script"
|
||||
elog "These additional scripts need some dependencies:"
|
||||
echo
|
||||
showpkgdeps git-quiltimport "dev-util/quilt"
|
||||
showpkgdeps git-instaweb \
|
||||
"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
|
||||
echo
|
||||
use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@ -1,714 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
# bug #329479: git-remote-testgit is not multiple-version aware
|
||||
PYTHON_COMPAT=( python3_{7,8} )
|
||||
|
||||
inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
|
||||
|
||||
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
|
||||
# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
|
||||
# See https://git-scm.com/docs/gitworkflows#_graduation
|
||||
# In order of stability:
|
||||
# 9999-r0: maint
|
||||
# 9999-r1: master
|
||||
# 9999-r2: next
|
||||
# 9999-r3: seen
|
||||
case "${PVR}" in
|
||||
9999) EGIT_BRANCH=maint ;;
|
||||
9999-r1) EGIT_BRANCH=master ;;
|
||||
9999-r2) EGIT_BRANCH=next;;
|
||||
9999-r3) EGIT_BRANCH=seen ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
MY_PV="${PV/_rc/.rc}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
|
||||
DOC_VER="${MY_PV}"
|
||||
|
||||
DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
|
||||
HOMEPAGE="https://www.git-scm.com/"
|
||||
if [[ ${PV} != *9999 ]]; then
|
||||
SRC_URI_SUFFIX="xz"
|
||||
SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
|
||||
[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
|
||||
SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
doc? (
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
DEPEND="
|
||||
gnome-keyring? (
|
||||
app-crypt/libsecret
|
||||
dev-libs/glib:2
|
||||
)
|
||||
dev-libs/openssl:0=
|
||||
sys-libs/zlib
|
||||
pcre? (
|
||||
pcre-jit? ( dev-libs/libpcre2[jit(+)] )
|
||||
!pcre-jit? ( dev-libs/libpcre )
|
||||
)
|
||||
perl? ( dev-lang/perl:=[-build(-)] )
|
||||
tk? ( dev-lang/tk:0= )
|
||||
curl? (
|
||||
net-misc/curl
|
||||
webdav? ( dev-libs/expat )
|
||||
)
|
||||
iconv? ( virtual/libiconv )
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
gpg? ( app-crypt/gnupg )
|
||||
perl? (
|
||||
dev-perl/Error
|
||||
dev-perl/MailTools
|
||||
dev-perl/Authen-SASL
|
||||
cgi? (
|
||||
dev-perl/CGI
|
||||
highlight? ( app-text/highlight )
|
||||
)
|
||||
cvs? (
|
||||
>=dev-vcs/cvsps-2.1:0
|
||||
dev-perl/DBI
|
||||
dev-perl/DBD-SQLite
|
||||
)
|
||||
mediawiki? (
|
||||
dev-perl/DateTime-Format-ISO8601
|
||||
dev-perl/HTML-Tree
|
||||
dev-perl/MediaWiki-API
|
||||
)
|
||||
subversion? (
|
||||
dev-vcs/subversion[-dso(-),perl]
|
||||
dev-perl/libwww-perl
|
||||
dev-perl/TermReadKey
|
||||
)
|
||||
)
|
||||
perforce? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
|
||||
# This is how info docs are created with Git:
|
||||
# .txt/asciidoc --(asciidoc)---------> .xml/docbook
|
||||
# .xml/docbook --(docbook2texi.pl)--> .texi
|
||||
# .texi --(makeinfo)---------> .info
|
||||
BDEPEND="
|
||||
doc? (
|
||||
app-text/asciidoc
|
||||
app-text/docbook2X
|
||||
app-text/xmlto
|
||||
sys-apps/texinfo
|
||||
)
|
||||
emacs? ( >=app-editors/emacs-23.1:* )
|
||||
gnome-keyring? ( virtual/pkgconfig )
|
||||
nls? ( sys-devel/gettext )
|
||||
test? ( app-crypt/gnupg )
|
||||
"
|
||||
|
||||
# Live ebuild builds man pages and HTML docs, additionally
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
BDEPEND="${BDEPEND}
|
||||
app-text/asciidoc"
|
||||
fi
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
REQUIRED_USE="
|
||||
cgi? ( perl )
|
||||
cvs? ( perl )
|
||||
mediawiki? ( perl )
|
||||
mediawiki-experimental? ( mediawiki )
|
||||
subversion? ( perl )
|
||||
webdav? ( curl )
|
||||
pcre-jit? ( pcre )
|
||||
perforce? ( ${PYTHON_REQUIRED_USE} )
|
||||
"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
|
||||
|
||||
"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use subversion && has_version "dev-vcs/subversion[dso]"; then
|
||||
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
|
||||
ewarn "with USE=dso, there may be weird crashes in git-svn. You"
|
||||
ewarn "have been warned."
|
||||
fi
|
||||
if use perforce ; then
|
||||
python-single-r1_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
# This is needed because for some obscure reasons future calls to make don't
|
||||
# pick up these exports if we export them in src_unpack()
|
||||
exportmakeopts() {
|
||||
local extlibs myopts
|
||||
|
||||
myopts=(
|
||||
ASCIIDOC_NO_ROFF=YesPlease
|
||||
$(usex cvs '' NO_CVS=YesPlease)
|
||||
$(usex elibc_musl NO_REGEX=YesPlease '')
|
||||
$(usex iconv '' NO_ICONV=YesPlease)
|
||||
$(usex nls '' NO_GETTEXT=YesPlease)
|
||||
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
|
||||
$(usex perforce '' NO_PYTHON=YesPlease)
|
||||
$(usex subversion '' NO_SVN_TESTS=YesPlease)
|
||||
$(usex threads '' NO_PTHREADS=YesPlease)
|
||||
$(usex tk '' NO_TCLTK=YesPlease)
|
||||
)
|
||||
|
||||
if use blksha1 ; then
|
||||
myopts+=( BLK_SHA1=YesPlease )
|
||||
elif use ppcsha1 ; then
|
||||
myopts+=( PPC_SHA1=YesPlease )
|
||||
fi
|
||||
|
||||
if use curl ; then
|
||||
use webdav || myopts+=( NO_EXPAT=YesPlease )
|
||||
else
|
||||
myopts+=( NO_CURL=YesPlease )
|
||||
fi
|
||||
|
||||
# broken assumptions, because of static build system ...
|
||||
myopts+=(
|
||||
NO_FINK=YesPlease
|
||||
NO_DARWIN_PORTS=YesPlease
|
||||
INSTALL=install
|
||||
TAR=tar
|
||||
SHELL_PATH="${EPREFIX}/bin/sh"
|
||||
SANE_TOOL_PATH=
|
||||
OLD_ICONV=
|
||||
NO_EXTERNAL_GREP=
|
||||
)
|
||||
|
||||
# For svn-fe
|
||||
extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') )
|
||||
|
||||
# can't define this to null, since the entire makefile depends on it
|
||||
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
|
||||
|
||||
if use pcre; then
|
||||
if use pcre-jit; then
|
||||
myopts+=( USE_LIBPCRE2=YesPlease )
|
||||
extlibs+=( -lpcre2-8 )
|
||||
else
|
||||
myopts+=(
|
||||
USE_LIBPCRE1=YesPlease
|
||||
NO_LIBPCRE1_JIT=YesPlease
|
||||
)
|
||||
extlibs+=( -lpcre )
|
||||
fi
|
||||
fi
|
||||
if [[ ${CHOST} == *-solaris* ]]; then
|
||||
myopts+=(
|
||||
NEEDS_LIBICONV=YesPlease
|
||||
HAVE_CLOCK_MONOTONIC=1
|
||||
)
|
||||
if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
|
||||
myopts+=( HAVE_GETDELIM=1 )
|
||||
fi
|
||||
fi
|
||||
|
||||
if has_version '>=app-text/asciidoc-8.0' ; then
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
# Bug 290465:
|
||||
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
|
||||
if [[ "${CHOST}" == *-uclibc* ]] ; then
|
||||
myopts+=( NO_NSEC=YesPlease )
|
||||
use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} != *9999 ]]; then
|
||||
unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
cd "${S}" || die
|
||||
unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
if use doc ; then
|
||||
pushd "${S}"/Documentation &>/dev/null || die
|
||||
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
else
|
||||
git-r3_src_unpack
|
||||
#cp "${FILESDIR}"/GIT-VERSION-GEN .
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# add experimental patches to improve mediawiki support
|
||||
# see patches for origin
|
||||
if use mediawiki-experimental ; then
|
||||
PATCHES+=(
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
|
||||
)
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
sed -i \
|
||||
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
|
||||
-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
|
||||
-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
|
||||
-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
|
||||
-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
Makefile contrib/svn-fe/Makefile || die
|
||||
|
||||
# Fix docbook2texi command
|
||||
sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
|
||||
Documentation/Makefile || die
|
||||
}
|
||||
|
||||
git_emake() {
|
||||
# bug #320647: PYTHON_PATH
|
||||
local PYTHON_PATH=""
|
||||
use perforce && PYTHON_PATH="${PYTHON}"
|
||||
emake ${MY_MAKEOPTS} \
|
||||
prefix="${EPREFIX}"/usr \
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
DESTDIR="${D}" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
OPTCFLAGS="${CFLAGS}" \
|
||||
OPTLDFLAGS="${LDFLAGS}" \
|
||||
PERL_PATH="${EPREFIX}/usr/bin/perl" \
|
||||
PERL_MM_OPT="" \
|
||||
PYTHON_PATH="${PYTHON_PATH}" \
|
||||
V=1 \
|
||||
"$@"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
exportmakeopts
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
git_emake || die "emake failed"
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile contrib/emacs/git{,-blame}.el
|
||||
fi
|
||||
|
||||
if use perl && use cgi ; then
|
||||
git_emake \
|
||||
gitweb \
|
||||
|| die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
pushd Documentation &>/dev/null || die
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
git_emake man \
|
||||
|| die "emake man failed"
|
||||
if use doc ; then
|
||||
git_emake info html \
|
||||
|| die "emake info html failed"
|
||||
fi
|
||||
else
|
||||
if use doc ; then
|
||||
git_emake info \
|
||||
|| die "emake info html failed"
|
||||
fi
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use subversion ; then
|
||||
pushd contrib/svn-fe &>/dev/null || die
|
||||
# by defining EXTLIBS we override the detection for libintl and
|
||||
# libiconv, bug #516168
|
||||
local nlsiconv=()
|
||||
use nls && use !elibc_glibc && nlsiconv+=( -lintl )
|
||||
use iconv && use !elibc_glibc && nlsiconv+=( -liconv )
|
||||
git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \
|
||||
|| die "emake svn-fe failed"
|
||||
if use doc ; then
|
||||
# svn-fe.1 requires the full USE=doc dependency stack
|
||||
git_emake svn-fe.1 \
|
||||
|| die "emake svn-fe.1 failed"
|
||||
git_emake svn-fe.html \
|
||||
|| die "svn-fe.html failed"
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
if use gnome-keyring ; then
|
||||
pushd contrib/credential/libsecret &>/dev/null || die
|
||||
git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake git-subtree
|
||||
# git-subtree.1 requires the full USE=doc dependency stack
|
||||
use doc && git_emake git-subtree.html git-subtree.1
|
||||
popd &>/dev/null || die
|
||||
|
||||
pushd contrib/diff-highlight &>/dev/null || die
|
||||
git_emake
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake
|
||||
popd &>/dev/null || die
|
||||
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
# Depending on the tarball and manual rebuild of the documentation, the
|
||||
# manpages may exist in either OR both of these directories.
|
||||
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
|
||||
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
|
||||
dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
|
||||
use doc && dodir /usr/share/doc/${PF}/html
|
||||
local d
|
||||
for d in / /howto/ /technical/ ; do
|
||||
docinto ${d}
|
||||
dodoc Documentation${d}*.txt
|
||||
if use doc ; then
|
||||
docinto ${d}/html
|
||||
dodoc Documentation${d}*.html
|
||||
fi
|
||||
done
|
||||
docinto /
|
||||
# Upstream does not ship this pre-built :-(
|
||||
use doc && doinfo Documentation/{git,gitman}.info
|
||||
|
||||
newbashcomp contrib/completion/git-completion.bash ${PN}
|
||||
bashcomp_alias git gitk
|
||||
# Not really a bash-completion file (bug #477920)
|
||||
# but still needed uncompressed (bug #507480)
|
||||
insinto /usr/share/${PN}
|
||||
doins contrib/completion/git-prompt.sh
|
||||
|
||||
if use emacs ; then
|
||||
elisp-install ${PN} contrib/emacs/git.{el,elc}
|
||||
elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
|
||||
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
|
||||
# don't add automatically to the load-path, so the sitefile
|
||||
# can do a conditional loading
|
||||
touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
|
||||
elisp-site-file-install "${FILESDIR}"/${SITEFILE}
|
||||
fi
|
||||
|
||||
#dobin contrib/fast-import/git-p4 # Moved upstream
|
||||
#dodoc contrib/fast-import/git-p4.txt # Moved upstream
|
||||
newbin contrib/fast-import/import-tars.perl import-tars
|
||||
exeinto /usr/libexec/git-core/
|
||||
newexe contrib/git-resurrect.sh git-resurrect
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
# diff-highlight
|
||||
dobin contrib/diff-highlight/diff-highlight
|
||||
newdoc contrib/diff-highlight/README README.diff-highlight
|
||||
|
||||
# git-jump
|
||||
exeinto /usr/libexec/git-core/
|
||||
doexe contrib/git-jump/git-jump
|
||||
newdoc contrib/git-jump/README git-jump.txt
|
||||
|
||||
# git-contacts
|
||||
exeinto /usr/libexec/git-core/
|
||||
doexe contrib/contacts/git-contacts
|
||||
dodoc contrib/contacts/git-contacts.txt
|
||||
|
||||
if use gnome-keyring ; then
|
||||
pushd contrib/credential/libsecret &>/dev/null || die
|
||||
dobin git-credential-libsecret
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
if use subversion ; then
|
||||
pushd contrib/svn-fe &>/dev/null || die
|
||||
dobin svn-fe
|
||||
dodoc svn-fe.txt
|
||||
if use doc ; then
|
||||
# Do not move svn-fe.1 outside USE=doc!
|
||||
doman svn-fe.1
|
||||
docinto html
|
||||
dodoc svn-fe.html
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
dodir /usr/share/${PN}/contrib
|
||||
# The following are excluded:
|
||||
# completion - installed above
|
||||
# diff-highlight - done above
|
||||
# emacs - installed above
|
||||
# examples - these are stuff that is not used in Git anymore actually
|
||||
# git-jump - done above
|
||||
# gitview - installed above
|
||||
# p4import - excluded because fast-import has a better one
|
||||
# patches - stuff the Git guys made to go upstream to other places
|
||||
# persistent-https - TODO
|
||||
# mw-to-git - TODO
|
||||
# subtree - build seperately
|
||||
# svnimport - use git-svn
|
||||
# thunderbird-patch-inline - fixes thunderbird
|
||||
local contrib_objects=(
|
||||
buildsystems
|
||||
fast-import
|
||||
hg-to-git
|
||||
hooks
|
||||
remotes2config.sh
|
||||
rerere-train.sh
|
||||
stats
|
||||
workdir
|
||||
)
|
||||
local i
|
||||
for i in "${contrib_objects[@]}" ; do
|
||||
cp -rf \
|
||||
"${S}"/contrib/${i} \
|
||||
"${ED}"/usr/share/${PN}/contrib \
|
||||
|| die "Failed contrib ${i}"
|
||||
done
|
||||
|
||||
if use perl && use cgi ; then
|
||||
# We used to install in /usr/share/${PN}/gitweb
|
||||
# but upstream installs in /usr/share/gitweb
|
||||
# so we will install a symlink and use their location for compat with other
|
||||
# distros
|
||||
dosym ../gitweb /usr/share/${PN}/gitweb
|
||||
|
||||
# INSTALL discusses configuration issues, not just installation
|
||||
docinto /
|
||||
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
|
||||
newdoc "${S}"/gitweb/README README.gitweb
|
||||
|
||||
for d in "${ED}"/usr/lib{,64}/perl5/ ; do
|
||||
if test -d "${d}" ; then find "${d}" \
|
||||
-name .packlist \
|
||||
-delete || die
|
||||
fi
|
||||
done
|
||||
else
|
||||
rm -rf "${ED}"/usr/share/gitweb
|
||||
fi
|
||||
|
||||
if ! use subversion ; then
|
||||
rm -f "${ED}"/usr/libexec/git-core/git-svn \
|
||||
"${ED}"/usr/share/man/man1/git-svn.1*
|
||||
fi
|
||||
|
||||
if use xinetd ; then
|
||||
insinto /etc/xinetd.d
|
||||
newins "${FILESDIR}"/git-daemon.xinetd git-daemon
|
||||
fi
|
||||
|
||||
if use !prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
|
||||
systemd_dounit "${FILESDIR}/git-daemon.socket"
|
||||
fi
|
||||
|
||||
perl_delete_localpod
|
||||
|
||||
# Remove disabled linguas
|
||||
# we could remove sources in src_prepare, but install does not
|
||||
# handle missing locale dir well
|
||||
rm_loc() {
|
||||
if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
|
||||
rm -r "${ED}/usr/share/locale/${1}" || die
|
||||
fi
|
||||
}
|
||||
plocale_for_each_disabled_locale rm_loc
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local disabled=()
|
||||
local tests_cvs=(
|
||||
t9200-git-cvsexportcommit.sh
|
||||
t9400-git-cvsserver-server.sh
|
||||
t9401-git-cvsserver-crlf.sh
|
||||
t9402-git-cvsserver-refs.sh
|
||||
t9600-cvsimport.sh
|
||||
t9601-cvsimport-vendor-branch.sh
|
||||
t9602-cvsimport-branches-tags.sh
|
||||
t9603-cvsimport-patchsets.sh
|
||||
t9604-cvsimport-timestamps.sh
|
||||
)
|
||||
local tests_perl=(
|
||||
t3701-add-interactive.sh
|
||||
t5502-quickfetch.sh
|
||||
t5512-ls-remote.sh
|
||||
t5520-pull.sh
|
||||
t7106-reset-unborn-branch.sh
|
||||
t7501-commit.sh
|
||||
)
|
||||
# Bug #225601 - t0004 is not suitable for root perm
|
||||
# Bug #219839 - t1004 is not suitable for root perm
|
||||
# t0001-init.sh - check for init notices EPERM* fails
|
||||
local tests_nonroot=(
|
||||
t0001-init.sh
|
||||
t0004-unwritable.sh
|
||||
t0070-fundamental.sh
|
||||
t1004-read-tree-m-u-wf.sh
|
||||
t3700-add.sh
|
||||
t7300-clean.sh
|
||||
)
|
||||
# t9100 still fails with symlinks in SVN 1.7
|
||||
local test_svn=( t9100-git-svn-basic.sh )
|
||||
|
||||
# Unzip is used only for the testcase code, not by any normal parts of Git.
|
||||
if ! has_version app-arch/unzip ; then
|
||||
einfo "Disabling tar-tree tests"
|
||||
disabled+=( t5000-tar-tree.sh )
|
||||
fi
|
||||
|
||||
local cvs=0
|
||||
use cvs && let cvs=${cvs}+1
|
||||
if [[ ${EUID} -eq 0 ]]; then
|
||||
if [[ ${cvs} -eq 1 ]]; then
|
||||
ewarn "Skipping CVS tests because CVS does not work as root!"
|
||||
ewarn "You should retest with FEATURES=userpriv!"
|
||||
disabled+=( ${tests_cvs[@]} )
|
||||
fi
|
||||
einfo "Skipping other tests that require being non-root"
|
||||
disabled+=( ${tests_nonroot[@]} )
|
||||
else
|
||||
[[ ${cvs} -gt 0 ]] && \
|
||||
has_version dev-vcs/cvs && \
|
||||
let cvs=${cvs}+1
|
||||
[[ ${cvs} -gt 1 ]] && \
|
||||
has_version "dev-vcs/cvs[server]" && \
|
||||
let cvs=${cvs}+1
|
||||
if [[ ${cvs} -lt 3 ]]; then
|
||||
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
|
||||
disabled+=( ${tests_cvs[@]} )
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! use perl ; then
|
||||
einfo "Disabling tests that need Perl"
|
||||
disabled+=( ${tests_perl[@]} )
|
||||
fi
|
||||
|
||||
einfo "Disabling tests that fail with SVN 1.7"
|
||||
disabled+=( ${test_svn[@]} )
|
||||
|
||||
# Reset all previously disabled tests
|
||||
pushd t &>/dev/null || die
|
||||
local i
|
||||
for i in *.sh.DISABLED ; do
|
||||
[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
|
||||
done
|
||||
einfo "Disabled tests:"
|
||||
for i in ${disabled[@]} ; do
|
||||
[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
|
||||
done
|
||||
|
||||
# Avoid the test system removing the results because we want them ourselves
|
||||
sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
|
||||
-i Makefile || die
|
||||
|
||||
# Clean old results first, must always run
|
||||
nonfatal git_emake clean
|
||||
popd &>/dev/null || die
|
||||
|
||||
# Now run the tests, keep going if we hit an error, and don't terminate on
|
||||
# failure
|
||||
local rc
|
||||
einfo "Start test run"
|
||||
#MAKEOPTS=-j1
|
||||
nonfatal git_emake --keep-going test
|
||||
rc=$?
|
||||
|
||||
# Display nice results, now print the results
|
||||
pushd t &>/dev/null || die
|
||||
nonfatal git_emake aggregate-results
|
||||
|
||||
# And bail if there was a problem
|
||||
[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
|
||||
}
|
||||
|
||||
showpkgdeps() {
|
||||
local pkg=$1
|
||||
shift
|
||||
elog " $(printf "%-17s:" ${pkg}) ${@}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
|
||||
elog "completion."
|
||||
elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
|
||||
elog "Note that the prompt bash code is now in that separate script"
|
||||
elog "These additional scripts need some dependencies:"
|
||||
echo
|
||||
showpkgdeps git-quiltimport "dev-util/quilt"
|
||||
showpkgdeps git-instaweb \
|
||||
"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
|
||||
echo
|
||||
use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
@ -226,13 +226,6 @@ exportmakeopts() {
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
# Bug 290465:
|
||||
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
|
||||
if [[ "${CHOST}" == *-uclibc* ]] ; then
|
||||
myopts+=( NO_NSEC=YesPlease )
|
||||
use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
@ -295,7 +288,6 @@ git_emake() {
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
DESTDIR="${D}" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
@ -323,7 +315,7 @@ src_compile() {
|
||||
git_emake gitweb || die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
@ -368,9 +360,9 @@ src_compile() {
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake install || die "make install failed"
|
||||
git_emake DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
@ -418,10 +410,10 @@ src_install() {
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake install || die "Failed to emake install for git-subtree"
|
||||
git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
@ -429,7 +421,7 @@ src_install() {
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake install
|
||||
git_emake DESTDIR="${D}" install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
# bug #329479: git-remote-testgit is not multiple-version aware
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
|
||||
inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
|
||||
|
||||
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
|
||||
# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
|
||||
# See https://git-scm.com/docs/gitworkflows#_graduation
|
||||
# In order of stability:
|
||||
@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
@ -61,7 +61,7 @@ DEPEND="
|
||||
)
|
||||
dev-libs/openssl:0=
|
||||
sys-libs/zlib
|
||||
pcre? ( dev-libs/libpcre2 )
|
||||
pcre? ( dev-libs/libpcre2:= )
|
||||
perl? ( dev-lang/perl:=[-build(-)] )
|
||||
tk? ( dev-lang/tk:0= )
|
||||
curl? (
|
||||
@ -141,7 +141,7 @@ RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
"${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch
|
||||
"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
|
||||
@ -222,13 +222,6 @@ exportmakeopts() {
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
# Bug 290465:
|
||||
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
|
||||
if [[ "${CHOST}" == *-uclibc* ]] ; then
|
||||
myopts+=( NO_NSEC=YesPlease )
|
||||
use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
@ -291,7 +284,6 @@ git_emake() {
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
DESTDIR="${D}" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
@ -319,7 +311,7 @@ src_compile() {
|
||||
git_emake gitweb || die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
@ -364,9 +356,9 @@ src_compile() {
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake install || die "make install failed"
|
||||
git_emake DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
@ -414,10 +406,10 @@ src_install() {
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake install || die "Failed to emake install for git-subtree"
|
||||
git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
@ -425,7 +417,7 @@ src_install() {
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake install
|
||||
git_emake DESTDIR="${D}" install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
@ -13,7 +13,7 @@ inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale pyth
|
||||
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
|
||||
# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
|
||||
# See https://git-scm.com/docs/gitworkflows#_graduation
|
||||
# In order of stability:
|
||||
@ -145,10 +145,6 @@ PATCHES=(
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
|
||||
|
||||
# See bug #751907
|
||||
# Test fails due to exported ${D} in src_test
|
||||
"${FILESDIR}"/git-2.32.0-r1-test-t5582.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
@ -226,13 +222,6 @@ exportmakeopts() {
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
# Bug 290465:
|
||||
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
|
||||
if [[ "${CHOST}" == *-uclibc* ]] ; then
|
||||
myopts+=( NO_NSEC=YesPlease )
|
||||
use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
@ -295,7 +284,6 @@ git_emake() {
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
DESTDIR="${D}" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
@ -323,7 +311,7 @@ src_compile() {
|
||||
git_emake gitweb || die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
@ -368,9 +356,9 @@ src_compile() {
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake install || die "make install failed"
|
||||
git_emake DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
@ -418,10 +406,10 @@ src_install() {
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake install || die "Failed to emake install for git-subtree"
|
||||
git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
@ -429,7 +417,7 @@ src_install() {
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake install
|
||||
git_emake DESTDIR="${D}" install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
@ -518,7 +506,7 @@ src_install() {
|
||||
fi
|
||||
|
||||
if ! use prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
|
||||
newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
|
||||
"git-daemon@.service"
|
||||
@ -1,19 +1,19 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
# bug #329479: git-remote-testgit is not multiple-version aware
|
||||
PYTHON_COMPAT=( python3_{7,8} )
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
|
||||
inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
|
||||
|
||||
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
|
||||
# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
|
||||
# See https://git-scm.com/docs/gitworkflows#_graduation
|
||||
# In order of stability:
|
||||
@ -46,12 +46,12 @@ if [[ ${PV} != *9999 ]]; then
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
DEPEND="
|
||||
@ -61,10 +61,7 @@ DEPEND="
|
||||
)
|
||||
dev-libs/openssl:0=
|
||||
sys-libs/zlib
|
||||
pcre? (
|
||||
pcre-jit? ( dev-libs/libpcre2[jit(+)] )
|
||||
!pcre-jit? ( dev-libs/libpcre )
|
||||
)
|
||||
pcre? ( dev-libs/libpcre2:= )
|
||||
perl? ( dev-lang/perl:=[-build(-)] )
|
||||
tk? ( dev-lang/tk:0= )
|
||||
curl? (
|
||||
@ -135,7 +132,6 @@ REQUIRED_USE="
|
||||
cvs? ( perl )
|
||||
mediawiki? ( perl )
|
||||
mediawiki-experimental? ( mediawiki )
|
||||
pcre-jit? ( pcre )
|
||||
perforce? ( ${PYTHON_REQUIRED_USE} )
|
||||
subversion? ( perl )
|
||||
webdav? ( curl )
|
||||
@ -145,7 +141,7 @@ RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
|
||||
"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
|
||||
@ -209,23 +205,15 @@ exportmakeopts() {
|
||||
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
|
||||
|
||||
if use pcre; then
|
||||
if use pcre-jit; then
|
||||
myopts+=( USE_LIBPCRE2=YesPlease )
|
||||
extlibs+=( -lpcre2-8 )
|
||||
else
|
||||
myopts+=(
|
||||
USE_LIBPCRE1=YesPlease
|
||||
NO_LIBPCRE1_JIT=YesPlease
|
||||
)
|
||||
extlibs+=( -lpcre )
|
||||
fi
|
||||
fi
|
||||
if [[ ${CHOST} == *-solaris* ]]; then
|
||||
myopts+=(
|
||||
NEEDS_LIBICONV=YesPlease
|
||||
HAVE_CLOCK_MONOTONIC=1
|
||||
)
|
||||
if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
|
||||
if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then
|
||||
myopts+=( HAVE_GETDELIM=1 )
|
||||
fi
|
||||
fi
|
||||
@ -234,13 +222,6 @@ exportmakeopts() {
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
# Bug 290465:
|
||||
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
|
||||
if [[ "${CHOST}" == *-uclibc* ]] ; then
|
||||
myopts+=( NO_NSEC=YesPlease )
|
||||
use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
@ -275,6 +256,11 @@ src_prepare() {
|
||||
|
||||
default
|
||||
|
||||
if use prefix ; then
|
||||
# bug #757309
|
||||
eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
|
||||
fi
|
||||
|
||||
sed -i \
|
||||
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
|
||||
-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
|
||||
@ -298,7 +284,6 @@ git_emake() {
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
DESTDIR="${D}" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
@ -323,12 +308,10 @@ src_compile() {
|
||||
fi
|
||||
|
||||
if use perl && use cgi ; then
|
||||
git_emake \
|
||||
gitweb \
|
||||
|| die "emake gitweb (cgi) failed"
|
||||
git_emake gitweb || die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
@ -337,16 +320,13 @@ src_compile() {
|
||||
|
||||
pushd Documentation &>/dev/null || die
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
git_emake man \
|
||||
|| die "emake man failed"
|
||||
git_emake man || die "emake man failed"
|
||||
if use doc ; then
|
||||
git_emake info html \
|
||||
|| die "emake info html failed"
|
||||
git_emake info html || die "emake info html failed"
|
||||
fi
|
||||
else
|
||||
if use doc ; then
|
||||
git_emake info \
|
||||
|| die "emake info html failed"
|
||||
git_emake info || die "emake info html failed"
|
||||
fi
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
@ -358,27 +338,27 @@ src_compile() {
|
||||
fi
|
||||
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake git-subtree
|
||||
git_emake git-subtree || die
|
||||
# git-subtree.1 requires the full USE=doc dependency stack
|
||||
use doc && git_emake git-subtree.html git-subtree.1
|
||||
popd &>/dev/null || die
|
||||
|
||||
pushd contrib/diff-highlight &>/dev/null || die
|
||||
git_emake
|
||||
git_emake || die
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake
|
||||
git_emake || die
|
||||
popd &>/dev/null || die
|
||||
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake install || die "make install failed"
|
||||
git_emake DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
@ -426,10 +406,10 @@ src_install() {
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake install || die "Failed to emake install for git-subtree"
|
||||
git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
@ -437,7 +417,7 @@ src_install() {
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake install
|
||||
git_emake DESTDIR="${D}" install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
@ -507,9 +487,8 @@ src_install() {
|
||||
newdoc "${S}"/gitweb/README README.gitweb
|
||||
|
||||
for d in "${ED}"/usr/lib{,64}/perl5/ ; do
|
||||
if test -d "${d}" ; then find "${d}" \
|
||||
-name .packlist \
|
||||
-delete || die
|
||||
if [[ -d "${d}" ]] ; then
|
||||
find "${d}" -name .packlist -delete || die
|
||||
fi
|
||||
done
|
||||
else
|
||||
@ -526,10 +505,11 @@ src_install() {
|
||||
newins "${FILESDIR}"/git-daemon.xinetd git-daemon
|
||||
fi
|
||||
|
||||
if use !prefix ; then
|
||||
if ! use prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
|
||||
"git-daemon@.service"
|
||||
systemd_dounit "${FILESDIR}/git-daemon.socket"
|
||||
fi
|
||||
|
||||
@ -626,12 +606,13 @@ src_test() {
|
||||
done
|
||||
einfo "Disabled tests:"
|
||||
for i in ${disabled[@]} ; do
|
||||
[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
|
||||
if [[ -f "${i}" ]] ; then
|
||||
mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
|
||||
fi
|
||||
done
|
||||
|
||||
# Avoid the test system removing the results because we want them ourselves
|
||||
sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
|
||||
-i Makefile || die
|
||||
sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
|
||||
|
||||
# Clean old results first, must always run
|
||||
nonfatal git_emake clean
|
||||
@ -1,19 +1,19 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
# bug #329479: git-remote-testgit is not multiple-version aware
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
|
||||
inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
|
||||
|
||||
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
|
||||
# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
|
||||
# See https://git-scm.com/docs/gitworkflows#_graduation
|
||||
# In order of stability:
|
||||
@ -46,12 +46,12 @@ if [[ ${PV} != *9999 ]]; then
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
DEPEND="
|
||||
@ -61,10 +61,7 @@ DEPEND="
|
||||
)
|
||||
dev-libs/openssl:0=
|
||||
sys-libs/zlib
|
||||
pcre? (
|
||||
pcre-jit? ( dev-libs/libpcre2[jit(+)] )
|
||||
!pcre-jit? ( dev-libs/libpcre )
|
||||
)
|
||||
pcre? ( dev-libs/libpcre2:= )
|
||||
perl? ( dev-lang/perl:=[-build(-)] )
|
||||
tk? ( dev-lang/tk:0= )
|
||||
curl? (
|
||||
@ -102,6 +99,7 @@ RDEPEND="${DEPEND}
|
||||
)
|
||||
)
|
||||
perforce? ( ${PYTHON_DEPS} )
|
||||
selinux? ( sec-policy/selinux-git )
|
||||
"
|
||||
|
||||
# This is how info docs are created with Git:
|
||||
@ -135,7 +133,6 @@ REQUIRED_USE="
|
||||
cvs? ( perl )
|
||||
mediawiki? ( perl )
|
||||
mediawiki-experimental? ( mediawiki )
|
||||
pcre-jit? ( pcre )
|
||||
perforce? ( ${PYTHON_REQUIRED_USE} )
|
||||
subversion? ( perl )
|
||||
webdav? ( curl )
|
||||
@ -145,7 +142,7 @@ RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
|
||||
"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
|
||||
@ -209,23 +206,15 @@ exportmakeopts() {
|
||||
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
|
||||
|
||||
if use pcre; then
|
||||
if use pcre-jit; then
|
||||
myopts+=( USE_LIBPCRE2=YesPlease )
|
||||
extlibs+=( -lpcre2-8 )
|
||||
else
|
||||
myopts+=(
|
||||
USE_LIBPCRE1=YesPlease
|
||||
NO_LIBPCRE1_JIT=YesPlease
|
||||
)
|
||||
extlibs+=( -lpcre )
|
||||
fi
|
||||
fi
|
||||
if [[ ${CHOST} == *-solaris* ]]; then
|
||||
myopts+=(
|
||||
NEEDS_LIBICONV=YesPlease
|
||||
HAVE_CLOCK_MONOTONIC=1
|
||||
)
|
||||
if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
|
||||
if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then
|
||||
myopts+=( HAVE_GETDELIM=1 )
|
||||
fi
|
||||
fi
|
||||
@ -234,13 +223,6 @@ exportmakeopts() {
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
# Bug 290465:
|
||||
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
|
||||
if [[ "${CHOST}" == *-uclibc* ]] ; then
|
||||
myopts+=( NO_NSEC=YesPlease )
|
||||
use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
@ -275,6 +257,11 @@ src_prepare() {
|
||||
|
||||
default
|
||||
|
||||
if use prefix ; then
|
||||
# bug #757309
|
||||
eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
|
||||
fi
|
||||
|
||||
sed -i \
|
||||
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
|
||||
-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
|
||||
@ -298,7 +285,6 @@ git_emake() {
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
DESTDIR="${D}" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
@ -323,12 +309,10 @@ src_compile() {
|
||||
fi
|
||||
|
||||
if use perl && use cgi ; then
|
||||
git_emake \
|
||||
gitweb \
|
||||
|| die "emake gitweb (cgi) failed"
|
||||
git_emake gitweb || die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
@ -337,16 +321,13 @@ src_compile() {
|
||||
|
||||
pushd Documentation &>/dev/null || die
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
git_emake man \
|
||||
|| die "emake man failed"
|
||||
git_emake man || die "emake man failed"
|
||||
if use doc ; then
|
||||
git_emake info html \
|
||||
|| die "emake info html failed"
|
||||
git_emake info html || die "emake info html failed"
|
||||
fi
|
||||
else
|
||||
if use doc ; then
|
||||
git_emake info \
|
||||
|| die "emake info html failed"
|
||||
git_emake info || die "emake info html failed"
|
||||
fi
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
@ -358,27 +339,27 @@ src_compile() {
|
||||
fi
|
||||
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake git-subtree
|
||||
git_emake git-subtree || die
|
||||
# git-subtree.1 requires the full USE=doc dependency stack
|
||||
use doc && git_emake git-subtree.html git-subtree.1
|
||||
popd &>/dev/null || die
|
||||
|
||||
pushd contrib/diff-highlight &>/dev/null || die
|
||||
git_emake
|
||||
git_emake || die
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake
|
||||
git_emake || die
|
||||
popd &>/dev/null || die
|
||||
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake install || die "make install failed"
|
||||
git_emake DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
@ -426,10 +407,10 @@ src_install() {
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake install || die "Failed to emake install for git-subtree"
|
||||
git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
@ -437,7 +418,7 @@ src_install() {
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake install
|
||||
git_emake DESTDIR="${D}" install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
@ -507,9 +488,8 @@ src_install() {
|
||||
newdoc "${S}"/gitweb/README README.gitweb
|
||||
|
||||
for d in "${ED}"/usr/lib{,64}/perl5/ ; do
|
||||
if test -d "${d}" ; then find "${d}" \
|
||||
-name .packlist \
|
||||
-delete || die
|
||||
if [[ -d "${d}" ]] ; then
|
||||
find "${d}" -name .packlist -delete || die
|
||||
fi
|
||||
done
|
||||
else
|
||||
@ -526,10 +506,11 @@ src_install() {
|
||||
newins "${FILESDIR}"/git-daemon.xinetd git-daemon
|
||||
fi
|
||||
|
||||
if use !prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
|
||||
if ! use prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
|
||||
"git-daemon@.service"
|
||||
systemd_dounit "${FILESDIR}/git-daemon.socket"
|
||||
fi
|
||||
|
||||
@ -626,12 +607,13 @@ src_test() {
|
||||
done
|
||||
einfo "Disabled tests:"
|
||||
for i in ${disabled[@]} ; do
|
||||
[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
|
||||
if [[ -f "${i}" ]] ; then
|
||||
mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
|
||||
fi
|
||||
done
|
||||
|
||||
# Avoid the test system removing the results because we want them ourselves
|
||||
sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
|
||||
-i Makefile || die
|
||||
sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
|
||||
|
||||
# Clean old results first, must always run
|
||||
nonfatal git_emake clean
|
||||
660
sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.35.2.ebuild
vendored
Normal file
660
sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.35.2.ebuild
vendored
Normal file
@ -0,0 +1,660 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
# bug #329479: git-remote-testgit is not multiple-version aware
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
|
||||
inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
|
||||
|
||||
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
|
||||
# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
|
||||
# See https://git-scm.com/docs/gitworkflows#_graduation
|
||||
# In order of stability:
|
||||
# 9999-r0: maint
|
||||
# 9999-r1: master
|
||||
# 9999-r2: next
|
||||
# 9999-r3: seen
|
||||
case "${PVR}" in
|
||||
9999) EGIT_BRANCH=maint ;;
|
||||
9999-r1) EGIT_BRANCH=master ;;
|
||||
9999-r2) EGIT_BRANCH=next;;
|
||||
9999-r3) EGIT_BRANCH=seen ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
MY_PV="${PV/_rc/.rc}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
|
||||
DOC_VER="${MY_PV}"
|
||||
|
||||
DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
|
||||
HOMEPAGE="https://www.git-scm.com/"
|
||||
if [[ ${PV} != *9999 ]]; then
|
||||
SRC_URI_SUFFIX="xz"
|
||||
SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
|
||||
[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
|
||||
SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
doc? (
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
DEPEND="
|
||||
gnome-keyring? (
|
||||
app-crypt/libsecret
|
||||
dev-libs/glib:2
|
||||
)
|
||||
dev-libs/openssl:0=
|
||||
sys-libs/zlib
|
||||
pcre? ( dev-libs/libpcre2:= )
|
||||
perl? ( dev-lang/perl:=[-build(-)] )
|
||||
tk? ( dev-lang/tk:0= )
|
||||
curl? (
|
||||
net-misc/curl
|
||||
webdav? ( dev-libs/expat )
|
||||
)
|
||||
iconv? ( virtual/libiconv )
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
gpg? ( app-crypt/gnupg )
|
||||
perl? (
|
||||
dev-perl/Error
|
||||
dev-perl/MailTools
|
||||
dev-perl/Authen-SASL
|
||||
>=virtual/perl-libnet-3.110.0-r4[ssl]
|
||||
cgi? (
|
||||
dev-perl/CGI
|
||||
highlight? ( app-text/highlight )
|
||||
)
|
||||
cvs? (
|
||||
>=dev-vcs/cvsps-2.1:0
|
||||
dev-perl/DBI
|
||||
dev-perl/DBD-SQLite
|
||||
)
|
||||
mediawiki? (
|
||||
dev-perl/DateTime-Format-ISO8601
|
||||
dev-perl/HTML-Tree
|
||||
dev-perl/MediaWiki-API
|
||||
)
|
||||
subversion? (
|
||||
dev-vcs/subversion[-dso(-),perl]
|
||||
dev-perl/libwww-perl
|
||||
dev-perl/TermReadKey
|
||||
)
|
||||
)
|
||||
perforce? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
|
||||
# This is how info docs are created with Git:
|
||||
# .txt/asciidoc --(asciidoc)---------> .xml/docbook
|
||||
# .xml/docbook --(docbook2texi.pl)--> .texi
|
||||
# .texi --(makeinfo)---------> .info
|
||||
BDEPEND="
|
||||
doc? (
|
||||
app-text/asciidoc
|
||||
app-text/docbook2X
|
||||
app-text/xmlto
|
||||
sys-apps/texinfo
|
||||
)
|
||||
emacs? ( >=app-editors/emacs-23.1:* )
|
||||
gnome-keyring? ( virtual/pkgconfig )
|
||||
nls? ( sys-devel/gettext )
|
||||
test? ( app-crypt/gnupg )
|
||||
"
|
||||
|
||||
# Live ebuild builds man pages and HTML docs, additionally
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
BDEPEND="${BDEPEND}
|
||||
app-text/asciidoc"
|
||||
fi
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
REQUIRED_USE="
|
||||
cgi? ( perl )
|
||||
cvs? ( perl )
|
||||
mediawiki? ( perl )
|
||||
mediawiki-experimental? ( mediawiki )
|
||||
perforce? ( ${PYTHON_REQUIRED_USE} )
|
||||
subversion? ( perl )
|
||||
webdav? ( curl )
|
||||
"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use subversion && has_version "dev-vcs/subversion[dso]" ; then
|
||||
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
|
||||
ewarn "with USE=dso, there may be weird crashes in git-svn. You"
|
||||
ewarn "have been warned."
|
||||
fi
|
||||
|
||||
if use perforce ; then
|
||||
python-single-r1_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
# This is needed because for some obscure reasons future calls to make don't
|
||||
# pick up these exports if we export them in src_unpack()
|
||||
exportmakeopts() {
|
||||
local extlibs myopts
|
||||
|
||||
myopts=(
|
||||
ASCIIDOC_NO_ROFF=YesPlease
|
||||
$(usex cvs '' NO_CVS=YesPlease)
|
||||
$(usex elibc_musl NO_REGEX=YesPlease '')
|
||||
$(usex iconv '' NO_ICONV=YesPlease)
|
||||
$(usex nls '' NO_GETTEXT=YesPlease)
|
||||
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
|
||||
$(usex perforce '' NO_PYTHON=YesPlease)
|
||||
$(usex subversion '' NO_SVN_TESTS=YesPlease)
|
||||
$(usex threads '' NO_PTHREADS=YesPlease)
|
||||
$(usex tk '' NO_TCLTK=YesPlease)
|
||||
)
|
||||
|
||||
if use blksha1 ; then
|
||||
myopts+=( BLK_SHA1=YesPlease )
|
||||
elif use ppcsha1 ; then
|
||||
myopts+=( PPC_SHA1=YesPlease )
|
||||
fi
|
||||
|
||||
if use curl ; then
|
||||
use webdav || myopts+=( NO_EXPAT=YesPlease )
|
||||
else
|
||||
myopts+=( NO_CURL=YesPlease )
|
||||
fi
|
||||
|
||||
# broken assumptions, because of static build system ...
|
||||
myopts+=(
|
||||
NO_FINK=YesPlease
|
||||
NO_DARWIN_PORTS=YesPlease
|
||||
INSTALL=install
|
||||
TAR=tar
|
||||
SHELL_PATH="${EPREFIX}/bin/sh"
|
||||
SANE_TOOL_PATH=
|
||||
OLD_ICONV=
|
||||
NO_EXTERNAL_GREP=
|
||||
)
|
||||
|
||||
# can't define this to null, since the entire makefile depends on it
|
||||
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
|
||||
|
||||
if use pcre; then
|
||||
myopts+=( USE_LIBPCRE2=YesPlease )
|
||||
extlibs+=( -lpcre2-8 )
|
||||
fi
|
||||
if [[ ${CHOST} == *-solaris* ]]; then
|
||||
myopts+=(
|
||||
NEEDS_LIBICONV=YesPlease
|
||||
HAVE_CLOCK_MONOTONIC=1
|
||||
)
|
||||
if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then
|
||||
myopts+=( HAVE_GETDELIM=1 )
|
||||
fi
|
||||
fi
|
||||
|
||||
if has_version '>=app-text/asciidoc-8.0' ; then
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} != *9999 ]] ; then
|
||||
unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
cd "${S}" || die
|
||||
unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
if use doc ; then
|
||||
pushd "${S}"/Documentation &>/dev/null || die
|
||||
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
else
|
||||
git-r3_src_unpack
|
||||
#cp "${FILESDIR}"/GIT-VERSION-GEN .
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# add experimental patches to improve mediawiki support
|
||||
# see patches for origin
|
||||
if use mediawiki-experimental ; then
|
||||
PATCHES+=(
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
|
||||
)
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
if use prefix ; then
|
||||
# bug #757309
|
||||
eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
|
||||
fi
|
||||
|
||||
sed -i \
|
||||
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
|
||||
-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
|
||||
-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
|
||||
-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
|
||||
-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
Makefile || die
|
||||
|
||||
# Fix docbook2texi command
|
||||
sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
|
||||
Documentation/Makefile || die
|
||||
}
|
||||
|
||||
git_emake() {
|
||||
# bug #320647: PYTHON_PATH
|
||||
local PYTHON_PATH=""
|
||||
use perforce && PYTHON_PATH="${PYTHON}"
|
||||
emake ${MY_MAKEOPTS} \
|
||||
prefix="${EPREFIX}"/usr \
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
OPTCFLAGS="${CFLAGS}" \
|
||||
OPTLDFLAGS="${LDFLAGS}" \
|
||||
PERL_PATH="${EPREFIX}/usr/bin/perl" \
|
||||
PERL_MM_OPT="" \
|
||||
PYTHON_PATH="${PYTHON_PATH}" \
|
||||
V=1 \
|
||||
"$@"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
exportmakeopts
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
git_emake || die "emake failed"
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile contrib/emacs/git{,-blame}.el
|
||||
fi
|
||||
|
||||
if use perl && use cgi ; then
|
||||
git_emake gitweb || die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
pushd Documentation &>/dev/null || die
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
git_emake man || die "emake man failed"
|
||||
if use doc ; then
|
||||
git_emake info html || die "emake info html failed"
|
||||
fi
|
||||
else
|
||||
if use doc ; then
|
||||
git_emake info || die "emake info html failed"
|
||||
fi
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use gnome-keyring ; then
|
||||
pushd contrib/credential/libsecret &>/dev/null || die
|
||||
git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake git-subtree || die
|
||||
# git-subtree.1 requires the full USE=doc dependency stack
|
||||
use doc && git_emake git-subtree.html git-subtree.1
|
||||
popd &>/dev/null || die
|
||||
|
||||
pushd contrib/diff-highlight &>/dev/null || die
|
||||
git_emake || die
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake || die
|
||||
popd &>/dev/null || die
|
||||
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
# Depending on the tarball and manual rebuild of the documentation, the
|
||||
# manpages may exist in either OR both of these directories.
|
||||
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
|
||||
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
|
||||
dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
|
||||
use doc && dodir /usr/share/doc/${PF}/html
|
||||
local d
|
||||
for d in / /howto/ /technical/ ; do
|
||||
docinto ${d}
|
||||
dodoc Documentation${d}*.txt
|
||||
if use doc ; then
|
||||
docinto ${d}/html
|
||||
dodoc Documentation${d}*.html
|
||||
fi
|
||||
done
|
||||
docinto /
|
||||
# Upstream does not ship this pre-built :-(
|
||||
use doc && doinfo Documentation/{git,gitman}.info
|
||||
|
||||
newbashcomp contrib/completion/git-completion.bash ${PN}
|
||||
bashcomp_alias git gitk
|
||||
# Not really a bash-completion file (bug #477920)
|
||||
# but still needed uncompressed (bug #507480)
|
||||
insinto /usr/share/${PN}
|
||||
doins contrib/completion/git-prompt.sh
|
||||
|
||||
if use emacs ; then
|
||||
elisp-install ${PN} contrib/emacs/git.{el,elc}
|
||||
elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
|
||||
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
|
||||
# don't add automatically to the load-path, so the sitefile
|
||||
# can do a conditional loading
|
||||
touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
|
||||
elisp-site-file-install "${FILESDIR}"/${SITEFILE}
|
||||
fi
|
||||
|
||||
#dobin contrib/fast-import/git-p4 # Moved upstream
|
||||
#dodoc contrib/fast-import/git-p4.txt # Moved upstream
|
||||
newbin contrib/fast-import/import-tars.perl import-tars
|
||||
exeinto /usr/libexec/git-core/
|
||||
newexe contrib/git-resurrect.sh git-resurrect
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake DESTDIR="${D}" install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
# diff-highlight
|
||||
dobin contrib/diff-highlight/diff-highlight
|
||||
newdoc contrib/diff-highlight/README README.diff-highlight
|
||||
|
||||
# git-jump
|
||||
exeinto /usr/libexec/git-core/
|
||||
doexe contrib/git-jump/git-jump
|
||||
newdoc contrib/git-jump/README git-jump.txt
|
||||
|
||||
# git-contacts
|
||||
exeinto /usr/libexec/git-core/
|
||||
doexe contrib/contacts/git-contacts
|
||||
dodoc contrib/contacts/git-contacts.txt
|
||||
|
||||
if use gnome-keyring ; then
|
||||
pushd contrib/credential/libsecret &>/dev/null || die
|
||||
dobin git-credential-libsecret
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
dodir /usr/share/${PN}/contrib
|
||||
# The following are excluded:
|
||||
# completion - installed above
|
||||
# diff-highlight - done above
|
||||
# emacs - installed above
|
||||
# examples - these are stuff that is not used in Git anymore actually
|
||||
# git-jump - done above
|
||||
# gitview - installed above
|
||||
# p4import - excluded because fast-import has a better one
|
||||
# patches - stuff the Git guys made to go upstream to other places
|
||||
# persistent-https - TODO
|
||||
# mw-to-git - TODO
|
||||
# subtree - build seperately
|
||||
# svnimport - use git-svn
|
||||
# thunderbird-patch-inline - fixes thunderbird
|
||||
local contrib_objects=(
|
||||
buildsystems
|
||||
fast-import
|
||||
hg-to-git
|
||||
hooks
|
||||
remotes2config.sh
|
||||
rerere-train.sh
|
||||
stats
|
||||
workdir
|
||||
)
|
||||
local i
|
||||
for i in "${contrib_objects[@]}" ; do
|
||||
cp -rf \
|
||||
"${S}"/contrib/${i} \
|
||||
"${ED}"/usr/share/${PN}/contrib \
|
||||
|| die "Failed contrib ${i}"
|
||||
done
|
||||
|
||||
if use perl && use cgi ; then
|
||||
# We used to install in /usr/share/${PN}/gitweb
|
||||
# but upstream installs in /usr/share/gitweb
|
||||
# so we will install a symlink and use their location for compat with other
|
||||
# distros
|
||||
dosym ../gitweb /usr/share/${PN}/gitweb
|
||||
|
||||
# INSTALL discusses configuration issues, not just installation
|
||||
docinto /
|
||||
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
|
||||
newdoc "${S}"/gitweb/README README.gitweb
|
||||
|
||||
for d in "${ED}"/usr/lib{,64}/perl5/ ; do
|
||||
if [[ -d "${d}" ]] ; then
|
||||
find "${d}" -name .packlist -delete || die
|
||||
fi
|
||||
done
|
||||
else
|
||||
rm -rf "${ED}"/usr/share/gitweb
|
||||
fi
|
||||
|
||||
if ! use subversion ; then
|
||||
rm -f "${ED}"/usr/libexec/git-core/git-svn \
|
||||
"${ED}"/usr/share/man/man1/git-svn.1*
|
||||
fi
|
||||
|
||||
if use xinetd ; then
|
||||
insinto /etc/xinetd.d
|
||||
newins "${FILESDIR}"/git-daemon.xinetd git-daemon
|
||||
fi
|
||||
|
||||
if ! use prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
|
||||
"git-daemon@.service"
|
||||
systemd_dounit "${FILESDIR}/git-daemon.socket"
|
||||
fi
|
||||
|
||||
perl_delete_localpod
|
||||
|
||||
# Remove disabled linguas
|
||||
# we could remove sources in src_prepare, but install does not
|
||||
# handle missing locale dir well
|
||||
rm_loc() {
|
||||
if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
|
||||
rm -r "${ED}/usr/share/locale/${1}" || die
|
||||
fi
|
||||
}
|
||||
plocale_for_each_disabled_locale rm_loc
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local disabled=()
|
||||
local tests_cvs=(
|
||||
t9200-git-cvsexportcommit.sh
|
||||
t9400-git-cvsserver-server.sh
|
||||
t9401-git-cvsserver-crlf.sh
|
||||
t9402-git-cvsserver-refs.sh
|
||||
t9600-cvsimport.sh
|
||||
t9601-cvsimport-vendor-branch.sh
|
||||
t9602-cvsimport-branches-tags.sh
|
||||
t9603-cvsimport-patchsets.sh
|
||||
t9604-cvsimport-timestamps.sh
|
||||
)
|
||||
local tests_perl=(
|
||||
t3701-add-interactive.sh
|
||||
t5502-quickfetch.sh
|
||||
t5512-ls-remote.sh
|
||||
t5520-pull.sh
|
||||
t7106-reset-unborn-branch.sh
|
||||
t7501-commit.sh
|
||||
)
|
||||
# Bug #225601 - t0004 is not suitable for root perm
|
||||
# Bug #219839 - t1004 is not suitable for root perm
|
||||
# t0001-init.sh - check for init notices EPERM* fails
|
||||
local tests_nonroot=(
|
||||
t0001-init.sh
|
||||
t0004-unwritable.sh
|
||||
t0070-fundamental.sh
|
||||
t1004-read-tree-m-u-wf.sh
|
||||
t3700-add.sh
|
||||
t7300-clean.sh
|
||||
)
|
||||
# t9100 still fails with symlinks in SVN 1.7
|
||||
local test_svn=( t9100-git-svn-basic.sh )
|
||||
|
||||
# Unzip is used only for the testcase code, not by any normal parts of Git.
|
||||
if ! has_version app-arch/unzip ; then
|
||||
einfo "Disabling tar-tree tests"
|
||||
disabled+=( t5000-tar-tree.sh )
|
||||
fi
|
||||
|
||||
local cvs=0
|
||||
use cvs && let cvs=${cvs}+1
|
||||
if [[ ${EUID} -eq 0 ]] ; then
|
||||
if [[ ${cvs} -eq 1 ]] ; then
|
||||
ewarn "Skipping CVS tests because CVS does not work as root!"
|
||||
ewarn "You should retest with FEATURES=userpriv!"
|
||||
disabled+=( ${tests_cvs[@]} )
|
||||
fi
|
||||
einfo "Skipping other tests that require being non-root"
|
||||
disabled+=( ${tests_nonroot[@]} )
|
||||
else
|
||||
[[ ${cvs} -gt 0 ]] && \
|
||||
has_version dev-vcs/cvs && \
|
||||
let cvs=${cvs}+1
|
||||
[[ ${cvs} -gt 1 ]] && \
|
||||
has_version "dev-vcs/cvs[server]" && \
|
||||
let cvs=${cvs}+1
|
||||
if [[ ${cvs} -lt 3 ]] ; then
|
||||
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
|
||||
disabled+=( ${tests_cvs[@]} )
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! use perl ; then
|
||||
einfo "Disabling tests that need Perl"
|
||||
disabled+=( ${tests_perl[@]} )
|
||||
fi
|
||||
|
||||
einfo "Disabling tests that fail with SVN 1.7"
|
||||
disabled+=( ${test_svn[@]} )
|
||||
|
||||
# Reset all previously disabled tests
|
||||
pushd t &>/dev/null || die
|
||||
local i
|
||||
for i in *.sh.DISABLED ; do
|
||||
[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
|
||||
done
|
||||
einfo "Disabled tests:"
|
||||
for i in ${disabled[@]} ; do
|
||||
if [[ -f "${i}" ]] ; then
|
||||
mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
|
||||
fi
|
||||
done
|
||||
|
||||
# Avoid the test system removing the results because we want them ourselves
|
||||
sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
|
||||
|
||||
# Clean old results first, must always run
|
||||
nonfatal git_emake clean
|
||||
popd &>/dev/null || die
|
||||
|
||||
# Now run the tests, keep going if we hit an error, and don't terminate on
|
||||
# failure
|
||||
local rc
|
||||
einfo "Start test run"
|
||||
#MAKEOPTS=-j1
|
||||
nonfatal git_emake --keep-going test
|
||||
rc=$?
|
||||
|
||||
# Display nice results, now print the results
|
||||
pushd t &>/dev/null || die
|
||||
nonfatal git_emake aggregate-results
|
||||
|
||||
# And bail if there was a problem
|
||||
[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
|
||||
}
|
||||
|
||||
showpkgdeps() {
|
||||
local pkg=$1
|
||||
shift
|
||||
elog " $(printf "%-17s:" ${pkg}) ${@}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
|
||||
elog "completion."
|
||||
elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
|
||||
elog "Note that the prompt bash code is now in that separate script"
|
||||
elog "These additional scripts need some dependencies:"
|
||||
echo
|
||||
showpkgdeps git-quiltimport "dev-util/quilt"
|
||||
showpkgdeps git-instaweb \
|
||||
"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
|
||||
echo
|
||||
use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
661
sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.35.3.ebuild
vendored
Normal file
661
sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.35.3.ebuild
vendored
Normal file
@ -0,0 +1,661 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
# bug #329479: git-remote-testgit is not multiple-version aware
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
|
||||
inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
|
||||
|
||||
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
|
||||
# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
|
||||
# See https://git-scm.com/docs/gitworkflows#_graduation
|
||||
# In order of stability:
|
||||
# 9999-r0: maint
|
||||
# 9999-r1: master
|
||||
# 9999-r2: next
|
||||
# 9999-r3: seen
|
||||
case "${PVR}" in
|
||||
9999) EGIT_BRANCH=maint ;;
|
||||
9999-r1) EGIT_BRANCH=master ;;
|
||||
9999-r2) EGIT_BRANCH=next;;
|
||||
9999-r3) EGIT_BRANCH=seen ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
MY_PV="${PV/_rc/.rc}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
|
||||
DOC_VER="${MY_PV}"
|
||||
|
||||
DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
|
||||
HOMEPAGE="https://www.git-scm.com/"
|
||||
if [[ ${PV} != *9999 ]]; then
|
||||
SRC_URI_SUFFIX="xz"
|
||||
SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
|
||||
[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
|
||||
SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
doc? (
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
DEPEND="
|
||||
gnome-keyring? (
|
||||
app-crypt/libsecret
|
||||
dev-libs/glib:2
|
||||
)
|
||||
dev-libs/openssl:0=
|
||||
sys-libs/zlib
|
||||
pcre? ( dev-libs/libpcre2:= )
|
||||
perl? ( dev-lang/perl:=[-build(-)] )
|
||||
tk? ( dev-lang/tk:0= )
|
||||
curl? (
|
||||
net-misc/curl
|
||||
webdav? ( dev-libs/expat )
|
||||
)
|
||||
iconv? ( virtual/libiconv )
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
gpg? ( app-crypt/gnupg )
|
||||
perl? (
|
||||
dev-perl/Error
|
||||
dev-perl/MailTools
|
||||
dev-perl/Authen-SASL
|
||||
>=virtual/perl-libnet-3.110.0-r4[ssl]
|
||||
cgi? (
|
||||
dev-perl/CGI
|
||||
highlight? ( app-text/highlight )
|
||||
)
|
||||
cvs? (
|
||||
>=dev-vcs/cvsps-2.1:0
|
||||
dev-perl/DBI
|
||||
dev-perl/DBD-SQLite
|
||||
)
|
||||
mediawiki? (
|
||||
dev-perl/DateTime-Format-ISO8601
|
||||
dev-perl/HTML-Tree
|
||||
dev-perl/MediaWiki-API
|
||||
)
|
||||
subversion? (
|
||||
dev-vcs/subversion[-dso(-),perl]
|
||||
dev-perl/libwww-perl
|
||||
dev-perl/TermReadKey
|
||||
)
|
||||
)
|
||||
perforce? ( ${PYTHON_DEPS} )
|
||||
selinux? ( sec-policy/selinux-git )
|
||||
"
|
||||
|
||||
# This is how info docs are created with Git:
|
||||
# .txt/asciidoc --(asciidoc)---------> .xml/docbook
|
||||
# .xml/docbook --(docbook2texi.pl)--> .texi
|
||||
# .texi --(makeinfo)---------> .info
|
||||
BDEPEND="
|
||||
doc? (
|
||||
app-text/asciidoc
|
||||
app-text/docbook2X
|
||||
app-text/xmlto
|
||||
sys-apps/texinfo
|
||||
)
|
||||
emacs? ( >=app-editors/emacs-23.1:* )
|
||||
gnome-keyring? ( virtual/pkgconfig )
|
||||
nls? ( sys-devel/gettext )
|
||||
test? ( app-crypt/gnupg )
|
||||
"
|
||||
|
||||
# Live ebuild builds man pages and HTML docs, additionally
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
BDEPEND="${BDEPEND}
|
||||
app-text/asciidoc"
|
||||
fi
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
REQUIRED_USE="
|
||||
cgi? ( perl )
|
||||
cvs? ( perl )
|
||||
mediawiki? ( perl )
|
||||
mediawiki-experimental? ( mediawiki )
|
||||
perforce? ( ${PYTHON_REQUIRED_USE} )
|
||||
subversion? ( perl )
|
||||
webdav? ( curl )
|
||||
"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use subversion && has_version "dev-vcs/subversion[dso]" ; then
|
||||
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
|
||||
ewarn "with USE=dso, there may be weird crashes in git-svn. You"
|
||||
ewarn "have been warned."
|
||||
fi
|
||||
|
||||
if use perforce ; then
|
||||
python-single-r1_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
# This is needed because for some obscure reasons future calls to make don't
|
||||
# pick up these exports if we export them in src_unpack()
|
||||
exportmakeopts() {
|
||||
local extlibs myopts
|
||||
|
||||
myopts=(
|
||||
ASCIIDOC_NO_ROFF=YesPlease
|
||||
$(usex cvs '' NO_CVS=YesPlease)
|
||||
$(usex elibc_musl NO_REGEX=YesPlease '')
|
||||
$(usex iconv '' NO_ICONV=YesPlease)
|
||||
$(usex nls '' NO_GETTEXT=YesPlease)
|
||||
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
|
||||
$(usex perforce '' NO_PYTHON=YesPlease)
|
||||
$(usex subversion '' NO_SVN_TESTS=YesPlease)
|
||||
$(usex threads '' NO_PTHREADS=YesPlease)
|
||||
$(usex tk '' NO_TCLTK=YesPlease)
|
||||
)
|
||||
|
||||
if use blksha1 ; then
|
||||
myopts+=( BLK_SHA1=YesPlease )
|
||||
elif use ppcsha1 ; then
|
||||
myopts+=( PPC_SHA1=YesPlease )
|
||||
fi
|
||||
|
||||
if use curl ; then
|
||||
use webdav || myopts+=( NO_EXPAT=YesPlease )
|
||||
else
|
||||
myopts+=( NO_CURL=YesPlease )
|
||||
fi
|
||||
|
||||
# broken assumptions, because of static build system ...
|
||||
myopts+=(
|
||||
NO_FINK=YesPlease
|
||||
NO_DARWIN_PORTS=YesPlease
|
||||
INSTALL=install
|
||||
TAR=tar
|
||||
SHELL_PATH="${EPREFIX}/bin/sh"
|
||||
SANE_TOOL_PATH=
|
||||
OLD_ICONV=
|
||||
NO_EXTERNAL_GREP=
|
||||
)
|
||||
|
||||
# can't define this to null, since the entire makefile depends on it
|
||||
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
|
||||
|
||||
if use pcre; then
|
||||
myopts+=( USE_LIBPCRE2=YesPlease )
|
||||
extlibs+=( -lpcre2-8 )
|
||||
fi
|
||||
if [[ ${CHOST} == *-solaris* ]]; then
|
||||
myopts+=(
|
||||
NEEDS_LIBICONV=YesPlease
|
||||
HAVE_CLOCK_MONOTONIC=1
|
||||
)
|
||||
if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then
|
||||
myopts+=( HAVE_GETDELIM=1 )
|
||||
fi
|
||||
fi
|
||||
|
||||
if has_version '>=app-text/asciidoc-8.0' ; then
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} != *9999 ]] ; then
|
||||
unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
cd "${S}" || die
|
||||
unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
if use doc ; then
|
||||
pushd "${S}"/Documentation &>/dev/null || die
|
||||
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
else
|
||||
git-r3_src_unpack
|
||||
#cp "${FILESDIR}"/GIT-VERSION-GEN .
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# add experimental patches to improve mediawiki support
|
||||
# see patches for origin
|
||||
if use mediawiki-experimental ; then
|
||||
PATCHES+=(
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
|
||||
)
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
if use prefix ; then
|
||||
# bug #757309
|
||||
eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
|
||||
fi
|
||||
|
||||
sed -i \
|
||||
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
|
||||
-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
|
||||
-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
|
||||
-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
|
||||
-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
Makefile || die
|
||||
|
||||
# Fix docbook2texi command
|
||||
sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
|
||||
Documentation/Makefile || die
|
||||
}
|
||||
|
||||
git_emake() {
|
||||
# bug #320647: PYTHON_PATH
|
||||
local PYTHON_PATH=""
|
||||
use perforce && PYTHON_PATH="${PYTHON}"
|
||||
emake ${MY_MAKEOPTS} \
|
||||
prefix="${EPREFIX}"/usr \
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
OPTCFLAGS="${CFLAGS}" \
|
||||
OPTLDFLAGS="${LDFLAGS}" \
|
||||
PERL_PATH="${EPREFIX}/usr/bin/perl" \
|
||||
PERL_MM_OPT="" \
|
||||
PYTHON_PATH="${PYTHON_PATH}" \
|
||||
V=1 \
|
||||
"$@"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
exportmakeopts
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
git_emake || die "emake failed"
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile contrib/emacs/git{,-blame}.el
|
||||
fi
|
||||
|
||||
if use perl && use cgi ; then
|
||||
git_emake gitweb || die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
pushd Documentation &>/dev/null || die
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
git_emake man || die "emake man failed"
|
||||
if use doc ; then
|
||||
git_emake info html || die "emake info html failed"
|
||||
fi
|
||||
else
|
||||
if use doc ; then
|
||||
git_emake info || die "emake info html failed"
|
||||
fi
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use gnome-keyring ; then
|
||||
pushd contrib/credential/libsecret &>/dev/null || die
|
||||
git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake git-subtree || die
|
||||
# git-subtree.1 requires the full USE=doc dependency stack
|
||||
use doc && git_emake git-subtree.html git-subtree.1
|
||||
popd &>/dev/null || die
|
||||
|
||||
pushd contrib/diff-highlight &>/dev/null || die
|
||||
git_emake || die
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake || die
|
||||
popd &>/dev/null || die
|
||||
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
# Depending on the tarball and manual rebuild of the documentation, the
|
||||
# manpages may exist in either OR both of these directories.
|
||||
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
|
||||
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
|
||||
dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
|
||||
use doc && dodir /usr/share/doc/${PF}/html
|
||||
local d
|
||||
for d in / /howto/ /technical/ ; do
|
||||
docinto ${d}
|
||||
dodoc Documentation${d}*.txt
|
||||
if use doc ; then
|
||||
docinto ${d}/html
|
||||
dodoc Documentation${d}*.html
|
||||
fi
|
||||
done
|
||||
docinto /
|
||||
# Upstream does not ship this pre-built :-(
|
||||
use doc && doinfo Documentation/{git,gitman}.info
|
||||
|
||||
newbashcomp contrib/completion/git-completion.bash ${PN}
|
||||
bashcomp_alias git gitk
|
||||
# Not really a bash-completion file (bug #477920)
|
||||
# but still needed uncompressed (bug #507480)
|
||||
insinto /usr/share/${PN}
|
||||
doins contrib/completion/git-prompt.sh
|
||||
|
||||
if use emacs ; then
|
||||
elisp-install ${PN} contrib/emacs/git.{el,elc}
|
||||
elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
|
||||
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
|
||||
# don't add automatically to the load-path, so the sitefile
|
||||
# can do a conditional loading
|
||||
touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
|
||||
elisp-site-file-install "${FILESDIR}"/${SITEFILE}
|
||||
fi
|
||||
|
||||
#dobin contrib/fast-import/git-p4 # Moved upstream
|
||||
#dodoc contrib/fast-import/git-p4.txt # Moved upstream
|
||||
newbin contrib/fast-import/import-tars.perl import-tars
|
||||
exeinto /usr/libexec/git-core/
|
||||
newexe contrib/git-resurrect.sh git-resurrect
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake DESTDIR="${D}" install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
# diff-highlight
|
||||
dobin contrib/diff-highlight/diff-highlight
|
||||
newdoc contrib/diff-highlight/README README.diff-highlight
|
||||
|
||||
# git-jump
|
||||
exeinto /usr/libexec/git-core/
|
||||
doexe contrib/git-jump/git-jump
|
||||
newdoc contrib/git-jump/README git-jump.txt
|
||||
|
||||
# git-contacts
|
||||
exeinto /usr/libexec/git-core/
|
||||
doexe contrib/contacts/git-contacts
|
||||
dodoc contrib/contacts/git-contacts.txt
|
||||
|
||||
if use gnome-keyring ; then
|
||||
pushd contrib/credential/libsecret &>/dev/null || die
|
||||
dobin git-credential-libsecret
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
dodir /usr/share/${PN}/contrib
|
||||
# The following are excluded:
|
||||
# completion - installed above
|
||||
# diff-highlight - done above
|
||||
# emacs - installed above
|
||||
# examples - these are stuff that is not used in Git anymore actually
|
||||
# git-jump - done above
|
||||
# gitview - installed above
|
||||
# p4import - excluded because fast-import has a better one
|
||||
# patches - stuff the Git guys made to go upstream to other places
|
||||
# persistent-https - TODO
|
||||
# mw-to-git - TODO
|
||||
# subtree - build seperately
|
||||
# svnimport - use git-svn
|
||||
# thunderbird-patch-inline - fixes thunderbird
|
||||
local contrib_objects=(
|
||||
buildsystems
|
||||
fast-import
|
||||
hg-to-git
|
||||
hooks
|
||||
remotes2config.sh
|
||||
rerere-train.sh
|
||||
stats
|
||||
workdir
|
||||
)
|
||||
local i
|
||||
for i in "${contrib_objects[@]}" ; do
|
||||
cp -rf \
|
||||
"${S}"/contrib/${i} \
|
||||
"${ED}"/usr/share/${PN}/contrib \
|
||||
|| die "Failed contrib ${i}"
|
||||
done
|
||||
|
||||
if use perl && use cgi ; then
|
||||
# We used to install in /usr/share/${PN}/gitweb
|
||||
# but upstream installs in /usr/share/gitweb
|
||||
# so we will install a symlink and use their location for compat with other
|
||||
# distros
|
||||
dosym ../gitweb /usr/share/${PN}/gitweb
|
||||
|
||||
# INSTALL discusses configuration issues, not just installation
|
||||
docinto /
|
||||
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
|
||||
newdoc "${S}"/gitweb/README README.gitweb
|
||||
|
||||
for d in "${ED}"/usr/lib{,64}/perl5/ ; do
|
||||
if [[ -d "${d}" ]] ; then
|
||||
find "${d}" -name .packlist -delete || die
|
||||
fi
|
||||
done
|
||||
else
|
||||
rm -rf "${ED}"/usr/share/gitweb
|
||||
fi
|
||||
|
||||
if ! use subversion ; then
|
||||
rm -f "${ED}"/usr/libexec/git-core/git-svn \
|
||||
"${ED}"/usr/share/man/man1/git-svn.1*
|
||||
fi
|
||||
|
||||
if use xinetd ; then
|
||||
insinto /etc/xinetd.d
|
||||
newins "${FILESDIR}"/git-daemon.xinetd git-daemon
|
||||
fi
|
||||
|
||||
if ! use prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
|
||||
"git-daemon@.service"
|
||||
systemd_dounit "${FILESDIR}/git-daemon.socket"
|
||||
fi
|
||||
|
||||
perl_delete_localpod
|
||||
|
||||
# Remove disabled linguas
|
||||
# we could remove sources in src_prepare, but install does not
|
||||
# handle missing locale dir well
|
||||
rm_loc() {
|
||||
if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
|
||||
rm -r "${ED}/usr/share/locale/${1}" || die
|
||||
fi
|
||||
}
|
||||
plocale_for_each_disabled_locale rm_loc
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local disabled=()
|
||||
local tests_cvs=(
|
||||
t9200-git-cvsexportcommit.sh
|
||||
t9400-git-cvsserver-server.sh
|
||||
t9401-git-cvsserver-crlf.sh
|
||||
t9402-git-cvsserver-refs.sh
|
||||
t9600-cvsimport.sh
|
||||
t9601-cvsimport-vendor-branch.sh
|
||||
t9602-cvsimport-branches-tags.sh
|
||||
t9603-cvsimport-patchsets.sh
|
||||
t9604-cvsimport-timestamps.sh
|
||||
)
|
||||
local tests_perl=(
|
||||
t3701-add-interactive.sh
|
||||
t5502-quickfetch.sh
|
||||
t5512-ls-remote.sh
|
||||
t5520-pull.sh
|
||||
t7106-reset-unborn-branch.sh
|
||||
t7501-commit.sh
|
||||
)
|
||||
# Bug #225601 - t0004 is not suitable for root perm
|
||||
# Bug #219839 - t1004 is not suitable for root perm
|
||||
# t0001-init.sh - check for init notices EPERM* fails
|
||||
local tests_nonroot=(
|
||||
t0001-init.sh
|
||||
t0004-unwritable.sh
|
||||
t0070-fundamental.sh
|
||||
t1004-read-tree-m-u-wf.sh
|
||||
t3700-add.sh
|
||||
t7300-clean.sh
|
||||
)
|
||||
# t9100 still fails with symlinks in SVN 1.7
|
||||
local test_svn=( t9100-git-svn-basic.sh )
|
||||
|
||||
# Unzip is used only for the testcase code, not by any normal parts of Git.
|
||||
if ! has_version app-arch/unzip ; then
|
||||
einfo "Disabling tar-tree tests"
|
||||
disabled+=( t5000-tar-tree.sh )
|
||||
fi
|
||||
|
||||
local cvs=0
|
||||
use cvs && let cvs=${cvs}+1
|
||||
if [[ ${EUID} -eq 0 ]] ; then
|
||||
if [[ ${cvs} -eq 1 ]] ; then
|
||||
ewarn "Skipping CVS tests because CVS does not work as root!"
|
||||
ewarn "You should retest with FEATURES=userpriv!"
|
||||
disabled+=( ${tests_cvs[@]} )
|
||||
fi
|
||||
einfo "Skipping other tests that require being non-root"
|
||||
disabled+=( ${tests_nonroot[@]} )
|
||||
else
|
||||
[[ ${cvs} -gt 0 ]] && \
|
||||
has_version dev-vcs/cvs && \
|
||||
let cvs=${cvs}+1
|
||||
[[ ${cvs} -gt 1 ]] && \
|
||||
has_version "dev-vcs/cvs[server]" && \
|
||||
let cvs=${cvs}+1
|
||||
if [[ ${cvs} -lt 3 ]] ; then
|
||||
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
|
||||
disabled+=( ${tests_cvs[@]} )
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! use perl ; then
|
||||
einfo "Disabling tests that need Perl"
|
||||
disabled+=( ${tests_perl[@]} )
|
||||
fi
|
||||
|
||||
einfo "Disabling tests that fail with SVN 1.7"
|
||||
disabled+=( ${test_svn[@]} )
|
||||
|
||||
# Reset all previously disabled tests
|
||||
pushd t &>/dev/null || die
|
||||
local i
|
||||
for i in *.sh.DISABLED ; do
|
||||
[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
|
||||
done
|
||||
einfo "Disabled tests:"
|
||||
for i in ${disabled[@]} ; do
|
||||
if [[ -f "${i}" ]] ; then
|
||||
mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
|
||||
fi
|
||||
done
|
||||
|
||||
# Avoid the test system removing the results because we want them ourselves
|
||||
sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
|
||||
|
||||
# Clean old results first, must always run
|
||||
nonfatal git_emake clean
|
||||
popd &>/dev/null || die
|
||||
|
||||
# Now run the tests, keep going if we hit an error, and don't terminate on
|
||||
# failure
|
||||
local rc
|
||||
einfo "Start test run"
|
||||
#MAKEOPTS=-j1
|
||||
nonfatal git_emake --keep-going test
|
||||
rc=$?
|
||||
|
||||
# Display nice results, now print the results
|
||||
pushd t &>/dev/null || die
|
||||
nonfatal git_emake aggregate-results
|
||||
|
||||
# And bail if there was a problem
|
||||
[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
|
||||
}
|
||||
|
||||
showpkgdeps() {
|
||||
local pkg=$1
|
||||
shift
|
||||
elog " $(printf "%-17s:" ${pkg}) ${@}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
|
||||
elog "completion."
|
||||
elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
|
||||
elog "Note that the prompt bash code is now in that separate script"
|
||||
elog "These additional scripts need some dependencies:"
|
||||
echo
|
||||
showpkgdeps git-quiltimport "dev-util/quilt"
|
||||
showpkgdeps git-instaweb \
|
||||
"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
|
||||
echo
|
||||
use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
661
sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.36.0.ebuild
vendored
Normal file
661
sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.36.0.ebuild
vendored
Normal file
@ -0,0 +1,661 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
# bug #329479: git-remote-testgit is not multiple-version aware
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
|
||||
inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
|
||||
|
||||
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
|
||||
# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
|
||||
# See https://git-scm.com/docs/gitworkflows#_graduation
|
||||
# In order of stability:
|
||||
# 9999-r0: maint
|
||||
# 9999-r1: master
|
||||
# 9999-r2: next
|
||||
# 9999-r3: seen
|
||||
case "${PVR}" in
|
||||
9999) EGIT_BRANCH=maint ;;
|
||||
9999-r1) EGIT_BRANCH=master ;;
|
||||
9999-r2) EGIT_BRANCH=next;;
|
||||
9999-r3) EGIT_BRANCH=seen ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
MY_PV="${PV/_rc/.rc}"
|
||||
MY_P="${PN}-${MY_PV}"
|
||||
|
||||
DOC_VER="${MY_PV}"
|
||||
|
||||
DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
|
||||
HOMEPAGE="https://www.git-scm.com/"
|
||||
if [[ ${PV} != *9999 ]]; then
|
||||
SRC_URI_SUFFIX="xz"
|
||||
SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
|
||||
[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
|
||||
SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
doc? (
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
DEPEND="
|
||||
gnome-keyring? (
|
||||
app-crypt/libsecret
|
||||
dev-libs/glib:2
|
||||
)
|
||||
dev-libs/openssl:0=
|
||||
sys-libs/zlib
|
||||
pcre? ( dev-libs/libpcre2:= )
|
||||
perl? ( dev-lang/perl:=[-build(-)] )
|
||||
tk? ( dev-lang/tk:0= )
|
||||
curl? (
|
||||
net-misc/curl
|
||||
webdav? ( dev-libs/expat )
|
||||
)
|
||||
iconv? ( virtual/libiconv )
|
||||
"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
gpg? ( app-crypt/gnupg )
|
||||
perl? (
|
||||
dev-perl/Error
|
||||
dev-perl/MailTools
|
||||
dev-perl/Authen-SASL
|
||||
>=virtual/perl-libnet-3.110.0-r4[ssl]
|
||||
cgi? (
|
||||
dev-perl/CGI
|
||||
highlight? ( app-text/highlight )
|
||||
)
|
||||
cvs? (
|
||||
>=dev-vcs/cvsps-2.1:0
|
||||
dev-perl/DBI
|
||||
dev-perl/DBD-SQLite
|
||||
)
|
||||
mediawiki? (
|
||||
dev-perl/DateTime-Format-ISO8601
|
||||
dev-perl/HTML-Tree
|
||||
dev-perl/MediaWiki-API
|
||||
)
|
||||
subversion? (
|
||||
dev-vcs/subversion[-dso(-),perl]
|
||||
dev-perl/libwww-perl
|
||||
dev-perl/TermReadKey
|
||||
)
|
||||
)
|
||||
perforce? ( ${PYTHON_DEPS} )
|
||||
selinux? ( sec-policy/selinux-git )
|
||||
"
|
||||
|
||||
# This is how info docs are created with Git:
|
||||
# .txt/asciidoc --(asciidoc)---------> .xml/docbook
|
||||
# .xml/docbook --(docbook2texi.pl)--> .texi
|
||||
# .texi --(makeinfo)---------> .info
|
||||
BDEPEND="
|
||||
doc? (
|
||||
app-text/asciidoc
|
||||
app-text/docbook2X
|
||||
app-text/xmlto
|
||||
sys-apps/texinfo
|
||||
)
|
||||
emacs? ( >=app-editors/emacs-23.1:* )
|
||||
gnome-keyring? ( virtual/pkgconfig )
|
||||
nls? ( sys-devel/gettext )
|
||||
test? ( app-crypt/gnupg )
|
||||
"
|
||||
|
||||
# Live ebuild builds man pages and HTML docs, additionally
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
BDEPEND="${BDEPEND}
|
||||
app-text/asciidoc"
|
||||
fi
|
||||
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
REQUIRED_USE="
|
||||
cgi? ( perl )
|
||||
cvs? ( perl )
|
||||
mediawiki? ( perl )
|
||||
mediawiki-experimental? ( mediawiki )
|
||||
perforce? ( ${PYTHON_REQUIRED_USE} )
|
||||
subversion? ( perl )
|
||||
webdav? ( curl )
|
||||
"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
if use subversion && has_version "dev-vcs/subversion[dso]" ; then
|
||||
ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
|
||||
ewarn "with USE=dso, there may be weird crashes in git-svn. You"
|
||||
ewarn "have been warned."
|
||||
fi
|
||||
|
||||
if use perforce ; then
|
||||
python-single-r1_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
# This is needed because for some obscure reasons future calls to make don't
|
||||
# pick up these exports if we export them in src_unpack()
|
||||
exportmakeopts() {
|
||||
local extlibs myopts
|
||||
|
||||
myopts=(
|
||||
ASCIIDOC_NO_ROFF=YesPlease
|
||||
$(usex cvs '' NO_CVS=YesPlease)
|
||||
$(usex elibc_musl NO_REGEX=YesPlease '')
|
||||
$(usex iconv '' NO_ICONV=YesPlease)
|
||||
$(usex nls '' NO_GETTEXT=YesPlease)
|
||||
$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
|
||||
$(usex perforce '' NO_PYTHON=YesPlease)
|
||||
$(usex subversion '' NO_SVN_TESTS=YesPlease)
|
||||
$(usex threads '' NO_PTHREADS=YesPlease)
|
||||
$(usex tk '' NO_TCLTK=YesPlease)
|
||||
)
|
||||
|
||||
if use blksha1 ; then
|
||||
myopts+=( BLK_SHA1=YesPlease )
|
||||
elif use ppcsha1 ; then
|
||||
myopts+=( PPC_SHA1=YesPlease )
|
||||
fi
|
||||
|
||||
if use curl ; then
|
||||
use webdav || myopts+=( NO_EXPAT=YesPlease )
|
||||
else
|
||||
myopts+=( NO_CURL=YesPlease )
|
||||
fi
|
||||
|
||||
# broken assumptions, because of static build system ...
|
||||
myopts+=(
|
||||
NO_FINK=YesPlease
|
||||
NO_DARWIN_PORTS=YesPlease
|
||||
INSTALL=install
|
||||
TAR=tar
|
||||
SHELL_PATH="${EPREFIX}/bin/sh"
|
||||
SANE_TOOL_PATH=
|
||||
OLD_ICONV=
|
||||
NO_EXTERNAL_GREP=
|
||||
)
|
||||
|
||||
# can't define this to null, since the entire makefile depends on it
|
||||
sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
|
||||
|
||||
if use pcre; then
|
||||
myopts+=( USE_LIBPCRE2=YesPlease )
|
||||
extlibs+=( -lpcre2-8 )
|
||||
fi
|
||||
if [[ ${CHOST} == *-solaris* ]]; then
|
||||
myopts+=(
|
||||
NEEDS_LIBICONV=YesPlease
|
||||
HAVE_CLOCK_MONOTONIC=1
|
||||
)
|
||||
if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then
|
||||
myopts+=( HAVE_GETDELIM=1 )
|
||||
fi
|
||||
fi
|
||||
|
||||
if has_version '>=app-text/asciidoc-8.0' ; then
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} != *9999 ]] ; then
|
||||
unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
|
||||
cd "${S}" || die
|
||||
unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
if use doc ; then
|
||||
pushd "${S}"/Documentation &>/dev/null || die
|
||||
unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
else
|
||||
git-r3_src_unpack
|
||||
#cp "${FILESDIR}"/GIT-VERSION-GEN .
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# add experimental patches to improve mediawiki support
|
||||
# see patches for origin
|
||||
if use mediawiki-experimental ; then
|
||||
PATCHES+=(
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
|
||||
"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
|
||||
)
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
if use prefix ; then
|
||||
# bug #757309
|
||||
eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
|
||||
fi
|
||||
|
||||
sed -i \
|
||||
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
|
||||
-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
|
||||
-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
|
||||
-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
|
||||
-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
|
||||
Makefile || die
|
||||
|
||||
# Fix docbook2texi command
|
||||
sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
|
||||
Documentation/Makefile || die
|
||||
}
|
||||
|
||||
git_emake() {
|
||||
# bug #320647: PYTHON_PATH
|
||||
local PYTHON_PATH=""
|
||||
use perforce && PYTHON_PATH="${PYTHON}"
|
||||
emake ${MY_MAKEOPTS} \
|
||||
prefix="${EPREFIX}"/usr \
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
OPTCFLAGS="${CFLAGS}" \
|
||||
OPTLDFLAGS="${LDFLAGS}" \
|
||||
PERL_PATH="${EPREFIX}/usr/bin/perl" \
|
||||
PERL_MM_OPT="" \
|
||||
PYTHON_PATH="${PYTHON_PATH}" \
|
||||
V=1 \
|
||||
"$@"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
exportmakeopts
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
git_emake || die "emake failed"
|
||||
|
||||
if use emacs ; then
|
||||
elisp-compile contrib/emacs/git{,-blame}.el
|
||||
fi
|
||||
|
||||
if use perl && use cgi ; then
|
||||
git_emake gitweb || die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
pushd Documentation &>/dev/null || die
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
git_emake man || die "emake man failed"
|
||||
if use doc ; then
|
||||
git_emake info html || die "emake info html failed"
|
||||
fi
|
||||
else
|
||||
if use doc ; then
|
||||
git_emake info || die "emake info html failed"
|
||||
fi
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use gnome-keyring ; then
|
||||
pushd contrib/credential/libsecret &>/dev/null || die
|
||||
git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake git-subtree || die
|
||||
# git-subtree.1 requires the full USE=doc dependency stack
|
||||
use doc && git_emake git-subtree.html git-subtree.1
|
||||
popd &>/dev/null || die
|
||||
|
||||
pushd contrib/diff-highlight &>/dev/null || die
|
||||
git_emake || die
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake || die
|
||||
popd &>/dev/null || die
|
||||
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
# Depending on the tarball and manual rebuild of the documentation, the
|
||||
# manpages may exist in either OR both of these directories.
|
||||
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
|
||||
find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
|
||||
dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
|
||||
use doc && dodir /usr/share/doc/${PF}/html
|
||||
local d
|
||||
for d in / /howto/ /technical/ ; do
|
||||
docinto ${d}
|
||||
dodoc Documentation${d}*.txt
|
||||
if use doc ; then
|
||||
docinto ${d}/html
|
||||
dodoc Documentation${d}*.html
|
||||
fi
|
||||
done
|
||||
docinto /
|
||||
# Upstream does not ship this pre-built :-(
|
||||
use doc && doinfo Documentation/{git,gitman}.info
|
||||
|
||||
newbashcomp contrib/completion/git-completion.bash ${PN}
|
||||
bashcomp_alias git gitk
|
||||
# Not really a bash-completion file (bug #477920)
|
||||
# but still needed uncompressed (bug #507480)
|
||||
insinto /usr/share/${PN}
|
||||
doins contrib/completion/git-prompt.sh
|
||||
|
||||
if use emacs ; then
|
||||
elisp-install ${PN} contrib/emacs/git.{el,elc}
|
||||
elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
|
||||
#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
|
||||
# don't add automatically to the load-path, so the sitefile
|
||||
# can do a conditional loading
|
||||
touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
|
||||
elisp-site-file-install "${FILESDIR}"/${SITEFILE}
|
||||
fi
|
||||
|
||||
#dobin contrib/fast-import/git-p4 # Moved upstream
|
||||
#dodoc contrib/fast-import/git-p4.txt # Moved upstream
|
||||
newbin contrib/fast-import/import-tars.perl import-tars
|
||||
exeinto /usr/libexec/git-core/
|
||||
newexe contrib/git-resurrect.sh git-resurrect
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
popd &>/dev/null || die
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake DESTDIR="${D}" install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
# diff-highlight
|
||||
dobin contrib/diff-highlight/diff-highlight
|
||||
newdoc contrib/diff-highlight/README README.diff-highlight
|
||||
|
||||
# git-jump
|
||||
exeinto /usr/libexec/git-core/
|
||||
doexe contrib/git-jump/git-jump
|
||||
newdoc contrib/git-jump/README git-jump.txt
|
||||
|
||||
# git-contacts
|
||||
exeinto /usr/libexec/git-core/
|
||||
doexe contrib/contacts/git-contacts
|
||||
dodoc contrib/contacts/git-contacts.txt
|
||||
|
||||
if use gnome-keyring ; then
|
||||
pushd contrib/credential/libsecret &>/dev/null || die
|
||||
dobin git-credential-libsecret
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
dodir /usr/share/${PN}/contrib
|
||||
# The following are excluded:
|
||||
# completion - installed above
|
||||
# diff-highlight - done above
|
||||
# emacs - installed above
|
||||
# examples - these are stuff that is not used in Git anymore actually
|
||||
# git-jump - done above
|
||||
# gitview - installed above
|
||||
# p4import - excluded because fast-import has a better one
|
||||
# patches - stuff the Git guys made to go upstream to other places
|
||||
# persistent-https - TODO
|
||||
# mw-to-git - TODO
|
||||
# subtree - build seperately
|
||||
# svnimport - use git-svn
|
||||
# thunderbird-patch-inline - fixes thunderbird
|
||||
local contrib_objects=(
|
||||
buildsystems
|
||||
fast-import
|
||||
hg-to-git
|
||||
hooks
|
||||
remotes2config.sh
|
||||
rerere-train.sh
|
||||
stats
|
||||
workdir
|
||||
)
|
||||
local i
|
||||
for i in "${contrib_objects[@]}" ; do
|
||||
cp -rf \
|
||||
"${S}"/contrib/${i} \
|
||||
"${ED}"/usr/share/${PN}/contrib \
|
||||
|| die "Failed contrib ${i}"
|
||||
done
|
||||
|
||||
if use perl && use cgi ; then
|
||||
# We used to install in /usr/share/${PN}/gitweb
|
||||
# but upstream installs in /usr/share/gitweb
|
||||
# so we will install a symlink and use their location for compat with other
|
||||
# distros
|
||||
dosym ../gitweb /usr/share/${PN}/gitweb
|
||||
|
||||
# INSTALL discusses configuration issues, not just installation
|
||||
docinto /
|
||||
newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
|
||||
newdoc "${S}"/gitweb/README README.gitweb
|
||||
|
||||
for d in "${ED}"/usr/lib{,64}/perl5/ ; do
|
||||
if [[ -d "${d}" ]] ; then
|
||||
find "${d}" -name .packlist -delete || die
|
||||
fi
|
||||
done
|
||||
else
|
||||
rm -rf "${ED}"/usr/share/gitweb
|
||||
fi
|
||||
|
||||
if ! use subversion ; then
|
||||
rm -f "${ED}"/usr/libexec/git-core/git-svn \
|
||||
"${ED}"/usr/share/man/man1/git-svn.1*
|
||||
fi
|
||||
|
||||
if use xinetd ; then
|
||||
insinto /etc/xinetd.d
|
||||
newins "${FILESDIR}"/git-daemon.xinetd git-daemon
|
||||
fi
|
||||
|
||||
if ! use prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
|
||||
"git-daemon@.service"
|
||||
systemd_dounit "${FILESDIR}/git-daemon.socket"
|
||||
fi
|
||||
|
||||
perl_delete_localpod
|
||||
|
||||
# Remove disabled linguas
|
||||
# we could remove sources in src_prepare, but install does not
|
||||
# handle missing locale dir well
|
||||
rm_loc() {
|
||||
if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
|
||||
rm -r "${ED}/usr/share/locale/${1}" || die
|
||||
fi
|
||||
}
|
||||
plocale_for_each_disabled_locale rm_loc
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local disabled=()
|
||||
local tests_cvs=(
|
||||
t9200-git-cvsexportcommit.sh
|
||||
t9400-git-cvsserver-server.sh
|
||||
t9401-git-cvsserver-crlf.sh
|
||||
t9402-git-cvsserver-refs.sh
|
||||
t9600-cvsimport.sh
|
||||
t9601-cvsimport-vendor-branch.sh
|
||||
t9602-cvsimport-branches-tags.sh
|
||||
t9603-cvsimport-patchsets.sh
|
||||
t9604-cvsimport-timestamps.sh
|
||||
)
|
||||
local tests_perl=(
|
||||
t3701-add-interactive.sh
|
||||
t5502-quickfetch.sh
|
||||
t5512-ls-remote.sh
|
||||
t5520-pull.sh
|
||||
t7106-reset-unborn-branch.sh
|
||||
t7501-commit.sh
|
||||
)
|
||||
# Bug #225601 - t0004 is not suitable for root perm
|
||||
# Bug #219839 - t1004 is not suitable for root perm
|
||||
# t0001-init.sh - check for init notices EPERM* fails
|
||||
local tests_nonroot=(
|
||||
t0001-init.sh
|
||||
t0004-unwritable.sh
|
||||
t0070-fundamental.sh
|
||||
t1004-read-tree-m-u-wf.sh
|
||||
t3700-add.sh
|
||||
t7300-clean.sh
|
||||
)
|
||||
# t9100 still fails with symlinks in SVN 1.7
|
||||
local test_svn=( t9100-git-svn-basic.sh )
|
||||
|
||||
# Unzip is used only for the testcase code, not by any normal parts of Git.
|
||||
if ! has_version app-arch/unzip ; then
|
||||
einfo "Disabling tar-tree tests"
|
||||
disabled+=( t5000-tar-tree.sh )
|
||||
fi
|
||||
|
||||
local cvs=0
|
||||
use cvs && let cvs=${cvs}+1
|
||||
if [[ ${EUID} -eq 0 ]] ; then
|
||||
if [[ ${cvs} -eq 1 ]] ; then
|
||||
ewarn "Skipping CVS tests because CVS does not work as root!"
|
||||
ewarn "You should retest with FEATURES=userpriv!"
|
||||
disabled+=( ${tests_cvs[@]} )
|
||||
fi
|
||||
einfo "Skipping other tests that require being non-root"
|
||||
disabled+=( ${tests_nonroot[@]} )
|
||||
else
|
||||
[[ ${cvs} -gt 0 ]] && \
|
||||
has_version dev-vcs/cvs && \
|
||||
let cvs=${cvs}+1
|
||||
[[ ${cvs} -gt 1 ]] && \
|
||||
has_version "dev-vcs/cvs[server]" && \
|
||||
let cvs=${cvs}+1
|
||||
if [[ ${cvs} -lt 3 ]] ; then
|
||||
einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
|
||||
disabled+=( ${tests_cvs[@]} )
|
||||
fi
|
||||
fi
|
||||
|
||||
if ! use perl ; then
|
||||
einfo "Disabling tests that need Perl"
|
||||
disabled+=( ${tests_perl[@]} )
|
||||
fi
|
||||
|
||||
einfo "Disabling tests that fail with SVN 1.7"
|
||||
disabled+=( ${test_svn[@]} )
|
||||
|
||||
# Reset all previously disabled tests
|
||||
pushd t &>/dev/null || die
|
||||
local i
|
||||
for i in *.sh.DISABLED ; do
|
||||
[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
|
||||
done
|
||||
einfo "Disabled tests:"
|
||||
for i in ${disabled[@]} ; do
|
||||
if [[ -f "${i}" ]] ; then
|
||||
mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
|
||||
fi
|
||||
done
|
||||
|
||||
# Avoid the test system removing the results because we want them ourselves
|
||||
sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
|
||||
|
||||
# Clean old results first, must always run
|
||||
nonfatal git_emake clean
|
||||
popd &>/dev/null || die
|
||||
|
||||
# Now run the tests, keep going if we hit an error, and don't terminate on
|
||||
# failure
|
||||
local rc
|
||||
einfo "Start test run"
|
||||
#MAKEOPTS=-j1
|
||||
nonfatal git_emake --keep-going test
|
||||
rc=$?
|
||||
|
||||
# Display nice results, now print the results
|
||||
pushd t &>/dev/null || die
|
||||
nonfatal git_emake aggregate-results
|
||||
|
||||
# And bail if there was a problem
|
||||
[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
|
||||
}
|
||||
|
||||
showpkgdeps() {
|
||||
local pkg=$1
|
||||
shift
|
||||
elog " $(printf "%-17s:" ${pkg}) ${@}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use emacs && elisp-site-regen
|
||||
elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
|
||||
elog "completion."
|
||||
elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
|
||||
elog "Note that the prompt bash code is now in that separate script"
|
||||
elog "These additional scripts need some dependencies:"
|
||||
echo
|
||||
showpkgdeps git-quiltimport "dev-util/quilt"
|
||||
showpkgdeps git-instaweb \
|
||||
"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
|
||||
echo
|
||||
use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
use emacs && elisp-site-regen
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
@ -46,12 +46,12 @@ if [[ ${PV} != *9999 ]]; then
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
DEPEND="
|
||||
@ -99,6 +99,7 @@ RDEPEND="${DEPEND}
|
||||
)
|
||||
)
|
||||
perforce? ( ${PYTHON_DEPS} )
|
||||
selinux? ( sec-policy/selinux-git )
|
||||
"
|
||||
|
||||
# This is how info docs are created with Git:
|
||||
@ -141,7 +142,7 @@ RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
"${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch
|
||||
"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
|
||||
@ -222,13 +223,6 @@ exportmakeopts() {
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
# Bug 290465:
|
||||
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
|
||||
if [[ "${CHOST}" == *-uclibc* ]] ; then
|
||||
myopts+=( NO_NSEC=YesPlease )
|
||||
use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
@ -291,7 +285,6 @@ git_emake() {
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
DESTDIR="${D}" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
@ -319,7 +312,7 @@ src_compile() {
|
||||
git_emake gitweb || die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
@ -364,9 +357,9 @@ src_compile() {
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake install || die "make install failed"
|
||||
git_emake DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
@ -414,10 +407,10 @@ src_install() {
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake install || die "Failed to emake install for git-subtree"
|
||||
git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
@ -425,7 +418,7 @@ src_install() {
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake install
|
||||
git_emake DESTDIR="${D}" install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
@ -514,7 +507,7 @@ src_install() {
|
||||
fi
|
||||
|
||||
if ! use prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
|
||||
newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
|
||||
"git-daemon@.service"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
@ -46,12 +46,12 @@ if [[ ${PV} != *9999 ]]; then
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
DEPEND="
|
||||
@ -99,6 +99,7 @@ RDEPEND="${DEPEND}
|
||||
)
|
||||
)
|
||||
perforce? ( ${PYTHON_DEPS} )
|
||||
selinux? ( sec-policy/selinux-git )
|
||||
"
|
||||
|
||||
# This is how info docs are created with Git:
|
||||
@ -141,7 +142,7 @@ RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
"${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch
|
||||
"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
|
||||
@ -222,13 +223,6 @@ exportmakeopts() {
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
# Bug 290465:
|
||||
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
|
||||
if [[ "${CHOST}" == *-uclibc* ]] ; then
|
||||
myopts+=( NO_NSEC=YesPlease )
|
||||
use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
@ -291,7 +285,6 @@ git_emake() {
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
DESTDIR="${D}" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
@ -319,7 +312,7 @@ src_compile() {
|
||||
git_emake gitweb || die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
@ -364,9 +357,9 @@ src_compile() {
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake install || die "make install failed"
|
||||
git_emake DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
@ -414,10 +407,10 @@ src_install() {
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake install || die "Failed to emake install for git-subtree"
|
||||
git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
@ -425,7 +418,7 @@ src_install() {
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake install
|
||||
git_emake DESTDIR="${D}" install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
@ -514,7 +507,7 @@ src_install() {
|
||||
fi
|
||||
|
||||
if ! use prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
|
||||
newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
|
||||
"git-daemon@.service"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
@ -46,12 +46,12 @@ if [[ ${PV} != *9999 ]]; then
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
DEPEND="
|
||||
@ -99,6 +99,7 @@ RDEPEND="${DEPEND}
|
||||
)
|
||||
)
|
||||
perforce? ( ${PYTHON_DEPS} )
|
||||
selinux? ( sec-policy/selinux-git )
|
||||
"
|
||||
|
||||
# This is how info docs are created with Git:
|
||||
@ -141,7 +142,7 @@ RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
"${FILESDIR}"/git-2.31.0_rc0-optional-cvs.patch
|
||||
"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
|
||||
@ -222,13 +223,6 @@ exportmakeopts() {
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
# Bug 290465:
|
||||
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
|
||||
if [[ "${CHOST}" == *-uclibc* ]] ; then
|
||||
myopts+=( NO_NSEC=YesPlease )
|
||||
use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
@ -291,7 +285,6 @@ git_emake() {
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
DESTDIR="${D}" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
@ -319,7 +312,7 @@ src_compile() {
|
||||
git_emake gitweb || die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
@ -364,9 +357,9 @@ src_compile() {
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake install || die "make install failed"
|
||||
git_emake DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
@ -414,10 +407,10 @@ src_install() {
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake install || die "Failed to emake install for git-subtree"
|
||||
git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
@ -425,7 +418,7 @@ src_install() {
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake install
|
||||
git_emake DESTDIR="${D}" install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
@ -514,7 +507,7 @@ src_install() {
|
||||
fi
|
||||
|
||||
if ! use prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
|
||||
newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
|
||||
"git-daemon@.service"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
GENTOO_DEPEND_ON_PERL=no
|
||||
|
||||
@ -46,12 +46,12 @@ if [[ ${PV} != *9999 ]]; then
|
||||
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
|
||||
)"
|
||||
[[ "${PV}" == *_rc* ]] || \
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
|
||||
IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
DEPEND="
|
||||
@ -99,6 +99,7 @@ RDEPEND="${DEPEND}
|
||||
)
|
||||
)
|
||||
perforce? ( ${PYTHON_DEPS} )
|
||||
selinux? ( sec-policy/selinux-git )
|
||||
"
|
||||
|
||||
# This is how info docs are created with Git:
|
||||
@ -141,7 +142,7 @@ RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
# bug #350330 - automagic CVS when we don't want it is bad.
|
||||
"${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
|
||||
"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
|
||||
@ -222,13 +223,6 @@ exportmakeopts() {
|
||||
myopts+=( ASCIIDOC8=YesPlease )
|
||||
fi
|
||||
|
||||
# Bug 290465:
|
||||
# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
|
||||
if [[ "${CHOST}" == *-uclibc* ]] ; then
|
||||
myopts+=( NO_NSEC=YesPlease )
|
||||
use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
|
||||
fi
|
||||
|
||||
export MY_MAKEOPTS="${myopts[@]}"
|
||||
export EXTLIBS="${extlibs[@]}"
|
||||
}
|
||||
@ -291,7 +285,6 @@ git_emake() {
|
||||
htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
|
||||
perllibdir="$(use perl && perl_get_raw_vendorlib)" \
|
||||
sysconfdir="${EPREFIX}"/etc \
|
||||
DESTDIR="${D}" \
|
||||
GIT_TEST_OPTS="--no-color" \
|
||||
OPTAR="$(tc-getAR)" \
|
||||
OPTCC="$(tc-getCC)" \
|
||||
@ -319,7 +312,7 @@ src_compile() {
|
||||
git_emake gitweb || die "emake gitweb (cgi) failed"
|
||||
fi
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
pushd contrib/credential/osxkeychain &>/dev/null || die
|
||||
git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
|
||||
|| die "emake credential-osxkeychain"
|
||||
@ -364,9 +357,9 @@ src_compile() {
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake install || die "make install failed"
|
||||
git_emake DESTDIR="${D}" install || die "make install failed"
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]]; then
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
fi
|
||||
|
||||
@ -414,10 +407,10 @@ src_install() {
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake install || die "Failed to emake install for git-subtree"
|
||||
git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
dodoc git-subtree.txt
|
||||
@ -425,7 +418,7 @@ src_install() {
|
||||
|
||||
if use mediawiki ; then
|
||||
pushd contrib/mw-to-git &>/dev/null || die
|
||||
git_emake install
|
||||
git_emake DESTDIR="${D}" install
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
@ -514,7 +507,7 @@ src_install() {
|
||||
fi
|
||||
|
||||
if ! use prefix ; then
|
||||
newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
|
||||
newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
|
||||
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
|
||||
systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
|
||||
"git-daemon@.service"
|
||||
|
||||
@ -31,7 +31,6 @@
|
||||
<flag name="highlight">GitWeb support for app-text/highlight</flag>
|
||||
<flag name="mediawiki">Support pulling and pushing from MediaWiki</flag>
|
||||
<flag name="mediawiki-experimental">Add experimental patches for improved MediaWiki support</flag>
|
||||
<flag name="pcre-jit">Enable JIT for pcre</flag>
|
||||
<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
|
||||
<flag name="ppcsha1">Make use of a bundled routine that is optimized for the PPC arch</flag>
|
||||
<flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg> support</flag>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user