linux
/
gentoo-overlay
1
1
Fork 0
Code Issues 1 Pull Requests Actions Releases Wiki Activity

fix merge conflicts

This commit is contained in:
Manuel Friedli 2018-02-08 22:13:30 +01:00
parent e0ad4d8960
commit db7bf817d2
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www-apps/gitlab-ce/Manifest
View File

@ -19,6 +19,7 @@ AUX gitlab.conf 27 SHA256 cd9be088bbb67a5400407fc6f63c061eb224f16748b7d0812ff2c1
DIST gitlab-ce-10.0.0_rc3.tar.gz 39936453 SHA256 347840d9beb01f765c4962616e241924b48ec0e3c09b35ff96563d1b509d4375 SHA512 855324e0c351ff1db3bc8823f85768d6968628da1452edc68f63249467eede89ba371e3d2de94a5fca3f31462c3d13dc2a8b3cd467f0647896183ead27492c81 WHIRLPOOL b7e98abb055cb6e884505dd2d49e93031f6722c0fb7cc34470903248de6f8871456deee2e41cf4da27b42dd7b4996111ecac02d568aa44286670edfd07d5cd7a
DIST gitlab-ce-10.0.4.tar.gz 40040781 SHA256 eef116f75b64b835402a87e3737a3721143823c7094ded06edf8f9ac974a7ca8 SHA512 346719e7ea8dba4cb55396cfaafc8d70c7145d4de63913dc736c7f21f3f1ac133a1c837c19a3b1131879678a7b5e8b9bb6abb0bf29031802dda6e3b96e0715c0 WHIRLPOOL a62361a9f48911a9bf0244411aa638017f8cd928e6b7fce501da5645b3f1813323abaebb2e7937d3c78bbf2724962575813940222d729b5356e77ff524231d02
DIST gitlab-ce-10.0.7.tar.gz 40049508 SHA256 890eed75ee502cd6c612756815ac8c854eeee3d00ab3d7bf00ee580db8141264 SHA512 770b747a35988b663f1ffe3b05b317839cc66e9c76e64e51673d066787a42acbb688b739fe9fe3a6dc787f2e44d6fbd99388ea0a20f103bedc631ed0054401f4 WHIRLPOOL 0de51582532936620b4140013f87652e7581956fd6e662d83e53ed024699ff70c2c52fbb863f8052c5df36bd5b63cff0cc6fd9372c97ea2265aa1242a2d6afdc
DIST gitlab-ce-10.1.1.tar.gz 41628358 SHA256 e938d447bbdbd9be83fe094e2e3bed49d171a46de1ec9a0a71e7d2b1bb991378 SHA512 a25d0df70be29e0ae0ceac2751e9ced5a8175662e10d409d317c932c80c6bb9fdab4d395d73c9ec7b7a8b558a28bbe86ed2ad20468ade2eb3e988eaa712d79f1 WHIRLPOOL adb15dc70cb35a30784455a28b73188331ee0a6bab5b8bcea21c90973d7763501faf37162e1d4d7dffa41d0c0516fe792dd3423807bf4aa317a861beb02d5467
DIST gitlab-ce-9.0.13.tar.gz 26366204 SHA256 056c98acb558776a2919b1aa501cb5303e66eb3cfe1d54b26988492be1c3816b SHA512 42fae9a01adc1eaac8e59b4ddb5f1d7c11d409dab32b84bf9849eedfed88bf87f7d36d0f9687f253424e2eacdbf83b3560bf9e64baa1533e4b1b6ff6e3be65e7 WHIRLPOOL d5c312d3f63057786ad28b2fba328d7a0593a5140aad617067b0aa0319d741f36ff32e573a436bf663f0f56d820b02fea5e22a430355856268306582fb62396a
DIST gitlab-ce-9.1.10.tar.gz 30516975 SHA256 37cfd9dafcfbcd432d7d7a3abc6889bcd35321fc00b717f4810bf432791b0243 SHA512 81a7b9836aafcb348b6c38d8c19917053fc7a6adc6328d4b05215aa3d5c698adb708068d36bdc82df61e5b2d6b269c0ba8682b4994fa4a36b98fabe5b17e5f07 WHIRLPOOL b0affc921e0b41faabe354805fbcbd56a5839f7eeb880c00c2f10b68b0f2865b8e39ed58cfd99f6b6d0f2517bd465ff3f227fc6f17e1c1e17128299f21a911f2
DIST gitlab-ce-9.2.10.tar.gz 30988788 SHA256 a30e9d08d08433713df958d447a76cf2ed16344c7de56614f2849e8caad3e3b5 SHA512 fd4602c86edaf3060e1f5b8c8d6c5e4d40ec64f7f3d2519008b8c096720016c9a0dc6357bc464e72e4b52b25bd12ab26a4166898fba608383b4e4647ad49782c WHIRLPOOL f6b79e71f906c461ed89bd23bd537ae640b55c6727d7275e16ecb3b7349957f1461138d8fef5163137cabae59dccfdd8c4b22bd425800bf2eee3b732fd9a2908
@ -28,6 +29,7 @@ DIST gitlab-ce-9.5.9.tar.gz 36464622 SHA256 0ef546feae5d66347e4a662332c329e29664
EBUILD gitlab-ce-10.0.0_rc3.ebuild 13508 SHA256 bb22763056e0686ff308db2bc14e55ed74c4af247eab55f4ba4502ac0fa3f210 SHA512 99f298076aff75183d68b9969e99bba1898501554aa08448539c154b021040d3af7b6f2bac3704511b3b83af7c39d7e42530142a6c5061078ea82fb93aafcbae WHIRLPOOL 129b9b2a0e4d512947c2be0b3143ece02d870f790f9425d5408191aef53e0631bb001390b2438a2f0d4a38b38a679af0909a9df1f9c9a4e3d7448f32110cb997
EBUILD gitlab-ce-10.0.4.ebuild 13526 SHA256 0fa438ddcca42b2ec6090bdb587635c8e82c9d4fb515427f24b264ab4b70db64 SHA512 dd84a68b17bd5ee193f55519bf83d52385e372dbde672915b4a799d30ecf08e2dd004946fbf73acaefcafce9af20355538a5c0d453ee52f7009deb8403001fe4 WHIRLPOOL db04a3db49544333341a4fbd1b1d3ce49e58106b91da12de0b5b2cfeece52876ce6845e6e8b0fd8048fe40ad3b02e78efc191e716fda52a576c959569a9527d5
EBUILD gitlab-ce-10.0.7.ebuild 13526 SHA256 258085d5365f3c65aed09ea9515bcf453ee2d6f91368401a885376337b2b0c27 SHA512 2ae1bb85618e73b3765323d0f6e8d2ac35aa471c1051b1559c752d567a7d7e4c1f4e5dd3558e20f5b5ee73d75a29da27914a39333ddf2e6e3818b8ae4496e57b WHIRLPOOL cc299c60414881559d80970d1c78b35ed3bd9d9c59a5ad8aaaf51c676109d72616f048f2c80c4bd125c889a35fb45a2f2e48ae7a2db68979805820de2a0df5ae
EBUILD gitlab-ce-10.1.1.ebuild 13708 SHA256 7a520ab8e941e465add0166146fe5e91ade4a80d1b29e3c15e03b0d712c18e0b SHA512 280c8f8a46599e6b25ba6bfbb861b95f4eb892aeedd1459bf1669a532638a309fe7ac64b886e596c9b8b5cadb30f7ed224cb641b3ad6da16708498596125e946 WHIRLPOOL 709eedc354d5d7bd36d1f08ebad94b7247563e0a219263bb84406a238f0126577f554376e732691860539de610bf7c4b1ade46854c2f8e924a2529940387e9b0
EBUILD gitlab-ce-9.0.13.ebuild 13139 SHA256 ecdcd1d6ca3999eb4b299628bac4c97a231cfcf682569cc1a0c11241cfcb6099 SHA512 8a6b8f3f05f54a752d57651b34ba4f6310e6695ea6eea1bbebe4a1dd38aa9ea0e9030bd59448a886918e20ea81f1b167236712e21fb6c43b7fb50b79565e2d87 WHIRLPOOL 0873a646dcb208e8c006e0e587fc03003594fd00e790e22d89839c9ffb8b7403a2df7b306ddfb817ea10a32e58d095d97989591de18ca78782bd468ae1fb8bc7
EBUILD gitlab-ce-9.1.10.ebuild 13295 SHA256 a69c179d072e76597091d825956bc308a25757a95406444a95a4ccbe9fe8ee9e SHA512 cc01ae887bce9e838eb020c7b414de4f80c5cc94762bd7c65fc5f6ab732b3ac7447f3f136b054557a5a93d09ed946b821d027fe29d7fdeea6eaaa6fc336cf394 WHIRLPOOL 1778e46da386704fbecc9e62769b9ab6ccdb40ee1028ef33607b4668e3fafbd0996ff4397128d8320098e3bf5c8f1d47a227e3c61a73a26a63663223790c8107
EBUILD gitlab-ce-9.2.10.ebuild 13040 SHA256 ace7b7561f499e43c19284153358b718275ac55792650391f39fa4ab89941c20 SHA512 22c8723251fefd50739ac082f04c377543f659720346cd29680d4956a2d6a37bb27b2c6beb723c09f49d7e478375e6679940f63f43c644564155a0eaffe300ed WHIRLPOOL 9601c5fcdc9b8d753a58ea4b4606957f3d09e63834335703896f55b16c41df7b81ef00b64e57f4409322789dcaa3745d60b31a973950c99037895d71a38ddaf2

