diff options
Diffstat (limited to 'dev-vcs')
-rw-r--r-- | dev-vcs/Manifest.gz | bin | 13635 -> 13641 bytes | |||
-rw-r--r-- | dev-vcs/git/Manifest | 27 | ||||
-rw-r--r-- | dev-vcs/git/files/git-2.21.0-quiet-submodules.patch | 61 | ||||
-rw-r--r-- | dev-vcs/git/files/git-2.23.0-avoid_empty_remote_line.patch | 145 | ||||
-rw-r--r-- | dev-vcs/git/git-2.21.0-r2.ebuild | 716 | ||||
-rw-r--r-- | dev-vcs/git/git-2.21.0.ebuild | 2 | ||||
-rw-r--r-- | dev-vcs/git/git-2.22.1.ebuild | 721 | ||||
-rw-r--r-- | dev-vcs/git/git-2.23.0-r1.ebuild (renamed from dev-vcs/git/git-2.23.0.ebuild) | 4 | ||||
-rw-r--r-- | dev-vcs/git/git-2.24.0_rc2.ebuild (renamed from dev-vcs/git/git-2.22.0.ebuild) | 39 | ||||
-rw-r--r-- | dev-vcs/git/git-9999-r1.ebuild | 39 | ||||
-rw-r--r-- | dev-vcs/git/git-9999-r2.ebuild | 39 | ||||
-rw-r--r-- | dev-vcs/git/git-9999-r3.ebuild | 39 | ||||
-rw-r--r-- | dev-vcs/git/git-9999.ebuild | 41 | ||||
-rw-r--r-- | dev-vcs/hg-git/Manifest | 2 | ||||
-rw-r--r-- | dev-vcs/hg-git/hg-git-0.8.13_pre20190808.ebuild | 31 | ||||
-rw-r--r-- | dev-vcs/stgit/Manifest | 2 | ||||
-rw-r--r-- | dev-vcs/stgit/stgit-0.19.ebuild | 2 | ||||
-rw-r--r-- | dev-vcs/subversion/Manifest | 2 | ||||
-rw-r--r-- | dev-vcs/subversion/subversion-1.13.0.ebuild | 531 |
19 files changed, 844 insertions, 1599 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz Binary files differindex a97afca0e344..4dcf7a8fceac 100644 --- a/dev-vcs/Manifest.gz +++ b/dev-vcs/Manifest.gz diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 80163f57eaa9..e4f85614c1a6 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -2,8 +2,8 @@ AUX 50git-gentoo.el 472 BLAKE2B b2b7c2c105d2ce3e066b3b617d095c402032549d92fff4a1 AUX git-2.18.0_rc1-optional-cvs.patch 14471 BLAKE2B 0fcd6693bdcb7ef1fb843a19eb3802edb96e0f4820cc56338de6e0042a768d14a72eb4c02dd680bf4a9e536935529dcb5b1f25bd6f7980e46ca0ea0059f2d643 SHA512 d5cafb3c52b0cade0550492b4d52d96a912f9d721eb02677390b6edc7154f171c84b9b225baf42fa328b3ee0a7feaae75b4a4426b73db3deebe878ce62adf9d6 AUX git-2.2.0-svn-fe-linking.patch 418 BLAKE2B 5030e0dfd7fef0157fd4532aa14bfdb4f2ed09a2e35ca960e0133d8e84ea07a472ddc111ea9c0033158be6e90283b76c9880c08cb7af7de53757dbf9b5d79a64 SHA512 ac312e7da4c548073d4dfa5d9bb6823ed48ea70a30d7993da190cfc4cc4b17124e15326748d79e59ca0772675619b29221a57c5af45b7b6c7196dae218772ecd AUX git-2.21.0-quiet-submodules-testcase.patch 1233 BLAKE2B 45a9660d584e0bf928df781c77f4e5fea1f5f6f42a0a5c9ff74d08909790dc961abe4896016128a01992c1ceeb61236d4d11c9ccfdd4b8257ecd89829aaac435 SHA512 1fd1a3af27e2945d25cb24a60678c05aaa32edf312d2750d7aafa26bfcce1877d88e49f649c3ac572f75e8631fc979f82d75b3e8abbc02d1750421d4cda41321 -AUX git-2.21.0-quiet-submodules.patch 2314 BLAKE2B d9a80ae1a05d63c146115a6dddaed9c57646bcfe4a460727f1edef688c1411cfc1f224e4ea13b7ceff273d473f0ef3bf5681d559a4a58f80668be0c24387ce3a SHA512 b58d911ff51abfd40cbb350130020aca05b1ad68bd4bfa1df10c4b086f95a956235ffd22f0dac88d16240c70854ddc0fc86520fa6c59720d3ea635837bae1472 AUX git-2.22.0_rc0-optional-cvs.patch 14182 BLAKE2B ec4273646e5b45dc8877e0e41e03be4a2e6f1591f90834e5521f4322abcd9ebd75021ada8992fe90a3572dce7b87b4c8cfef772367cab8a49df67369a7d2638d SHA512 ce155bf2b1515ba59f4186265d679acb0975b4e3e658de80e03776308d00e508b0776af3a946ebc19c963e455206ba54b68f60d94e491570966581db3d94d28e +AUX git-2.23.0-avoid_empty_remote_line.patch 5920 BLAKE2B db86a9e37492fd634509b4bf69ee39ccb2e9035084e92f108f2a9248ae2ddbd8c00530007967968a8ad28d82ce3817e4857b99180de0fb5db50a2a3394b0c7a0 SHA512 b75e1e9fde4dc0c1a5fae1003d0cc7566e615eb5b2363eefeaa59b99a40f0be86429e5d89f7d52b20e7a69e161a921b6e1f33e0fed619d2f5853b8bdd7cb566c AUX git-2.7.0-mediawiki-500pages.patch 1317 BLAKE2B fa90ac6f90b7b5b948dc1f9b8f300419df7b2b957aad9c15121f0b8df873d854cd74def68cd80788f085635cbbef65502b40e3eea2b3d8fb35fb02b4a4a1afa5 SHA512 efe580f288c6fdb6d55b742a3e4335ac32ed96cb12c10b959a5f283e505ab0aeed039d0d19d9dbf148a07ac6c7aec075ecea0c0be68456fdbe23dcad77ca01be AUX git-2.7.0-mediawiki-namespaces.patch 3188 BLAKE2B a5949c317f01244d7344bd0f5088e4bf77f723bf32734b85aa7d0abad274999733b7b33568aab5009b07fccc0f3f16ede633965fe351eb552d018a7eadfd9e83 SHA512 f1597fcb8e771917561d92bf428825e28477ed792be7494e34754434c73422dc52fdf99d981656b291f7eb91a199abe54038ae87e9b5229c9a382a4ea88e9d4f AUX git-2.7.0-mediawiki-subpages.patch 2091 BLAKE2B 01c6735edd80c3f264b8fe41edd5acb9fb375f0cd439ea4719932d0f0ebb8e00e3acea8e4de465bd75d35cce096dc720e3b4edabd13e80d1374af9806158e40f SHA512 e294c0d4588499961632bcc6ea20474984c4bcc7a804ff3cd9d12584cecad3c36f5772c21cf7a884b517370eb7d87542f7bdc3b2c5482c18dbc623abe5e7c73e @@ -14,27 +14,22 @@ AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42 AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9 DIST git-2.19.2.tar.xz 5235608 BLAKE2B ece292b8cf41deafc63c00e6176b0de39936f7d840d776192f32c1e293abc06c39119d13ed947d3de6a212fa6973bedb288c06f8bfcfc8144e563d5af40e45da SHA512 1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96 DIST git-2.21.0.tar.xz 5491296 BLAKE2B c5e66f4d4045f99bb4306e8f096ae9299908383df78bdf2a954cd415f4778eb59ea0ee7d501689313617de7dc1d2ee4ae15ab70dee564add5de877109073ddff SHA512 83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973 -DIST git-2.22.0.tar.xz 5609772 BLAKE2B 3fd84987eba4873d7eca56cc2d28e15cc22e5c382f47e831f12c06b05c1a971d5713e7096b609ec5321e5ae4c63c78ebc7747f7e0948d12bf1ac19a911405d6d SHA512 75b3dcac36f80281effcd099944de34050a35f3599ce42f86ce60455b6c952039fb0f6438d296e0cc9c0651d4a17f467780dc475669227d3c98ddefe91723d42 -DIST git-2.22.1.tar.xz 5616124 BLAKE2B 2856bf5dc446921eab0fb92db6c6505de870d75f2baf7e95cf5796acba3198db789f26bc617da2a1f736fa3a22ee91b77524213ba880f959ea71c449b604f7c2 SHA512 8fa0900e1a583cdacbafa2e0d00a4cb50ad225c11227f6a811b721e56677b62b1354995e2b7117a66b1e89dbcb2cddc1eee7ef1e57723d9615a063a318095f14 DIST git-2.23.0.tar.xz 5707148 BLAKE2B a57642cfc297615c9510d9d746d83fc4174195bfefe22fc77098419e424d4f6e383896ad5509370c8cc35b2f4b531dcf5c5a4e9c2d2e99041ad15a40399ec4d2 SHA512 c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671 +DIST git-2.24.0.rc2.tar.xz 5753364 BLAKE2B 8b9ce86c6625eb800e90149b8c8d4f75eb65326cb617748f99ace42eebc9571e741c3cc00a855ca05187f61cbbc3b884ca12379e82f1c1c831a7245571a031e8 SHA512 fd6776e1e045feeb461f014ee6cd42934cc10aec33eb12b0df4b1093aee3d83f1efd6f36b859f45c7136f4179e2559dba3f9da11fe33d5b4770d4a2d25a317b8 DIST git-htmldocs-2.19.2.tar.xz 1223848 BLAKE2B 6f30192cb101988fdfcce3bb79c684c6d1ac08cdc929caa049102fba10277fa8cc908904fe7472e40d60707c1b23145d95c441c1401c8697c37a81456d79aab8 SHA512 830e780beea10bde750d09a335fd9986c5ffbf47a724cbbeed5a1a2c94bc81d9c9223e415c5888faf81ab6404e460565434988f6635312039b88282a46014634 DIST git-htmldocs-2.21.0.tar.xz 1234956 BLAKE2B d8ef32acbad7eeb8758f711e09c380dbf3ca72526067b3a86ed0865e37351c4fac1f0c7e845e7b0c27a1d955c64622f10c999389446b53191acdc05a44647847 SHA512 4537b3f67d03050e5daefaa6f274d3acdf6e116dc8c7f76566b33100e76a445c3e3894b5ff63b5ddb024e1c691a3bf08acea42dbec681da1b0f1de2e5736c9c4 -DIST git-htmldocs-2.22.0.tar.xz 1262136 BLAKE2B 0fea02449e73a9e1b125895f0e319704ccc5949cd68820cadb1a71fc06d182c3ce0629149c9d7f19bdab782fd8c0e1ac8661fc774253caf897fc8fd58e497d9e SHA512 2feab5d3bc70914d7980c8a22f950a9604cbaace2e867119776715f1ba7bdb3c742fbd9aaa827210b234e6381d98611e02dec4e50db4cae4e20bb72116afecb1 -DIST git-htmldocs-2.22.1.tar.xz 1264164 BLAKE2B 88722e4438c75bf875477caaa40060955f52ddadaa13f506fe975eaa92748fc44e2ba1ccfe15d88843013e931975176eb6b7433efe4d71bbbc3cca2ac6afd037 SHA512 b78d5a59df2ec4beff3915b15c0c6af0e54dbf457f0e29c8d92c49880259f03a91b12b40787a1d0b7c9751f42e48a9a3fd1258818121d5d0f45b1cc8d45b3715 DIST git-htmldocs-2.23.0.tar.xz 1294240 BLAKE2B 7420eb836d582448a996d8302d1e4873316baadd3a1baae555935443028af6a9c9e1fa629d5e0667901b8c63cce19bbf5e46c5fcb09b50382751e6b2cbc3d514 SHA512 165c8989ed9c0c09125e2e99beeddd1f2bb4d00ecae4aa58bcbfb1f1a8cd5a6ad646035e984471484fd1e943437d5d42d917e8c32b1207c590a1fc7c9bebc2dc +DIST git-htmldocs-2.24.0.rc2.tar.xz 1306552 BLAKE2B e4e211693daeb69ec06965a64fa1260363e9821f3ce1a564f62e3da892368973338ba05ddd60d63268dd551c2c9e918d29a7024b10a72d4ba49ba99d0a16b76b SHA512 a420b103b32d2e5c507cf1a2398e109e8186fdeb0cc598e33df24525b34f672d9ab06811ca83bfdd780934310b19ac9f5c3798cb7835a0a9e18e168fcb2533d4 DIST git-manpages-2.19.2.tar.xz 432200 BLAKE2B 92b4c87c40e20133c4b6d9b7f3d56952556470855543a329ea0fb7a91382396376755656ded029d68df8291b0ffecc3e6b2b4c6f71cb8694d44c5f02da7357f8 SHA512 329ea9a6de4a5352c57d2ea3df0cf6caf9dcf03728416a3bca5a5ebc5dc133abe1faffd5e5b5ae11cc91412baff93df83ff684f3626bbac0770ca94bc79d2cb1 DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d438d163255bce845eaf75e08a3eec49060c314e73d24c1c015101868d9149e9b0cd1c2e8cb3ce2245b8acae5701fe8ba SHA512 61e01cd312dbade8aac0144e32edc5eea2708b274273c207889a291cea18d131c9c2d83cc405ba8a955d387fd1e6dd74b7bdae4003f2062501073a0844122d30 -DIST git-manpages-2.22.0.tar.xz 443320 BLAKE2B 900efc3c90ab949bea4655a82febd01a8ec9dfdd39cff3d9cffb5912925bdc60567c3f8cc3fe63a42eb4c390d795b02f30608f672481e41a2aaae8ce9edc109a SHA512 ed9d2ba78fe5081c80a1ffb911ce0e0d883a76b3b4b3d1469c46932e710d1565cf223f74f1402fe94430e3eda514406829b2c422f31ced63ff5126004fdb36d9 -DIST git-manpages-2.22.1.tar.xz 443912 BLAKE2B 794f2edaf2cd4436b9dd19005dfe6e8b92d994fee49ac0b38ccc12cbc9fc0a7bc95c1d6fe6882a91f72ceb3cb1729c0a6d7abcd1f5d00f2e7ab36af6c604718e SHA512 e7d2c9c868fc57271e9c70771a0da527597428a55647d0779fce818988c8f74fc61dba0804cb789e1200c9147c7853bd7f89c241e5c477fd30a119d0104905d6 DIST git-manpages-2.23.0.tar.xz 448272 BLAKE2B 34dcb535caf54bfa9ea8e9f2d8104fe74e4c38398d685a712735c0199dab59cfeac16f863c6285a1122139cb2be99cfad4ba7c3f71e88603284815536172ccbc SHA512 f4316f28d8f462804cee3e6f5d19a1426087dbeb0e6141148d9b021562c86723cbd4f96d30cc650b2b41230e097c3a1f574055b8b7e5025cbb90089484bf9e96 +DIST git-manpages-2.24.0.rc2.tar.xz 453672 BLAKE2B 6b7cc87e733b28e01cf242eb64fd7b99d4f0e8fa38818a766cb6546f46c068850318411f7ef6247108ca8ebbf2c384bf1917ac7ae0ca8ddf737fc7cc3a295d62 SHA512 2203993366710dbc4d710e748c8904b92595abdd7584081dfe355a479970113bc122a1cb571142fb373cd21cfe1ffb1fb7cf1453e81f736d85f27bfad2be05c3 EBUILD git-2.19.2.ebuild 19002 BLAKE2B d76be3a033677c324b02bf8fe0859fef8c06c15060bcd74a54a136e34eed8e1ca9673cd78bc2b42cebea81ec5d74306d839fd818f35af29dd062cdbae6e41b87 SHA512 762db8ccb376c6e43f071e5f53d5735895f3a2a127fcca9130f52d421e25cd160b0fedc7bb7b682be8f4eb0c63f80698b0e0d20f6c29b2ba648d380bba85f1fc -EBUILD git-2.21.0-r2.ebuild 19240 BLAKE2B 33e30445a29ea95aebea04399033a0f5b18d0022375ec532411849382ba1d7531d4baeeb64429871fb925529f6767b12402e394ea107928b24c2a4bf570cfa69 SHA512 be5a895c55b2de4940dfbd775b902002d68a20eb5d01fd3365c5c08ece5810705a87fa0c40bbd220ddaede7abbedd93e3eff032417a0d5e51199bcc203b7c542 -EBUILD git-2.21.0.ebuild 19059 BLAKE2B 7ab41eb206c13023966290fdef9e09f1c73518df1dc3eba84951be03f70f83fb9123b0446ea250139a3d22d5579ef23c692e354d0cc12fd97591721c7324a515 SHA512 f7a9e3440caac7f0acf8833f6913508d861c64ec85c5e82f79de241afe15cecca755fb10520739e7c9295f6d3492d146af5186b1f0ea9598ca202b79f10617cd -EBUILD git-2.22.0.ebuild 19488 BLAKE2B 78504dd30b0e463539fa4a959c27b77d7f310676c854be7bdc731b7d417e2cf0bac4c6bae9bab000e8a3a2f5b50cc819a843e0aca888e7ddd524e7306081c6bc SHA512 974c4916678b9eddafbe4de72fba527d152f336c63bb7d8ad4944ab22a1d5ff4f3401e09dc96eeac6a454fb1020646093bb52f2be134069984cc1cd93284cee9 -EBUILD git-2.22.1.ebuild 19488 BLAKE2B 78504dd30b0e463539fa4a959c27b77d7f310676c854be7bdc731b7d417e2cf0bac4c6bae9bab000e8a3a2f5b50cc819a843e0aca888e7ddd524e7306081c6bc SHA512 974c4916678b9eddafbe4de72fba527d152f336c63bb7d8ad4944ab22a1d5ff4f3401e09dc96eeac6a454fb1020646093bb52f2be134069984cc1cd93284cee9 -EBUILD git-2.23.0.ebuild 19488 BLAKE2B 78504dd30b0e463539fa4a959c27b77d7f310676c854be7bdc731b7d417e2cf0bac4c6bae9bab000e8a3a2f5b50cc819a843e0aca888e7ddd524e7306081c6bc SHA512 974c4916678b9eddafbe4de72fba527d152f336c63bb7d8ad4944ab22a1d5ff4f3401e09dc96eeac6a454fb1020646093bb52f2be134069984cc1cd93284cee9 -EBUILD git-9999-r1.ebuild 19488 BLAKE2B 78504dd30b0e463539fa4a959c27b77d7f310676c854be7bdc731b7d417e2cf0bac4c6bae9bab000e8a3a2f5b50cc819a843e0aca888e7ddd524e7306081c6bc SHA512 974c4916678b9eddafbe4de72fba527d152f336c63bb7d8ad4944ab22a1d5ff4f3401e09dc96eeac6a454fb1020646093bb52f2be134069984cc1cd93284cee9 -EBUILD git-9999-r2.ebuild 19488 BLAKE2B 78504dd30b0e463539fa4a959c27b77d7f310676c854be7bdc731b7d417e2cf0bac4c6bae9bab000e8a3a2f5b50cc819a843e0aca888e7ddd524e7306081c6bc SHA512 974c4916678b9eddafbe4de72fba527d152f336c63bb7d8ad4944ab22a1d5ff4f3401e09dc96eeac6a454fb1020646093bb52f2be134069984cc1cd93284cee9 -EBUILD git-9999-r3.ebuild 19488 BLAKE2B 78504dd30b0e463539fa4a959c27b77d7f310676c854be7bdc731b7d417e2cf0bac4c6bae9bab000e8a3a2f5b50cc819a843e0aca888e7ddd524e7306081c6bc SHA512 974c4916678b9eddafbe4de72fba527d152f336c63bb7d8ad4944ab22a1d5ff4f3401e09dc96eeac6a454fb1020646093bb52f2be134069984cc1cd93284cee9 -EBUILD git-9999.ebuild 19488 BLAKE2B 833324d84085b313e664f19e50b3bdc8f1628a7761870669227fd4641821440868a6ce457e4dd001250bde8c525034267d51504f833b8963e09516388431221d SHA512 04295be40c6e821e6116973caf506ad75ec01358cd3c27a61f19cdbdf41845e02c79d13fe8fbb6e381e82daf6fad68b52484cbd894eb2e8b2cdb30c2091384d3 +EBUILD git-2.21.0.ebuild 19058 BLAKE2B bfe746207879f2d94ebd25659e893f8f7acacd43490a6bc01c87d433f0940c6356dbbfdcdbcdb2ca165eeed366b36a5dc469b5bd7a40267f596d0d0814252ecd SHA512 3e44530c1674c29bf4956bbabdbb8cb64ec7ed4a7bff045d4b43827c38c4ecd8188f33ec129b6b7e5cbd94f7bcf2606b6722efdd26d4ae9478488a1f98cf78dd +EBUILD git-2.23.0-r1.ebuild 19537 BLAKE2B a7a28fb2003239515da87ac609397c5bbf382664b174cef946869e1398bbbf68c913a447994f3df3211e066a424db1c424c973be897bcdef58e745e19ff4127f SHA512 5c2988de7a169026dacce82aa27532ffa7e9b6a2d7a3da48523ac0eb139ac812073d36778590aabe53d15f3fabae8f65497928ba277e2475223ad59e61df447f +EBUILD git-2.24.0_rc2.ebuild 19524 BLAKE2B 94f7445ee52d235c63e7a4ddf67b092bb98f5f8ad541a50d209c4bdb156ad48a0875e8ca255cf58a193fe227c05d81ed151d1330ecaebf065ca6b3225bac3af7 SHA512 28f9c8cee664c9215d42b1464c082d031ec3a2099882c62590a600a9c47f5fe6a929b4b7f686dac64109988bc57c63ec9573edeb67904a41a333038534d5bf45 +EBUILD git-9999-r1.ebuild 19524 BLAKE2B 94f7445ee52d235c63e7a4ddf67b092bb98f5f8ad541a50d209c4bdb156ad48a0875e8ca255cf58a193fe227c05d81ed151d1330ecaebf065ca6b3225bac3af7 SHA512 28f9c8cee664c9215d42b1464c082d031ec3a2099882c62590a600a9c47f5fe6a929b4b7f686dac64109988bc57c63ec9573edeb67904a41a333038534d5bf45 +EBUILD git-9999-r2.ebuild 19524 BLAKE2B 94f7445ee52d235c63e7a4ddf67b092bb98f5f8ad541a50d209c4bdb156ad48a0875e8ca255cf58a193fe227c05d81ed151d1330ecaebf065ca6b3225bac3af7 SHA512 28f9c8cee664c9215d42b1464c082d031ec3a2099882c62590a600a9c47f5fe6a929b4b7f686dac64109988bc57c63ec9573edeb67904a41a333038534d5bf45 +EBUILD git-9999-r3.ebuild 19524 BLAKE2B 94f7445ee52d235c63e7a4ddf67b092bb98f5f8ad541a50d209c4bdb156ad48a0875e8ca255cf58a193fe227c05d81ed151d1330ecaebf065ca6b3225bac3af7 SHA512 28f9c8cee664c9215d42b1464c082d031ec3a2099882c62590a600a9c47f5fe6a929b4b7f686dac64109988bc57c63ec9573edeb67904a41a333038534d5bf45 +EBUILD git-9999.ebuild 19524 BLAKE2B 94f7445ee52d235c63e7a4ddf67b092bb98f5f8ad541a50d209c4bdb156ad48a0875e8ca255cf58a193fe227c05d81ed151d1330ecaebf065ca6b3225bac3af7 SHA512 28f9c8cee664c9215d42b1464c082d031ec3a2099882c62590a600a9c47f5fe6a929b4b7f686dac64109988bc57c63ec9573edeb67904a41a333038534d5bf45 MISC metadata.xml 2197 BLAKE2B b48502c8c414bcbceb6a917291e79d8b33c3f5d4c0e3e25e5a8c77720bd96b6bee120b177034c76d5ee00692951e71c721df3b8b8219dea13644e3af318fbd3f SHA512 6b39bc6d79605bd0a5ffe03599e6fad7da4e3cf2a8f0896be4c47b9a12be8eccc97849d022b3863626c2606274b6b718e00ce6646394302cc3f2468863a3d274 diff --git a/dev-vcs/git/files/git-2.21.0-quiet-submodules.patch b/dev-vcs/git/files/git-2.21.0-quiet-submodules.patch deleted file mode 100644 index adb0dfd582a1..000000000000 --- a/dev-vcs/git/files/git-2.21.0-quiet-submodules.patch +++ /dev/null @@ -1,61 +0,0 @@ -From git-owner@vger.kernel.org Wed Apr 10 11:18:40 2019 -Date: 10 Apr 2019 18:18:35 +0700 -Message-ID: <20190410111834.GA25638@ash> -From: "Duy Nguyen" <pclouds@gmail.com> -Sender: git-owner@vger.kernel.org -Subject: Re: regression AGAIN in output of git-pull --rebase --recurse-submodules=yes --quiet -References: <robbat2-20180120T054223-685328376Z@orbis-terrarum.net> - <robbat2-20190410T062730-540884809Z@orbis-terrarum.net> -List-ID: <git.vger.kernel.org> - -... - -If you run this with GIT_TRACE=1, you can see that --quiet is passed -to submodule--helper correctly. - -trace: built-in: git submodule--helper foreach --quiet git pull --quiet origin master - -The problem here is the option parser of this command would try to -parse all options, so it considers both --quiet the same thing and are -to tell "submodule--foreach" to be quiet, the second --quiet is not -part of the "git pull" command anymore. - -So the fix would be to pass "--" to stop option parsing. -submodule--helper should not parse options it does not understand -anyway. Something like this should work. - --- 8< -- -diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c -index 6bcc4f1bd7..6394222628 100644 ---- a/builtin/submodule--helper.c -+++ b/builtin/submodule--helper.c -@@ -571,7 +571,7 @@ static int module_foreach(int argc, const char **argv, const char *prefix) - }; - - argc = parse_options(argc, argv, prefix, module_foreach_options, -- git_submodule_helper_usage, PARSE_OPT_KEEP_UNKNOWN); -+ git_submodule_helper_usage, 0); - - if (module_list_compute(0, NULL, prefix, &pathspec, &list) < 0) - return 1; -diff --git a/git-submodule.sh b/git-submodule.sh -index 2c0fb6d723..a967b2890d 100755 ---- a/git-submodule.sh -+++ b/git-submodule.sh -@@ -346,7 +346,7 @@ cmd_foreach() - shift - done - -- git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper foreach ${GIT_QUIET:+--quiet} ${recursive:+--recursive} "$@" -+ git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper foreach ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@" - } - - # --- 8< -- - -I'm a bit reluctant to follow up with a proper patch because I can't -digest the t5572-submodule-pull.sh tests. And we definitely need to -add a test case about --quiet to make sure it won't happen again. --- -Duy - diff --git a/dev-vcs/git/files/git-2.23.0-avoid_empty_remote_line.patch b/dev-vcs/git/files/git-2.23.0-avoid_empty_remote_line.patch new file mode 100644 index 000000000000..f2bc3fd634e0 --- /dev/null +++ b/dev-vcs/git/files/git-2.23.0-avoid_empty_remote_line.patch @@ -0,0 +1,145 @@ +From bbf47568ad7e91ab0962b314c054a2da03232c72 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= <szeder.dev@gmail.com> +Date: Mon, 16 Sep 2019 22:54:11 +0200 +Subject: [PATCH] Revert "progress: use term_clear_line()" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 5b12e3123b (progress: use term_clear_line(), +2019-06-24), because covering up the entire last line while refreshing +the progress line caused unexpected problems during 'git +clone/fetch/push': + + $ git clone ssh://localhost/home/szeder/src/tmp/linux.git/ + Cloning into 'linux'... + remote: + remote: + remote: + remote: Enumerating objects: 999295 + +The length of the progress bar line can shorten when it includes +throughput and the unit changes, or when its length exceeds the width +of the terminal and is broken into two lines. In these cases the +previously displayed longer progress line should be covered up, +because otherwise the leftover characters from the previous progress +line make the output look weird [1]. term_clear_line() makes this +quite simple, as it covers up the entire last line either by using an +ANSI control sequence or by printing a terminal width worth of space +characters, depending on whether the terminal is smart or dumb. + +Unfortunately, when accessing a remote repository via any non-local +protocol the remote 'git receive-pack/upload-pack' processes can't +possibly have any idea about the local terminal (smart of dumb? how +wide?) their progress will end up on. Consequently, they assume the +worst, i.e. standard-width dumb terminal, and print 80 spaces to cover +up the previously displayed progress line. The local 'git +clone/fetch/push' processes then display the remote's progress, +including these coverup spaces, with the 'remote: ' prefix, resulting +in a total line length of 88 characters. If the local terminal is +narrower than that, then the coverup gets line-wrapped, and after that +the CR at the end doesn't return to the beginning of the progress +line, but to the first column of its last line, resulting in those +repeated 'remote: <many-spaces>' lines. + +By reverting 5b12e3123b (progress: use term_clear_line(), +2019-06-24) we won't cover up the entire last line, but go back to +comparing the length of the current progress bar line with the +previous one, and cover up as many characters as needed. + +[1] See commits 545dc345eb (progress: break too long progress bar + lines, 2019-04-12) and 9f1fd84e15 (progress: clear previous + progress update dynamically, 2019-04-12). + +Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> +Signed-off-by: Junio C Hamano <gitster@pobox.com> +--- + progress.c | 29 ++++++++++++++++++----------- + t/t5541-http-push-smart.sh | 6 +++--- + 2 files changed, 21 insertions(+), 14 deletions(-) + +diff --git a/progress.c b/progress.c +index 277db8afa2..0eddf1804d 100644 +--- a/progress.c ++++ b/progress.c +@@ -88,6 +88,7 @@ static void display(struct progress *progress, uint64_t n, const char *done) + const char *tp; + struct strbuf *counters_sb = &progress->counters_sb; + int show_update = 0; ++ int last_count_len = counters_sb->len; + + if (progress->delay && (!progress_update || --progress->delay)) + return; +@@ -115,21 +116,27 @@ static void display(struct progress *progress, uint64_t n, const char *done) + if (show_update) { + if (is_foreground_fd(fileno(stderr)) || done) { + const char *eol = done ? done : "\r"; ++ size_t clear_len = counters_sb->len < last_count_len ? ++ last_count_len - counters_sb->len + 1 : ++ 0; ++ /* The "+ 2" accounts for the ": ". */ ++ size_t progress_line_len = progress->title_len + ++ counters_sb->len + 2; ++ int cols = term_columns(); + +- term_clear_line(); + if (progress->split) { +- fprintf(stderr, " %s%s", counters_sb->buf, +- eol); +- } else if (!done && +- /* The "+ 2" accounts for the ": ". */ +- term_columns() < progress->title_len + +- counters_sb->len + 2) { +- fprintf(stderr, "%s:\n %s%s", +- progress->title, counters_sb->buf, eol); ++ fprintf(stderr, " %s%*s", counters_sb->buf, ++ (int) clear_len, eol); ++ } else if (!done && cols < progress_line_len) { ++ clear_len = progress->title_len + 1 < cols ? ++ cols - progress->title_len - 1 : 0; ++ fprintf(stderr, "%s:%*s\n %s%s", ++ progress->title, (int) clear_len, "", ++ counters_sb->buf, eol); + progress->split = 1; + } else { +- fprintf(stderr, "%s: %s%s", progress->title, +- counters_sb->buf, eol); ++ fprintf(stderr, "%s: %s%*s", progress->title, ++ counters_sb->buf, (int) clear_len, eol); + } + fflush(stderr); + } +diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh +index b86ddb60f2..92bac43257 100755 +--- a/t/t5541-http-push-smart.sh ++++ b/t/t5541-http-push-smart.sh +@@ -262,7 +262,7 @@ test_expect_success TTY 'push shows progress when stderr is a tty' ' + cd "$ROOT_PATH"/test_repo_clone && + test_commit noisy && + test_terminal git push >output 2>&1 && +- test_i18ngrep "Writing objects" output ++ test_i18ngrep "^Writing objects" output + ' + + test_expect_success TTY 'push --quiet silences status and progress' ' +@@ -277,7 +277,7 @@ test_expect_success TTY 'push --no-progress silences progress but not status' ' + test_commit no-progress && + test_terminal git push --no-progress >output 2>&1 && + test_i18ngrep "^To http" output && +- test_i18ngrep ! "Writing objects" output ++ test_i18ngrep ! "^Writing objects" output + ' + + test_expect_success 'push --progress shows progress to non-tty' ' +@@ -285,7 +285,7 @@ test_expect_success 'push --progress shows progress to non-tty' ' + test_commit progress && + git push --progress >output 2>&1 && + test_i18ngrep "^To http" output && +- test_i18ngrep "Writing objects" output ++ test_i18ngrep "^Writing objects" output + ' + + test_expect_success 'http push gives sane defaults to reflog' ' +-- +2.24.0.rc1 + diff --git a/dev-vcs/git/git-2.21.0-r2.ebuild b/dev-vcs/git/git-2.21.0-r2.ebuild deleted file mode 100644 index ce068966a44e..000000000000 --- a/dev-vcs/git/git-2.21.0-r2.ebuild +++ /dev/null @@ -1,716 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" -if [[ ${PV} == *9999 ]]; then - SCM="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: pu - case "${PVR}" in - 9999) EGIT_BRANCH=maint ;; - 9999-r1) EGIT_BRANCH=master ;; - 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=pu ;; - esac -fi - -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER="${MY_PV}" - -DESCRIPTION="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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - gnome-keyring? ( app-crypt/libsecret ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - 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 ) - ) - emacs? ( virtual/emacs ) - iconv? ( virtual/libiconv ) -" - -RDEPEND="${CDEPEND} - 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 -DEPEND="${CDEPEND} - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE="50${PN}-gentoo.el" -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - mediawiki-experimental? ( mediawiki ) - subversion? ( perl ) - webdav? ( curl ) - pcre-jit? ( pcre ) - perforce? ( ${PYTHON_REQUIRED_USE} ) -" - -PATCHES=( - # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch - - "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - # Make submodule output quiet - "${FILESDIR}"/git-2.21.0-quiet-submodules.patch - "${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 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_PTHREAD=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 -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=( -# NO_MMAP=YesPlease -# NO_IPV6=YesPlease -# NO_STRLCPY=YesPlease -# NO_MEMMEM=YesPlease -# NO_MKDTEMP=YesPlease -# NO_MKSTEMPS=YesPlease -# ) -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=( NO_NSEC=YesPlease ) - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=( NO_FNMATCH_CASEFOLD=YesPlease ) - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ - myopts+=( HAVE_GETDELIM=1 ) - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) - - # 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 - git_emake svn-fe.{1,html} \ - || die "emake svn-fe.1 svn-fe.html failed" - fi - popd &>/dev/null || die - fi - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" - popd &>/dev/null || die - fi - - pushd contrib/subtree &>/dev/null || die - git_emake - use doc && git_emake doc - 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 git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - 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 - 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 /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - 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 - } - l10n_for_each_disabled_locale_do 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 -} diff --git a/dev-vcs/git/git-2.21.0.ebuild b/dev-vcs/git/git-2.21.0.ebuild index 35cfd64730ab..b1c57943db0a 100644 --- a/dev-vcs/git/git-2.21.0.ebuild +++ b/dev-vcs/git/git-2.21.0.ebuild @@ -45,7 +45,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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" diff --git a/dev-vcs/git/git-2.22.1.ebuild b/dev-vcs/git/git-2.22.1.ebuild deleted file mode 100644 index b8522337d044..000000000000 --- a/dev-vcs/git/git-2.22.1.ebuild +++ /dev/null @@ -1,721 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) - -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 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: pu - case "${PVR}" in - 9999) EGIT_BRANCH=maint ;; - 9999-r1) EGIT_BRANCH=master ;; - 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=pu ;; - 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - gnome-keyring? ( app-crypt/libsecret ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - 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 ) - ) - emacs? ( virtual/emacs ) - iconv? ( virtual/libiconv ) -" - -RDEPEND="${CDEPEND} - 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 -DEPEND="${CDEPEND} - doc? ( - app-text/asciidoc - app-text/docbook2X - app-text/xmlto - sys-apps/texinfo - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE="50${PN}-gentoo.el" -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - mediawiki-experimental? ( mediawiki ) - subversion? ( perl ) - webdav? ( curl ) - pcre-jit? ( pcre ) - perforce? ( ${PYTHON_REQUIRED_USE} ) -" - -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 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_PTHREAD=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 -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=( -# NO_MMAP=YesPlease -# NO_IPV6=YesPlease -# NO_STRLCPY=YesPlease -# NO_MEMMEM=YesPlease -# NO_MKDTEMP=YesPlease -# NO_MKSTEMPS=YesPlease -# ) -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=( NO_NSEC=YesPlease ) - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=( NO_FNMATCH_CASEFOLD=YesPlease ) - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ - myopts+=( HAVE_GETDELIM=1 ) - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) - - # 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 || die "emake git-credential-libsecret failed" - 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 /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - 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 - } - l10n_for_each_disabled_locale_do 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 -} diff --git a/dev-vcs/git/git-2.23.0.ebuild b/dev-vcs/git/git-2.23.0-r1.ebuild index b8522337d044..152498a706f1 100644 --- a/dev-vcs/git/git-2.23.0.ebuild +++ b/dev-vcs/git/git-2.23.0-r1.ebuild @@ -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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" @@ -144,6 +144,8 @@ PATCHES=( # Make submodule output quiet "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch + + "${FILESDIR}"/${P}-avoid_empty_remote_line.patch #698384 ) pkg_setup() { diff --git a/dev-vcs/git/git-2.22.0.ebuild b/dev-vcs/git/git-2.24.0_rc2.ebuild index b8522337d044..c305c57e6449 100644 --- a/dev-vcs/git/git-2.22.0.ebuild +++ b/dev-vcs/git/git-2.24.0_rc2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL=no @@ -107,6 +107,9 @@ RDEPEND="${CDEPEND} # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info DEPEND="${CDEPEND} + test? ( app-crypt/gnupg )" + +BDEPEND=" doc? ( app-text/asciidoc app-text/docbook2X @@ -114,11 +117,11 @@ DEPEND="${CDEPEND} sys-apps/texinfo ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" +" # Live ebuild builds man pages and HTML docs, additionally if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} app-text/asciidoc" fi @@ -160,7 +163,9 @@ pkg_setup() { # This is needed because for some obscure reasons future calls to make don't # pick up these exports if we export them in src_unpack() exportmakeopts() { - local myopts=( + local extlibs myopts + + myopts=( ASCIIDOC_NO_ROFF=YesPlease $(usex cvs '' NO_CVS=YesPlease) $(usex elibc_musl NO_REGEX=YesPlease '') @@ -237,12 +242,14 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ + if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) + fi fi - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) + 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' @@ -443,7 +450,7 @@ src_install() { #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" + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -532,7 +539,7 @@ src_install() { for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ - "${ED%/}"/usr/share/${PN}/contrib \ + "${ED}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done @@ -548,19 +555,19 @@ src_install() { newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb - for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + 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 + 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* + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* fi if use xinetd ; then @@ -581,8 +588,8 @@ src_install() { # 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 + if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + rm -r "${ED}/usr/share/locale/${1}" || die fi } l10n_for_each_disabled_locale_do rm_loc @@ -692,7 +699,7 @@ src_test() { nonfatal git_emake aggregate-results # And bail if there was a problem - [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." + [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." } showpkgdeps() { diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index b8522337d044..c305c57e6449 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL=no @@ -107,6 +107,9 @@ RDEPEND="${CDEPEND} # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info DEPEND="${CDEPEND} + test? ( app-crypt/gnupg )" + +BDEPEND=" doc? ( app-text/asciidoc app-text/docbook2X @@ -114,11 +117,11 @@ DEPEND="${CDEPEND} sys-apps/texinfo ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" +" # Live ebuild builds man pages and HTML docs, additionally if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} app-text/asciidoc" fi @@ -160,7 +163,9 @@ pkg_setup() { # This is needed because for some obscure reasons future calls to make don't # pick up these exports if we export them in src_unpack() exportmakeopts() { - local myopts=( + local extlibs myopts + + myopts=( ASCIIDOC_NO_ROFF=YesPlease $(usex cvs '' NO_CVS=YesPlease) $(usex elibc_musl NO_REGEX=YesPlease '') @@ -237,12 +242,14 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ + if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) + fi fi - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) + 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' @@ -443,7 +450,7 @@ src_install() { #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" + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -532,7 +539,7 @@ src_install() { for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ - "${ED%/}"/usr/share/${PN}/contrib \ + "${ED}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done @@ -548,19 +555,19 @@ src_install() { newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb - for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + 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 + 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* + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* fi if use xinetd ; then @@ -581,8 +588,8 @@ src_install() { # 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 + if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + rm -r "${ED}/usr/share/locale/${1}" || die fi } l10n_for_each_disabled_locale_do rm_loc @@ -692,7 +699,7 @@ src_test() { nonfatal git_emake aggregate-results # And bail if there was a problem - [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." + [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." } showpkgdeps() { diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index b8522337d044..c305c57e6449 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL=no @@ -107,6 +107,9 @@ RDEPEND="${CDEPEND} # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info DEPEND="${CDEPEND} + test? ( app-crypt/gnupg )" + +BDEPEND=" doc? ( app-text/asciidoc app-text/docbook2X @@ -114,11 +117,11 @@ DEPEND="${CDEPEND} sys-apps/texinfo ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" +" # Live ebuild builds man pages and HTML docs, additionally if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} app-text/asciidoc" fi @@ -160,7 +163,9 @@ pkg_setup() { # This is needed because for some obscure reasons future calls to make don't # pick up these exports if we export them in src_unpack() exportmakeopts() { - local myopts=( + local extlibs myopts + + myopts=( ASCIIDOC_NO_ROFF=YesPlease $(usex cvs '' NO_CVS=YesPlease) $(usex elibc_musl NO_REGEX=YesPlease '') @@ -237,12 +242,14 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ + if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) + fi fi - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) + 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' @@ -443,7 +450,7 @@ src_install() { #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" + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -532,7 +539,7 @@ src_install() { for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ - "${ED%/}"/usr/share/${PN}/contrib \ + "${ED}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done @@ -548,19 +555,19 @@ src_install() { newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb - for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + 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 + 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* + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* fi if use xinetd ; then @@ -581,8 +588,8 @@ src_install() { # 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 + if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + rm -r "${ED}/usr/share/locale/${1}" || die fi } l10n_for_each_disabled_locale_do rm_loc @@ -692,7 +699,7 @@ src_test() { nonfatal git_emake aggregate-results # And bail if there was a problem - [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." + [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." } showpkgdeps() { diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index b8522337d044..c305c57e6449 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL=no @@ -107,6 +107,9 @@ RDEPEND="${CDEPEND} # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info DEPEND="${CDEPEND} + test? ( app-crypt/gnupg )" + +BDEPEND=" doc? ( app-text/asciidoc app-text/docbook2X @@ -114,11 +117,11 @@ DEPEND="${CDEPEND} sys-apps/texinfo ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" +" # Live ebuild builds man pages and HTML docs, additionally if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} app-text/asciidoc" fi @@ -160,7 +163,9 @@ pkg_setup() { # This is needed because for some obscure reasons future calls to make don't # pick up these exports if we export them in src_unpack() exportmakeopts() { - local myopts=( + local extlibs myopts + + myopts=( ASCIIDOC_NO_ROFF=YesPlease $(usex cvs '' NO_CVS=YesPlease) $(usex elibc_musl NO_REGEX=YesPlease '') @@ -237,12 +242,14 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ + if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) + fi fi - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) + 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' @@ -443,7 +450,7 @@ src_install() { #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" + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -532,7 +539,7 @@ src_install() { for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ - "${ED%/}"/usr/share/${PN}/contrib \ + "${ED}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done @@ -548,19 +555,19 @@ src_install() { newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb - for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + 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 + 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* + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* fi if use xinetd ; then @@ -581,8 +588,8 @@ src_install() { # 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 + if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + rm -r "${ED}/usr/share/locale/${1}" || die fi } l10n_for_each_disabled_locale_do rm_loc @@ -692,7 +699,7 @@ src_test() { nonfatal git_emake aggregate-results # And bail if there was a problem - [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." + [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." } showpkgdeps() { diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 65a6d23f6400..c305c57e6449 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL=no @@ -107,6 +107,9 @@ RDEPEND="${CDEPEND} # .xml/docbook --(docbook2texi.pl)--> .texi # .texi --(makeinfo)---------> .info DEPEND="${CDEPEND} + test? ( app-crypt/gnupg )" + +BDEPEND=" doc? ( app-text/asciidoc app-text/docbook2X @@ -114,11 +117,11 @@ DEPEND="${CDEPEND} sys-apps/texinfo ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" +" # Live ebuild builds man pages and HTML docs, additionally if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} app-text/asciidoc" fi @@ -138,7 +141,7 @@ REQUIRED_USE=" PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch + "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch @@ -160,7 +163,9 @@ pkg_setup() { # This is needed because for some obscure reasons future calls to make don't # pick up these exports if we export them in src_unpack() exportmakeopts() { - local myopts=( + local extlibs myopts + + myopts=( ASCIIDOC_NO_ROFF=YesPlease $(usex cvs '' NO_CVS=YesPlease) $(usex elibc_musl NO_REGEX=YesPlease '') @@ -237,12 +242,14 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ + if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) + fi fi - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) + 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' @@ -443,7 +450,7 @@ src_install() { #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" + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -532,7 +539,7 @@ src_install() { for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ - "${ED%/}"/usr/share/${PN}/contrib \ + "${ED}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done @@ -548,19 +555,19 @@ src_install() { newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb newdoc "${S}"/gitweb/README README.gitweb - for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + 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 + 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* + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* fi if use xinetd ; then @@ -581,8 +588,8 @@ src_install() { # 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 + if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + rm -r "${ED}/usr/share/locale/${1}" || die fi } l10n_for_each_disabled_locale_do rm_loc @@ -692,7 +699,7 @@ src_test() { nonfatal git_emake aggregate-results # And bail if there was a problem - [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." + [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." } showpkgdeps() { diff --git a/dev-vcs/hg-git/Manifest b/dev-vcs/hg-git/Manifest index 54a4f5064dfa..756d534037e2 100644 --- a/dev-vcs/hg-git/Manifest +++ b/dev-vcs/hg-git/Manifest @@ -1,9 +1,11 @@ AUX hg-git-0.8.12-hg-4.8.patch 6647 BLAKE2B 86e0fb6bd9f9b9d10e38024cecf447857ae5339085a3f919cd924d3a397003d85b59014ba920ee5f5f62ef54acb862feeef325a9d76168e5f5ba37c34dfa9dad SHA512 8536ba20dbe5e8d1e3872a058d3e4f402ee39a7f91d1fc0102e6d169bc246ed728bfac517ef620b157d563644b18982f7f8d2fd63ab1f5138e5550b4280b8619 DIST hg-git-0.8.11.tar.gz 118537 BLAKE2B 05a63633f8909260428197334812d314cdba115324fa7dd70ccb5d0ee1e21089be0b8bb0cb1cf09f5f738cbee00e3e688646daa3debed9fa36fac2ff62bfcb8b SHA512 ced6b8b522f75b0e2b59c5113b3afd7b02eb2e3798a7aecdc211a15aba1363d3785234e909644626b5c16d7e8b158a6fe1f1120dcd85b5709d8a84ff1f4b6655 DIST hg-git-0.8.12.tar.gz 124456 BLAKE2B 31a899ba1f2e0de861d81e7ff5fac9f82e9c08813b77fa8a4da3aeae590d7e8cb6c37abb80ebe34a80835c210f10145df7429685cb71ffab7bfe8d5a628d3d12 SHA512 77af45c8f35febe354382ee043be7f0f2c53e1ac7ae331a7068a0e117ed0f54adaa7c7f5127e247e089c9204b9130dde286aa887997b7ab7ede48f447797608e +DIST hg-git-0.8.13_pre20190808.zip 171168 BLAKE2B 52cc847224977e6bf27b095b31773bdfd655ddbc6bdd169f5940dee65ee74ad357a8bd09120ac11a88b2a6058c5e18d4a4efbebd230d95c1093d1116429c0048 SHA512 9baf91288bf3762333e1da9394dfd717ffd7ed583d7f565babbe4888bab5766e7e6925ac7b1e154074d4ebc10a955790d59aad9423f693b8ded0a7f94ac69a74 DIST hg-git-0.8.8.tar.gz 98508 BLAKE2B e7636c3809b2be8a7fcce44a72f89f39927a282c34384047036470fc832b34be1922de75a2a9b468ec125ea716263333f5f58e6a0c7de12729b7dd18c68b657a SHA512 c3b28273024f2429ed526354048f0e37d0af6be591020fa3b1e8d1321247d72129f7c8fbcef73e69d60e243a6f86380dc4d89f0e8f913b786ef4497421237aac EBUILD hg-git-0.8.11.ebuild 707 BLAKE2B 6bf0f75ecf2877a5b3d4775949aea77332dbb57d874c21acf36c10c0a377e543f6087e882a34127c56b92931ab47456f36a10019091c247cd81e0e84c4fa0b71 SHA512 b404e426bbfe1cefe5d56db9ef463ca4833c1e40dd7ec5ef9c4fd2eb249301fafcc8e321417557058307b8992420a56244245e1a908485c30977b30428849123 EBUILD hg-git-0.8.12-r1.ebuild 750 BLAKE2B b8e1005953ae97583fabbcd3c72e0e732fe76abd3c089aecd3f9590f809253dfca1b694c14cfc51e5867f7beca5e9bcba3202399610bdf1df422ac57fb48a395 SHA512 aad9af3857bbc577d54af072c0913183a9eeaf2bf1e2846e773273cf6adf53ca5a170630d98786887d1d4d11357edfc9f6c7f65a9d88dbcd80c7ff2191787344 EBUILD hg-git-0.8.12.ebuild 704 BLAKE2B 67f021ab754992b636235ffd2ad7dd43dca05ea63096764f4e63e77ea683b6a6ab057b6581300fb38f95d2dab3a7425a7694b9ea2e24146f38be240400303de8 SHA512 a23762cace05828e78628187a6fd4c34acb6d2a9b9ae9889005d209560fe36af792b8d81eda6e831a97b509c22378e966aaec7153408cf1d07234bdbaed5cac9 +EBUILD hg-git-0.8.13_pre20190808.ebuild 899 BLAKE2B 0a6570cb3d850486a8d6daae374b854de3013f216c4819525873eef7eb406ce12fcc120caacff37adddaf09490d18a44ae3abdcb50f41cac59cdd3f01a75a16f SHA512 cf89efaef6efc4a7a77f22bc177729bc476a810f20b2bf0d1fc63e9ba129bbd78f8ba235554c23a0aaef0caea5f335a44d3e061c5684f9232f6cdfa20bb9c503 EBUILD hg-git-0.8.8.ebuild 697 BLAKE2B de1b6b49eeef84667cad1bbe50a10ef919352b49e402f9d0a48c7ff2c6f560dbd5e208d5456a38c07473bc8dbab1f23eef8cc85a8d90d333a4b98f30715601a8 SHA512 b0f24d48a56171a5c30575df57db48ac859bedd5912a48194a9183c06930e5e56b01a06e5dbcee7462d692f1c9a41f79fb593a73cdd0ebf418da05b24bee9cf2 MISC metadata.xml 317 BLAKE2B 53e7e3877f6f42a888ad50ba824e4a50f4535d4a9345ff2a661ae3df79e57bddfb8faa80ea632856a530b99518e90d4311f8090003880f3a5cf073fec1d8c926 SHA512 98a36b756fe1f1ee4f2d7c1f7f0dee8925a1396d2b44eff84274aa4c6e871d87d17808e157c6020cbeeec763e44fc4ba6e5d266561b3fe5c015f04c864349a09 diff --git a/dev-vcs/hg-git/hg-git-0.8.13_pre20190808.ebuild b/dev-vcs/hg-git/hg-git-0.8.13_pre20190808.ebuild new file mode 100644 index 000000000000..6e1b2b36d3b5 --- /dev/null +++ b/dev-vcs/hg-git/hg-git-0.8.13_pre20190808.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +HGID="aa15905ca87f" +DESCRIPTION="push to and pull from a Git repository using Mercurial" +HOMEPAGE="http://hg-git.github.io https://pypi.org/project/hg-git/" +if [[ ${PV} == *_pre* ]] ; then + SRC_URI="https://bitbucket.org/durin42/${PN}/get/${HGID}.zip -> ${P}.zip" + S=${WORKDIR}/durin42-${PN}-${HGID} +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +fi + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND=" + >=dev-vcs/mercurial-3.6[${PYTHON_USEDEP}] + >=dev-python/dulwich-0.9.7[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] +" +BDEPEND="app-arch/unzip" diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest index ae2529b229eb..e44aff29c468 100644 --- a/dev-vcs/stgit/Manifest +++ b/dev-vcs/stgit/Manifest @@ -7,6 +7,6 @@ DIST stgit-0.19.tar.gz 246256 BLAKE2B ece625a0f78f4a80a9a20b25d0638ee71475029ebd DIST stgit-0.20.tar.gz 319696 BLAKE2B 85402c84148f5ec93c65be2899240ffa143049de63f734e56438fd17d59ba32cacd279dc3d2eb306ebd11f139f2b4183be814989443401f7d696eba93228a1b7 SHA512 45c4715f7b0c8d8e7f1104694feac7bff07428a6e532ba41bf30807b715990cc1b22a1e82757bb72eb886b987b7c9126d729f9fc161c03497c4d9fa719aae599 EBUILD stgit-0.16-r2.ebuild 1732 BLAKE2B 2be40c1d991060b15413ae0c718b7b8793c1f8458fa0c52fc45e2e62568566975ac2c15c12b1f8065b475d9753f39dd92ae8095ee8c971c638d008da64ab82d3 SHA512 015a83ab10571d9000f0394c2173a56feac071ca6680ec9b4ee6b6e7c4be3a6e098a231be71bac87ddec9dfc415808f0a86dd30c4bb142493358d8558810cc0a EBUILD stgit-0.18.ebuild 1883 BLAKE2B 1ccceee2fb9c6b039ac956ef85444fdca246aacb75ff5a55c6351faf909a09d6148b173eba6cd7c0b0b5f54271050b83cd059979619036b9eb703c8c8b2de837 SHA512 2557043aa518718bc489ac2004a69f155a913c9bc38520cfec8c22daf2629a76d14baf6bd4cf8fc4ade0c2ee0c35974f5f33c5bc715aee1119791d26dbe7224e -EBUILD stgit-0.19.ebuild 1898 BLAKE2B 9d1ef085d3cc13db1bb88120e5a044e8a5cca16651551fd8e28a559fab20161c7abae3823f5206f34b0be32968d14f1afb6e853b89a923ca94f3fa3aaa35024d SHA512 caf8904781dc5a86b0ddf4cc25d3f808b4bf8e94aab2df44cf00033576753d311c457b207865ca6c6d72c81cbc0a67d3591bcbbe485a63194b661b93915739cc +EBUILD stgit-0.19.ebuild 1896 BLAKE2B 36a268e2e253b697a4ba0f78db47a1d24227b04229481e515261152a34e5ffe58e5a9524c00df6f9d8a388f8ad487f828b17b18580c7606a84aa165ddf061111 SHA512 cb1de37edd75469f1964609caa8802866ac7844d8c9cf876372c3bb82d0ecdf98d01a8ddbd16d285cfeb042b456a3bdc1cfa83903f18b189cb45e06f238cfbc8 EBUILD stgit-0.20.ebuild 1899 BLAKE2B 59d2b542ca22397c97c4451e52cc552427c930d834484d17f235a99ce96ed0352a8ca5706d81f7beadeebe6668c969072667ff07c88a2cdf1a2f297eab131d48 SHA512 bcfccf034ba5fd8ad0e14fb73090c14a9fa16c2e8d2b66585410ec13a86a46ade50ad40682d0672ad189f4b32ad9136c79be13cd5643bbff162e260c1e953872 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8 diff --git a/dev-vcs/stgit/stgit-0.19.ebuild b/dev-vcs/stgit/stgit-0.19.ebuild index e5d317311b68..3b518b6124e6 100644 --- a/dev-vcs/stgit/stgit-0.19.ebuild +++ b/dev-vcs/stgit/stgit-0.19.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="doc" RDEPEND=">=dev-vcs/git-1.6.3.3" diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index a0342643af9a..a72e1e56f1a0 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -4,5 +4,7 @@ AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2 DIST subversion-1.12.2.tar.bz2 8506584 BLAKE2B 535e4c6c369537baa7f9fc9123d0314de1bb8d4b3c51e0216662047fd1084ceb6a1f349de54bf575f0eb8e1041fcd6525e6cf27dbd908e2148578cb9fb807bb3 SHA512 b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136 +DIST subversion-1.13.0.tar.bz2 8508122 BLAKE2B 761def1bb3a1fe5333534ebda0940b618c343f919688055cdef69552bc515ad6cd9db3ac67c8c73075487d4f45d93bb57fa467288756dfa163fc72c8e8c7b548 SHA512 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2 EBUILD subversion-1.12.2.ebuild 15491 BLAKE2B 852c123c0817cd5b6ed337920fa32612db4e421ed11026c36e5dff88e178d696af47614d8365d757cccee8b88835bf9c7217331baeaef028b98bbf9b15cc032f SHA512 31102d7016ad7c8f719a7c236f6fe5043a3b9e791dbedaafc05c482fdb4c7463c140317caeded1981fdf2ce7d1e98f1fda40fd0d35a096b79d4abb0ebcde14d7 +EBUILD subversion-1.13.0.ebuild 15501 BLAKE2B 5539c85ba8351474c042aec3707728f7c767b06bb7f0a0b2069341400e7fa0f5c3697365a8413b97bbc707dff52ef0c56cd96ab18775dd36392f196f4b83bc60 SHA512 11e6c6c33e55abb2d9d5b64d8e6fb31f1bc9a05afb8db620167795a5f5b07b0c7a7681eef12427e24debdf6d2454f4b100a11473048523edbb2f966ffe490378 MISC metadata.xml 659 BLAKE2B 645c4601d97faa216c2b75f48c2202f011ba17611ae68f3d572584b4608e1d5b7ef2db5cfdb78d0aafffce51519f65a4945979e3da9c57b03a2c3f08552e74c8 SHA512 2a2f10c5500540ae1bdd49d80d9689c14a79772d93b689db01e0cd1d63a729b86a7b28974492ee08d6433495c61d5a493590c4c60d843afc881c54d574369313 diff --git a/dev-vcs/subversion/subversion-1.13.0.ebuild b/dev-vcs/subversion/subversion-1.13.0.ebuild new file mode 100644 index 000000000000..f8eddc1f4a1a --- /dev/null +++ b/dev-vcs/subversion/subversion-1.13.0.ebuild @@ -0,0 +1,531 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +USE_RUBY="ruby26 ruby25 ruby24" +DISTUTILS_OPTIONAL=1 +WANT_AUTOMAKE="none" +GENTOO_DEPEND_ON_PERL="no" + +inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single xdg-utils + +MY_P="${P/_/-}" +DESCRIPTION="Advanced version control system" +HOMEPAGE="https://subversion.apache.org/" +SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="Subversion GPL-2" +SLOT="0" +[[ "${PV}" = *_rc* ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax" + +COMMON_DEPEND=" + app-arch/bzip2 + app-arch/lz4 + >=dev-db/sqlite-3.7.12 + >=dev-libs/apr-1.3:1 + >=dev-libs/apr-util-1.3:1 + dev-libs/expat + dev-libs/libutf8proc:= + sys-apps/file + sys-libs/zlib + berkdb? ( >=sys-libs/db-4.0.14:= ) + ctypes-python? ( ${PYTHON_DEPS} ) + gnome-keyring? ( + dev-libs/glib:2 + gnome-base/libgnome-keyring + sys-apps/dbus + ) + http? ( >=net-libs/serf-1.3.4 ) + kwallet? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kwallet:5 + sys-apps/dbus + ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + ruby? ( ${RUBY_DEPS} ) + sasl? ( dev-libs/cyrus-sasl )" +RDEPEND="${COMMON_DEPEND} + apache2? ( www-servers/apache[apache2_modules_dav] ) + java? ( >=virtual/jre-1.8 ) + nls? ( virtual/libintl ) + perl? ( dev-perl/URI )" +# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once +DEPEND="${COMMON_DEPEND} + !!<sys-apps/sandbox-1.6 + ctypes-python? ( dev-python/ctypesgen ) + doc? ( app-doc/doxygen ) + gnome-keyring? ( virtual/pkgconfig ) + http? ( virtual/pkgconfig ) + java? ( >=virtual/jdk-1.8 ) + kwallet? ( + kde-frameworks/kdelibs4support:5 + virtual/pkgconfig + ) + nls? ( sys-devel/gettext ) + perl? ( dev-lang/swig ) + python? ( dev-lang/swig ) + ruby? ( dev-lang/swig ) + test? ( ${PYTHON_DEPS} )" + +REQUIRED_USE=" + ctypes-python? ( ${PYTHON_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( + ${PYTHON_REQUIRED_USE} + !dso + )" + +want_apache + +pkg_setup() { + if use berkdb ; then + local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ + | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ + | sed 's:.*b::')" + einfo + if [[ -z "${SVN_BDB_VERSION}" ]] ; then + if [[ -n "${apu_bdb_version}" ]] ; then + SVN_BDB_VERSION="${apu_bdb_version}" + einfo "Matching db version to apr-util" + else + SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" + einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." + fi + fi + einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" + einfo + + if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then + eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" + eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." + eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"." + eerror "Aborting to avoid possible run-time crashes." + die "Berkeley DB version mismatch" + fi + fi + + depend.apache_pkg_setup + + java-pkg-opt-2_pkg_setup + + if ! use http ; then + ewarn "WebDAV support is disabled. You need WebDAV to" + ewarn "access repositories through the HTTP protocol." + ewarn "Consider enabling \"http\" USE flag" + echo -ne "\a" + fi + + # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 + append-cppflags -P + + if use debug ; then + append-cppflags -DSVN_DEBUG -DAP_DEBUG + fi + + # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E + [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__ + + # Allow for custom repository locations. + SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" + + if use ruby ; then + local rbslot + RB_VER="" + for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do + if has_version dev-lang/ruby:${rbslot} ; then + RB_VER="${rbslot/.}" + break + fi + done + [[ -z "${RB_VER}" ]] && die "No useable ruby version found" + fi +} + +src_prepare() { + eapply "${WORKDIR}/patches" + eapply_user + + chmod +x build/transform_libtool_scripts.sh || die + + sed -i \ + -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ + -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac + + # this bites us in particular on Solaris + sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ + die "/bin/sh is not POSIX shell!" + + eautoconf + elibtoolize + + sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ + -i build-outputs.mk || die "sed failed" + + if use python ; then + # XXX: make python_copy_sources accept path + S=${S}/subversion/bindings/swig/python python_copy_sources + rm -r "${S}"/subversion/bindings/swig/python || die + fi + + xdg_environment_reset +} + +src_configure() { + local myconf=( + --libdir="${EPREFIX%/}/usr/$(get_libdir)" + $(use_with apache2 apache-libexecdir) + $(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs) + $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") + $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr") + $(use_enable dso runtime-module-search) + $(use_with gnome-keyring) + $(use_enable java javahl) + $(use_with java jdk "${JAVA_HOME}") + $(use_with kwallet) + $(use_enable nls) + $(use_with sasl) + $(use_with http serf) + --with-apr="${EPREFIX%/}/usr/bin/apr-1-config" + --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config" + --disable-experimental-libtool + --without-jikes + --disable-mod-activation + --disable-static + --enable-svnxx + ) + + if use python || use perl || use ruby; then + myconf+=( --with-swig ) + else + myconf+=( --without-swig ) + fi + + if use java ; then + myconf+=( --without-junit ) + fi + + case ${CHOST} in + *-aix*) + # avoid recording immediate path to sharedlibs into executables + append-ldflags -Wl,-bnoipath + ;; + *-cygwin*) + # no LD_PRELOAD support, no undefined symbols + myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined ) + ;; + *-interix*) + # loader crashes on the LD_PRELOADs... + myconf+=( --disable-local-library-preloading ) + ;; + *-solaris*) + # need -lintl to link + use nls && append-libs intl + # this breaks installation, on x64 echo replacement is 32-bits + myconf+=( --disable-local-library-preloading ) + ;; + *-mint*) + myconf+=( --enable-all-static --disable-local-library-preloading ) + ;; + *) + # inject LD_PRELOAD entries for easy in-tree development + myconf+=( --enable-local-library-preloading ) + ;; + esac + + #version 1.7.7 again tries to link against the older installed version and fails, when trying to + #compile for x86 on amd64, so workaround this issue again + #check newer versions, if this is still/again needed + #myconf+=( --disable-disallowing-of-undefined-references ) + + # for build-time scripts + if use ctypes-python || use python || use test; then + python_setup + fi + + if use python && [[ ${CHOST} == *-darwin* ]] ; then + export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' + export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)' + export ac_cv_python_compile="$(tc-getCC)" + fi + + # allow overriding Python include directory + ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \ + ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \ + ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ + econf "${myconf[@]}" +} + +src_compile() { + emake local-all + + if use ctypes-python ; then + # pre-generate .py files + use ctypes-python && emake ctypes-python + + pushd subversion/bindings/ctypes-python >/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die + fi + + if use python ; then + swig_py_compile() { + local p=subversion/bindings/swig/python + rm -f ${p} || die + ln -s "${BUILD_DIR}" ${p} || die + + python_export PYTHON_INCLUDEDIR + emake swig-py \ + swig_pydir="$(python_get_sitedir)/libsvn" \ + swig_pydir_extra="$(python_get_sitedir)/svn" + } + + # this will give us proper BUILD_DIR for symlinking + BUILD_DIR=python \ + python_foreach_impl swig_py_compile + fi + + if use perl ; then + emake swig-pl + fi + + if use ruby ; then + emake swig-rb + fi + + if use java ; then + emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl + fi + + if use extras ; then + emake tools + fi + + if use doc ; then + doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" + + if use java; then + emake doc-javahl + fi + fi +} + +src_test() { + if has_version ~${CATEGORY}/${P} ; then + default + + if use ctypes-python ; then + python_test() { + "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ + || die "ctypes-python tests fail with ${EPYTHON}" + } + + distutils-r1_src_test + fi + + if use python ; then + swig_py_test() { + pushd "${BUILD_DIR}" >/dev/null || die + "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" + popd >/dev/null || die + } + + BUILD_DIR=subversion/bindings/swig/python \ + python_foreach_impl swig_py_test + fi + else + ewarn "The test suite shows errors when there is an older version of" + ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*" + ewarn "before running the test suite." + ewarn "Test suite skipped." + fi +} + +src_install() { + emake -j1 DESTDIR="${D}" local-install + + if use ctypes-python ; then + pushd subversion/bindings/ctypes-python >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die + fi + + if use python ; then + swig_py_install() { + local p=subversion/bindings/swig/python + rm -f ${p} || die + ln -s "${BUILD_DIR}" ${p} || die + + emake \ + DESTDIR="${D}" \ + swig_pydir="$(python_get_sitedir)/libsvn" \ + swig_pydir_extra="$(python_get_sitedir)/svn" \ + install-swig-py + } + + BUILD_DIR=python \ + python_foreach_impl swig_py_install + fi + + if use perl ; then + emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl + perl_delete_localpod + find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die + fi + + if use ruby ; then + emake DESTDIR="${D}" install-swig-rb + fi + + if use java ; then + emake DESTDIR="${D}" install-javahl + java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname) + java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar + rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar + fi + + # Install Apache module configuration. + if use apache2 ; then + keepdir "${APACHE_MODULES_CONFDIR}" + insinto "${APACHE_MODULES_CONFDIR}" + doins "${FILESDIR}/47_mod_dav_svn.conf" + fi + + # Install Bash Completion, bug 43179. + newbashcomp tools/client-side/bash_completion svn + bashcomp_alias svn svn{admin,dumpfilter,look,sync,version} + rm -f tools/client-side/bash_completion + + # Install hot backup script, bug 54304. + newbin tools/backup/hot-backup.py svn-hot-backup + rm -fr tools/backup + + # Install svnserve init-script and xinet.d snippet, bug 43245. + newinitd "${FILESDIR}"/svnserve.initd3 svnserve + newconfd "${FILESDIR}"/svnserve.confd svnserve + insinto /etc/xinetd.d + newins "${FILESDIR}"/svnserve.xinetd svnserve + + #adjust default user and group with disabled apache2 USE flag, bug 381385 + if ! use apache2 ; then + sed -e "s\USER:-apache\USER:-svn\g" \ + -e "s\GROUP:-apache\GROUP:-svnusers\g" \ + -i "${ED%/}"/etc/init.d/svnserve || die + sed -e "0,/apache/s//svn/" \ + -e "s:apache:svnusers:" \ + -i "${ED%/}"/etc/xinetd.d/svnserve || die + fi + + # Install documentation. + dodoc CHANGES COMMITTERS README + dodoc tools/xslt/svnindex.{css,xsl} + rm -fr tools/xslt + + # Install extra files. + if use extras ; then + cat <<- EOF > 80subversion-extras + PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" + ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" + EOF + doenvd 80subversion-extras + + emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools + + find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr + rm -fr tools/client-side/svnmucc + rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* + rm -fr tools/{buildbot,dev,diff,po} + + insinto /usr/share/${PN} + find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die + doins -r tools + fi + + if use doc ; then + docinto html + dodoc -r doc/doxygen/html/* + + if use java ; then + java-pkg_dojavadoc doc/javadoc + fi + fi + + prune_libtool_files --all + + cd "${ED%/}"/usr/share/locale + for i in * ; do + if [[ ${i} != *${LINGUAS}* ]] ; then + rm -r ${i} || die + fi + done +} + +pkg_preinst() { + # Compare versions of Berkeley DB, bug 122877. + if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then + OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then + CHANGED_BDB_VERSION="1" + fi + fi +} + +pkg_postinst() { + if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then + ewarn "You upgraded from an older version of Berkeley DB and may experience" + ewarn "problems with your repository. Run the following commands as root to fix it:" + ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" + ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" + fi + + ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." +} + +pkg_postrm() { + : +} + +pkg_config() { + # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} + # already has EPREFIX in it + einfo "Initializing the database in ${SVN_REPOS_LOC}..." + if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then + echo "A Subversion repository already exists and I will not overwrite it." + echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." + else + mkdir -p "${SVN_REPOS_LOC}/conf" + + einfo "Populating repository directory..." + # Create initial repository. + "${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" + + einfo "Setting repository permissions..." + SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" + SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" + if use apache2 ; then + [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" + [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" + else + [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" + [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" + fi + chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf" + chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos" + echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet." + echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\"" + echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet." + echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\"" + echo "to finish the configuration." + fi +} |