3
www-servers/gitlab-pages/Manifest
View File

@ -1,5 +1,6 @@
AUX 0001-fix-Makefile-0.3.2.patch 744 SHA256 7efe9ee3cdf0e7e324155d05651f535b39f151adfd8f8bc2ea36eea64e40f1e1 SHA512 2c50e6bb214be622546d9c07f4f39b83d116976dbc9c040a0dd74c70dc8deadf5f6870468fda957b3a4d3df8eda982c3d86612cb8dd7865650cd3fe9202f7b11 WHIRLPOOL a1babc1249f3b48f376163a9ab63a8ca3563da544cf15d04a79fcbb38dcb61679da8304e3eb2afd8a0f1d662be8f3cc144b9cd0928504b197d11b250670d40d3
AUX 0001-fix-Makefile-0.4.0.patch 744 SHA256 7efe9ee3cdf0e7e324155d05651f535b39f151adfd8f8bc2ea36eea64e40f1e1 SHA512 2c50e6bb214be622546d9c07f4f39b83d116976dbc9c040a0dd74c70dc8deadf5f6870468fda957b3a4d3df8eda982c3d86612cb8dd7865650cd3fe9202f7b11 WHIRLPOOL a1babc1249f3b48f376163a9ab63a8ca3563da544cf15d04a79fcbb38dcb61679da8304e3eb2afd8a0f1d662be8f3cc144b9cd0928504b197d11b250670d40d3
AUX 0001-fix-Makefile-0.6.0.patch 830 SHA256 ad084ee3f83a3ee8097bd80e8990e00c927f109f8c712da67712c76b7ef91bda SHA512 221a7504396a96711da3852bbf71791f1a7b849121f6a24c2582e917b4966597d10291dea439cec91539f3a9ad599bcb34252e3a08a7214bd3d642181b07f723 WHIRLPOOL a46e2289a86560f223db0dd4e1c3c493497bb10bdeaa1d3b5faf24eb11674074fd25f35cd7df9670e4769be4d3e7ea97b4cc1cced3cef4dedc25a980bdeb6b60
AUX gitlab-pages-0.3.2.conf 148 SHA256 2b1d40d38d729a4e705455a2fbe745618c573cdc7159683ebf42f3a28d41a473 SHA512 57ff7ef4f3c5f221e39f8cfd29ab58ccb126d672260ee983d6f1221bfe2cfe5553b4f0187ce384f05fc6694ad31c2f7ae02155d0c21247eccd1d7dbf1632ffba WHIRLPOOL 1cb70bb5a9e6876a58e7cf78a68e9a08a0ae947237a537f7cf93b727cdb69482114cd2c1ccd17e27b80590be11e9904bae81e06afab83066c0d10926d22dd301
AUX gitlab-pages-0.3.2.init 698 SHA256 6751226148f5c8b53bdf3422053115ed6bb6ac3d7795b605617a7733a2b84437 SHA512 10e299febee0a66f03e8debe3f20ad635b52b5238a2ad23f585d30f14d5c0f591825bd892119f564f427e93a539184e39424c8cdc78200b2dbb5d0f588738176 WHIRLPOOL 7142b6a056a0d0a90bb18d1fdc5995c07156e05216b9e5779548427ad6f7aed4cf8eb090acfcbd0a7cc07826c0b6dfc5276ca176a80783d40405d2011a253fe0
DIST gitlab-pages-0.4.0.tar.bz2 205924 SHA256 b26a00050d3558e793c070cda2fe50dc1bd76ea305902e4885746280755c3ea0 SHA512 9ff1d51655c0af93eca0b3a7e5cf250ce9a6787b3bc5eabcb59207ca3af13b6972bbebbc9c4a05bc1056cd12d6ad4c4bc30700efb656a2b9cfedf71ef57666e2 WHIRLPOOL 064625dfbfd428da5ecbf7ceb0532ff16e61ef9fbdbe1f4f72824e06ca21a93266a3d5eeec730f6423cb9d5d26d99fc6dbb568f30a79c4a691a0fdb08301c1cf
@ -7,10 +8,12 @@ DIST gitlab-pages-0.4.1.tar.bz2 206039 SHA256 ed856e1d549597b5f1b7aa5d006538aa4d
DIST gitlab-pages-0.4.2.tar.bz2 209079 SHA256 391301c4f5cc288ed1a6a451e5273899518b83529c787c0a5f724161005ca786 SHA512 74e4cd810712d1506b927f75b63dc4fca09802097579d456cfada94f06c59b05f5e11309dc6fbd0f4c701243933688afa89ef8c1cf921f15536f505c7dec99f4 WHIRLPOOL 0f352db3977565b7c41609dcbed9161fcc99398fc56aa535255a69d12169b75b985410964a9adce60ed9eb8b88a68128dac9a9528f85ec62bae468fb8907e182
DIST gitlab-pages-0.4.4.tar.bz2 209229 SHA256 e3024edf56a61e8705f4fb5db2141087f16db1fe550d116e950137b92b201720 SHA512 5618e659ddd91a3398cd7eb00e38292e3bc88b31af91c02815dfe810a5a478d7eb2314430478e4e2971f36a44ac37a2c9ed01bd357d1f8737a8a63fc697821e7 WHIRLPOOL 52cec732705285e2270ad1fda43088ce0c6e0dbf652f7cc29e77dd68cb23ebe913c0c71af0337a59f77f351b207e79469bdbcf5531f6ee6714695af0d08c3497
DIST gitlab-pages-0.5.1.tar.bz2 224270 SHA256 b61ed9c12baf197dfd466342301ccb3160fbfe8fe61270a31a72e5503504f50b SHA512 973615efb54290c0d6b41455d91bf6343d8b09687565b8ad5e72cd69faea99cc3819c3aabea9e7cb94414a61835104e052affb1072ed62b1e2f343517eb94184 WHIRLPOOL 421500d5f0cee352a95dd59e9b799a9b3fd6b7639c656bd54fa601e061ddaa5062fa0b6a567bfce2543dcf9755b824a81362171c779db2f3f238faf760a6c472
DIST gitlab-pages-0.6.0.tar.bz2 237765 SHA256 2bd99b5c4a1ad05ac02f17f5b450c308d1ef5936ff2e44be706705df8376c41b SHA512 935572062268c8a8429634377e02060f55feb2dfbd6b16e4487c1c4043dff435c304798dd2097f381f1c2e175c21d840e2dee76851dc9e03eeaa49d2b003900d WHIRLPOOL 01541d143a9511911cdd7c0c97d63cc48c682b19392c96ae429d98eeba6aba220e811d4da6826da2d417439202a33fc7a0deb16a9dda8a5a65f0e6b0fa9adf54
EBUILD gitlab-pages-0.4.0.ebuild 1944 SHA256 9ea918e126d4edc0fb785eae43f618a7744bd0fb4bd342f09725633b3cbd9f3d SHA512 7b7364e999fbabe7ef48da010ed6b799c9b4af8ee83f32d4b138cc6ac16acdcd5ed980bf217ff405c03a9ef9bf589ce95c3cad64a101d8b0f6eb0d869e0ef014 WHIRLPOOL 2ce6e870eaaf8b7522c1ec7bbf91a843a94a278de77d44bbbe4d74f8ff36aa56dd912eae2e520bac82550a4352c5366098749d7cf1893e5e50be6b708ad1aaa3
EBUILD gitlab-pages-0.4.1.ebuild 1944 SHA256 f489ea11f220c84e099cff1ce0e960c02498846e90e22de23a3126d4cc9e883d SHA512 18391744f540507bbaee676854ca6b264eb08dcc93fe0a0c6f3bdcc34f3ee505ecb4db7f45f98a7ac2efa722f42f0aab3f174024f5c6a6f7e206fa0e08b6ebee WHIRLPOOL 182e67c00c30485fcb69d1061c397e16e18bfa62a82d729647fd795b36a5ae486a93c5d28f86ceed1b7230f3807732b241bf37532ccae0f789e90fa89ecbfc53
EBUILD gitlab-pages-0.4.2-r1.ebuild 1434 SHA256 477a4be7f099ed542dc7f69b2008c08d00593225e63a7c652139b4ff1e1feb46 SHA512 88923ff7da8bbb21eca3044bfaf8a59dd9a6fedc96bbeb1739a591ba2054ff1e0d789aeee7b634a70eb1627cfe3ad50361577555ccc5fedb1523e6af3518a4af WHIRLPOOL d94e14712020c5542a5b41c8450a80824fc42d585859a9527812ecb53a452101977f973badce04e2fdb239d87ad465d4ca81a848dbfde67044031b6df0f4a039
EBUILD gitlab-pages-0.4.4.ebuild 1436 SHA256 8f496c129cd8bff8dca1d882713ed9f460458bb887c34a2926c03e4057e893d6 SHA512 a4c90b718ef63888e454c4a48949a9713dfa44f354556a840f6e78b86e46d90f5c922c83ea3b2b35fdb5ab5168f6cdff1004666e3dba0b6acee95aecde040afb WHIRLPOOL d18824f792e1b541f833e3fcedd049956f8177bd4c5cdf75dc6e6e28aa983be69a7475d82b6a1427a87619d288321533019aad0802cce1bfbc118a1c76644b47
EBUILD gitlab-pages-0.5.1.ebuild 1436 SHA256 4832678c91a3ac6f68894a9512ee60e2037600a26d7883d72bf77857781c823f SHA512 9395ed1bed70268b5db9540491a2b16bad0f85aaf2b0f32c3307cc0f1acbbb7aa59b44d059d45621dac9ee7d1bf97b4fe0b3f8083001099b09a14b358c52ae37 WHIRLPOOL b3fc7ad05039d1a0e652ed0224c3e6ff76d4ae9bf1ef8114503e7cb73cb35a0e4de7550a06b108ee284e294e31c691872d6587ca58ebf6a9bed6b169de391903
EBUILD gitlab-pages-0.6.0.ebuild 1449 SHA256 222470c87b9b2746fc32f6524f5b97f898b7d872eb68ad6f46234a34631a2d6a SHA512 097bb10d29c4304b86d1e492a24c68c34ebda1df606306a3802896884d65a27eda0f1264198e71da57e8ce9aa94be70c5dfb8639c87e814af46c094c83c1a059 WHIRLPOOL 8476550cddec6c25a2dacebfbb8043d2237c0a0c235509039dc9296de7175859ca4b7919ac10a20052190e8bc10287e08938efb92c4dae9fda461278ae5d14be
MISC ChangeLog 2227 SHA256 c1084119d1a8d5b58d8916b3c8270cfb8aced8d761c777b4be7c9ec942914ff0 SHA512 d66a020879462cacba6ed0e7118db12426b5d5ec3256dbc4dca78e80db87bf513b900557f672c4445734970435184b50790b3b9fe90ba930ef4e6cf526e82cd6 WHIRLPOOL 5b95f489d4cf4f3f278c3277efda3482da83b527fc23c2036c635145fb8ac77d21ed9299646295438aacc88a410e796d6e5c9f73561941731a6fa9019c73b8f9
MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1