From 68a277298f2770837a51677b497059a965a82251 Mon Sep 17 00:00:00 2001 From: Leonardo Neumann Date: Mon, 20 Sep 2021 11:13:19 -0300 Subject: [PATCH 01/11] dev-util/rust-analyzer: add 20210920, drop 20210906 Package-Manager: Portage-3.0.23, Repoman-3.0.3 Signed-off-by: Leonardo Neumann --- dev-util/rust-analyzer/Manifest | 11 ++--------- ...06.ebuild => rust-analyzer-20210920.ebuild} | 18 +++++++++--------- 2 files changed, 11 insertions(+), 18 deletions(-) rename dev-util/rust-analyzer/{rust-analyzer-20210906.ebuild => rust-analyzer-20210920.ebuild} (95%) diff --git a/dev-util/rust-analyzer/Manifest b/dev-util/rust-analyzer/Manifest index 87d3ff8751..8247858365 100644 --- a/dev-util/rust-analyzer/Manifest +++ b/dev-util/rust-analyzer/Manifest @@ -15,13 +15,9 @@ DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a310 DIST cargo_metadata-0.14.0.crate 17008 BLAKE2B 00fd6841170d5dae463a60daf442eb3033d616ab171dfb7efc201596196571b06df83f6ab23e88397c77baf3135745bc3ac6051557ebad2c3ea96440f00e1d2b SHA512 d33f691d56df56bdea260363cd29864b17f0326b90b4b9688781c37d3eba4437b93b48e6448dc1d012a8542d7d2495f0acb73322340269db9cc4a4aa955f9605 DIST cc-1.0.70.crate 57200 BLAKE2B 196b0435c8a521a02e9877ed3ff81fbefa88cd56717556776b46366bad1835bff134a1b4fc4e31ee5497600e98d1031119d0973b420cf16aece1ff18fbdcd1bc SHA512 9158eabcb9405fa2ef41fb120821ddaa2e5c7234c02d5cfbb5b59570f7de393d1fa33942ca52f86bf9271765b3df934debdea89e7563cbfe193dc01b2dcd72f9 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST chalk-derive-0.70.0.crate 3467 BLAKE2B ba9f5565aa5586029aff0bf9311109e3d5f2835d1bb44c591b01d895e5352c51d56543a321b4fd1d549f2fb5b769be09bb0de0400aac5051c759ab4e80d86952 SHA512 68a531f496d2cc40d9c6dade868d9595db382c7d5264c09a52611755d84b0a76b0e0ad1a3d82cf8c3df274f3a2fe3ff1b1e9b5a4211bfedce80234e804e8b569 DIST chalk-derive-0.71.0.crate 3467 BLAKE2B 85f4cbcb5185487c760e9fc35a661ce9c66f8b4e0b4240a854e72257f891d86461033c47d1a8947b64bab27c8741127f528ab832499ae9c1cb781ccc1e15bf86 SHA512 1175b1f7b8039abc8ad2be5eb1a64dee98949fcb382da5911c9104ad34c724d56bac75f9d7e5cd149916679e5e7830b7003de9b60e4634b6f7f85547a7feb36c -DIST chalk-ir-0.70.0.crate 51627 BLAKE2B f3ceb86113d2c198079161411cb500b953221d9503c9a37240d70224f566cc394c8b346cb0a5439078796e9109c9d68b59337d480b3773d994829f0bfe9a5054 SHA512 a3858e0b394e80c278c5117aca2d705e1e5f973e063de12edace6d15afb20f904022130cd86a97b94956b7acbabe96ef33ea11c3425682ccd681dc03d42e181e DIST chalk-ir-0.71.0.crate 51631 BLAKE2B 25555ea9c4d2f63083bcc9fd9afb92e898706200348fa4ccc17a5c098c5d6efb6e627aea0eff8b487fb32eb69e7bec05ed2fb9a14367c80cab46948d90dfa5e6 SHA512 8253718eab8b273c4c2dbe6da69afbc28123dce2402e9da2f19fcca21ffd7d293da00b7e7c10d28f804d1639b4f539fa77b97cc6ef7ee4c11042c4e872e9404d -DIST chalk-recursive-0.70.0.crate 14668 BLAKE2B 4c67797d46ee37c93855c6e62a39e9dd339df68c2470517b2569e609f396235bc1905cf344f2443b661ecb1c298f25fd6c6f7565eb051b768a6341965ecb02f0 SHA512 257d377bc27f5151f0193ff8cc95f467b8b1083e09e2166674de0108d396f8d7609a6988dbb78e851d211a88cbf2a85926a496892280ca6603df8290158f9ac5 DIST chalk-recursive-0.71.0.crate 14672 BLAKE2B dda86dd99a9f87c3200b97535e8a655bbc9ece382b4180bbc019eb62d0b8590fd4b5cda62e3dfdcd2dab17ecaa022453a2852a6817578394ef7941fd39b17c94 SHA512 bf61c410a3c772e1e0aaebe86074d1c8b58b3bc2d13fc372768bbb8131b0fc9e62019c6f9d9832425a46b1a3ea054a4d2ac9bae30fe6448885267f62ca8ff33e -DIST chalk-solve-0.70.0.crate 97159 BLAKE2B 53478279a529c1e25446b0c6c1a909bdc32d843ef85ed56b4c543363e721898768cc4d0071b166ababd0b8026f631c1e45e32393c28b04f5aa80e97018025921 SHA512 538ad1a74f930a57a91891fb631c523e225feb1794d076d40e5ba4dbed65f33aa5decde41773d2153ac1c7dc03562e21f42650878eb6e026f7bd338d42cf6f25 DIST chalk-solve-0.71.0.crate 97603 BLAKE2B 5bf2345f53f00d34b7a912be8fb8b426cc456e2f8e8b1940d8a821cbb67ea6e2b1231d77a4ccec6905d3381d65edd40088ce7f292913802e7758eb86324508ed SHA512 3fe95690426d7a16e3fc227263f3757d6e5b7f71dcd8c558cd1676a0bf87806f1eff81c17386fbb7eccdfe5c6a1b0e102eb7df5555a1078f9177433cdcc5a4ce DIST countme-2.0.4.crate 9128 BLAKE2B 07841d1db911757deb4624948631a642f183bcc0e4b48b9742f9f4c5c9f21c317ab8bf2078087a412ef29547fc517036ec3c7960ff8f65951be358be282cfaeb SHA512 34181504348d1309963ca83f9fd7abdab1e2860e62f7412dec3b30ec2b4e093de080aeca0c8c9cb94733ffc12033c127c895c132b85ed634af8cbd58ce3e7d88 DIST cov-mark-2.0.0-pre.1.crate 8324 BLAKE2B ea1acdf5ca1e7d88445a7b532368b96eb36f432342dabea3398c40541fa7cbdb3b91e83c47f58afe1d9a79f143f5bf80a40e6b59139f767ed0bd77370ff6c108 SHA512 c0057dc9ba4949f35842de756ed7a9af84a61ff19d4bf53551d0a85596ab7ea8468f9ef9abfd4059a2e7bb39f02c4923996d4da5809d5ea67479bb80cad3bb8e @@ -93,7 +89,6 @@ DIST petgraph-0.5.1.crate 147173 BLAKE2B 3b74b2965ecdb37a82439111ad849581254698c DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749 DIST proc-macro2-1.0.29.crate 38772 BLAKE2B 742c2602afc4beddc96b688d105fd93b1dbdb3cfced724aaf542e97120d374d334e90cfbf02ab62741dd052a272dc583b7d2e1992da3d1b8ff260414c65ac89e SHA512 b3b3b7c6988afeb92209c7e0362f45f9c207611a74bb63bc7746b86fb9ab0d74fea9e7a2d9bc8ac943225ea439540726ffc13711dc5bcb056c1821fc99e8dc63 DIST pulldown-cmark-0.8.0.crate 106330 BLAKE2B bb59298b605993530e2363f3264c3ac1104ec57885c2dd183dcdf3aa9dc613999d24caeb86848ca3542544238aaa4eb49d5a6599d2fdef53af50b5dbead68e22 SHA512 396ade131c0a74cdfb8454e137e41c21f0b81b7cce654ba6ae9ceb132ba0fa0a467a190e6dd69cd7d59a267efbe83f008c9c8a5c9db47665aabc31a4bb9cb967 -DIST pulldown-cmark-to-cmark-6.0.2.crate 7957 BLAKE2B 17a36363d8cdd9d27c594b702c3523b8e8d81dfadf2bf748dbae29cb3f48d04fa9acb2f0254d778d87bcd21b0bb796e42653e83ae37544f1b0e685a93478f94f SHA512 9e59a23f945c4edf4c2f6d467fd37cd648ba797f9159500e13acc1854c9013c6abd264b36c027d7372eeaad404596d6704e27ea06e84533b22c4352900e6d840 DIST pulldown-cmark-to-cmark-6.0.3.crate 8021 BLAKE2B 86d41b16686497564c53469b4634d5eb3d1c28013c59e379b466f597c6ce780af62cff63f647fd3438199e6866e82208b62a6515c194f127205c3b8333c7d251 SHA512 e88d32fb85e6a5145285aac9e41c158f3abc67d42f4d631ca16fbb77a728d1d25c5d83d1592a75b4eb6e46e34bbc012ec92712b5ec2190eb05acafa4fadf2e0d DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8 DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9 @@ -103,8 +98,9 @@ DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5 DIST rowan-0.13.2.crate 37340 BLAKE2B b929b1fc2bd34cebaa4a249c256213123bee2b51c4e7feb713877314e94d2e14643a2360b36c6254ea0e0885edc2494806ea383cb4b668c5f209145eadae7754 SHA512 348e2326e3302af4c5d435e885c25330344c77533c4ce705ed029b4951fa1bf24cd181e370eb27829334170eee9cf177ccfe1d0385af4a0b3fe9e84aa14f0bca -DIST rust-analyzer-20210906.tar.gz 2061390 BLAKE2B feb1d054d6daae029cdfb173de89537e2c0f8b5a86b6253d73a3d82239c311925b08ce95f46a72502c1539c99bda99b29ba0231c7dadb25c04f166b17f8912a3 SHA512 ebac10561cb08face3da23dd4e6104dcb88f5565502a70920396999b5949c69794b507a90733d24e5755265bf21be0a199d9126ff7e780ef6cfeeba5b61e5f2f +DIST rowan-0.14.0.crate 37392 BLAKE2B 0431b1a5ef7b3b666fffbde1aec9969dc01dc889a8d251dc3beb6f3cd03213bd5f3e93bd47baa9987a166e5f924c0bb90796c83660c73c215aa31d29020087f0 SHA512 b152697515b461459c9fbb3e5f7400cf9c03df45fad67b51d17ad265819645e17bb154a438f6675f496b25d76cc858bc27639adb505fcd94c9b5db2817aa5e75 DIST rust-analyzer-20210913.tar.gz 2063610 BLAKE2B 47417035fdfbea7fdc7b8cca95545733ef6abd3e540c670512f0b5fba4637d0b7ea8298b4812c59bd4ace8673ca14776bcb4b3983d8f77dcc79bddeb85c7beb7 SHA512 cfe65484cd98cbdf2fe889fcb5985661b6f91b0f1c78ab4d8a891cbaf13fcae7f87654b378a40cf8daad7e1b6115a17a366854e823f65848129d7fa1a6c601d7 +DIST rust-analyzer-20210920.tar.gz 2070659 BLAKE2B 56fe7752601527ca472353729e8442cf9a61952484e80cfc998c0fa729d9227b83158dfd11e78ae6b38d46595f1f4441fd881b3f0f629f4e7b964d570193a73a SHA512 7663432c84156038e22021093918801ef14164f5bb923eb0c81ec2e704bb6cc5bb0a82531e61e5ca323f127f8d0e4e92a3df2b4d31a663f8cf36038927660c42 DIST rustc-ap-rustc_lexer-725.0.0.crate 14086 BLAKE2B f918e3a6f1dceca79aaca92b919b4c013fc0ec4df0a1ef0482c26656e7e05766ec73305a7e8a32e24e5337d7e204d67d3cc9e091f182b19dd4f53deed8687ea4 SHA512 4239c4762d7ca351698be015ab251193f65487bda73a9dfaae5788e5b8395656c12d7f9cb5ee16cbd8c03dd5b9828dfb7d507498f40dc83d6a85ed3d59cc657a DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544 @@ -140,7 +136,6 @@ DIST tracing-core-0.1.19.crate 50079 BLAKE2B 4eb551d147eb17d96f9248dc780ebb305c6 DIST tracing-log-0.1.2.crate 14915 BLAKE2B 72967c7262a8fb2b1b9c693ae19d84424a037e09b9f1b1b94852e39caa0a0ca30c846b2cfcf94b378c9ccd2aab67af2e4809e2e733d22f173cd57a3842a022fa SHA512 c4e146026ea7b27e79c630da9994dfafb90f9bdd581f51cbd5a5f985b0e60b2412937214e0365203148eb91f0a5ef3644e64757dadaa10287a097ad85989b620 DIST tracing-subscriber-0.2.20.crate 109378 BLAKE2B 95a64ccc0daf2e3f66f372e9bfef4998da7f0d84343993c476743ddf3d3cb1e00de1dfae2afbaa6eaa677eb40ca2e61fbe7a8e3f570012357ebe6a04371cba16 SHA512 c002aa312e09a452bc65c3f3cdd07770a9cd296775daae8c720b431a966b1e185a621606a39cab6922b952957fe8b6b82cc058d55101ddc1623420dbc5049d3a DIST tracing-tree-0.1.10.crate 12828 BLAKE2B 13a8c7f6c544ea1975d8301d42e899eff717597de8659335eba6cd9a6d2f13cbe3e2e49d6943a6a73bb0d1a448e5f9f542dae5144d41911f1f9191cf782f393b SHA512 42d1fb14fb0a01aa3eed5a9aa6aa4dcb6439ebf5e32ebfcf85c416e0007be13952cc223ea15665bbb5fab2138593bb7ec315689bf8fc03a3dc45899672e63af9 -DIST tracing-tree-0.1.9.crate 13127 BLAKE2B 801d3dc725e4cbcdf45d201775ed8ac977befeabec08e9506ed89b9c224e56ec0f6e3371257dadeedb66b414c8ca87f647735b540bd548456f411b4b2ea1bb4d SHA512 dd817f757b8a9596086aca503c8ed16007bb3cb20025ac3e81b3fa1d823eedfcb597245a08f01ccd179b651d1c7dcc5a6973a545652c048047344f8ea83f519e DIST ungrammar-1.14.4.crate 8254 BLAKE2B 8b12ebc4e6eae5123b9935335591b2738b63afd51d90316582a4b1a6e0d729146831dd870f5fb6292cba944f6771507a78de3a8fd4984b1a7bfbf4380dab5f35 SHA512 54ec2ac2ba6f1c531389ab34aea72a48ac93a50284a6dcb027d6fa368c47fbfa14fc886031f983ef9d1a5e260ca189e860f6c9230914bbb730751deb9af12d8b DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188 DIST unicode-bidi-0.3.6.crate 33737 BLAKE2B 90cb2d05bcafd32a237b747e290f3dba186d069845e50ffdcd7e62a2ddd73f4e8fc27ad972d86453ff375fab50fd5ec47ac323413e351fb7d4b80f1536519d7f SHA512 a1013539b0da1609d9c37cc1d8359efa93bd88b4ae176d25398e6c44d93b615835a54b184641f00313b14cf46542b1e92278b0dc1bd00dfca0566467b21857e7 @@ -157,7 +152,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e DIST write-json-0.1.2.crate 7414 BLAKE2B 8527f2f2db543a5866e4dff949b1c67f73f901a2bc819199b4e4cbe70ceca6e4f801d08cc037e95b56b1f469d6859b3a9bd9bcdb4d4deeca90072e00496b9f86 SHA512 80d34868d5ac6858de9850385d24294d8b3d2a743207ce148cc0dfee64cdccecc85c69de0ff06bb74629cbaba5f4c69c2a934afc43f6121b5ee3ab5eb034b80e DIST xflags-0.2.3.crate 9943 BLAKE2B 611d0e7ddb75467ba13512355b775c4872b766a17db64ec3f525d09318c91155f1759c5eae79146be4a1a52df702dc3a77cf5807dfac8f97a1a8534338895438 SHA512 3026e3dae3c8a256564d4520f64f933ffcb89539128dcc43351bcdf89c5e0ff9b0ba14ea94512eadd58a3498dbab4529297eb1a3eddfaf8d3bca188e41294c31 DIST xflags-macros-0.2.3.crate 10622 BLAKE2B f3534240a13e51a8e7b3fc3b9c8d3f5ad7fe30faa155da4517ca0d9469f25443c112f0a4d7b2b3dda8b5ddf000b23b06e599f8e60b3e2b73588fe81a31144530 SHA512 4c0ff0304140db4bf5360ad7f7b7185c081641ff995bdf95fa597d8e7940ee0ea5eaf741b1b7e959cadd1a1a3e79ebab410bffb42e810848d3612ac59e2ffb35 -DIST xshell-0.1.15.crate 20590 BLAKE2B a845fe30515e14f3531d2e86979ffdb5b213ce8e4ff5a10cc89a8b92646ecd087a30fed69753ba25279e625cdc16810e5fd96bb8ab46eee69d18d97cefae0881 SHA512 090fd8d13d8c83f418280c925ac356e76ea3de4ea3a0e4a64ca12b3428a723d8e920ae962e23806485f53af2e939329fda45042be0f6fa914224df0f252a1ac4 DIST xshell-0.1.17.crate 21019 BLAKE2B c95a09f86b5a0b11f036f9e9f5ee2d925eb3a5ea76d1d168dd5a117a2e56f130edb84b4989e342ddbfedf8a963a955cea86bb0064ae0a6ded81d1d4beb74beec SHA512 534b4c4ba6cb424e60ac4bf0def6e51d5738e4e0f982ac319b5bf7b4cb6fae67505b6db0f9778b57149258a71d1df51e4ded029d79627dc64c394da832f147f2 -DIST xshell-macros-0.1.15.crate 2678 BLAKE2B 0ede1eb447a116f40b9e60284b4cb7513b61bc9e373f1d612377703c021056f3097f6b4b17b9f2173ed180fdca6814a6800e1ed17e848f448e1b85b86d6bbd5e SHA512 e226c2947d998af878df48bd285a1cacc4f6e46a2776343de8a86f362432a47b1ad1b970c82a117b7a7364450e576bd55b9d3f828cda96efa1c96fd610563dd5 DIST xshell-macros-0.1.17.crate 2682 BLAKE2B 8c79a2d499e7e12f56cf2801518159f26df2c70f0b7c4a6c5ff072e7f981fbc314a429a56c89ce89b74091f7e14888088da7c8e51e458e1d709e3ef6f0361810 SHA512 838f8bfc530051d8fe6c1b2a3c8e2fe7c6946705d6e6a084807b35817d5d6bae6f2941cb97a47fdf5c970aa3f4baef222aac938039bb520aadbb3fd7fd1a7bf7 diff --git a/dev-util/rust-analyzer/rust-analyzer-20210906.ebuild b/dev-util/rust-analyzer/rust-analyzer-20210920.ebuild similarity index 95% rename from dev-util/rust-analyzer/rust-analyzer-20210906.ebuild rename to dev-util/rust-analyzer/rust-analyzer-20210920.ebuild index 7eab8b90a2..eb62aa50c2 100644 --- a/dev-util/rust-analyzer/rust-analyzer-20210906.ebuild +++ b/dev-util/rust-analyzer/rust-analyzer-20210920.ebuild @@ -21,10 +21,10 @@ CRATES=" cargo_metadata-0.14.0 cc-1.0.70 cfg-if-1.0.0 - chalk-derive-0.70.0 - chalk-ir-0.70.0 - chalk-recursive-0.70.0 - chalk-solve-0.70.0 + chalk-derive-0.71.0 + chalk-ir-0.71.0 + chalk-recursive-0.71.0 + chalk-solve-0.71.0 countme-2.0.4 cov-mark-2.0.0-pre.1 crc32fast-1.2.1 @@ -95,7 +95,7 @@ CRATES=" pin-project-lite-0.2.7 proc-macro2-1.0.29 pulldown-cmark-0.8.0 - pulldown-cmark-to-cmark-6.0.2 + pulldown-cmark-to-cmark-6.0.3 quote-1.0.9 rayon-1.5.1 rayon-core-1.9.1 @@ -103,7 +103,7 @@ CRATES=" regex-1.5.4 regex-automata-0.1.10 regex-syntax-0.6.25 - rowan-0.13.2 + rowan-0.14.0 rustc-ap-rustc_lexer-725.0.0 rustc-demangle-0.1.21 rustc-hash-1.1.0 @@ -138,7 +138,7 @@ CRATES=" tracing-core-0.1.19 tracing-log-0.1.2 tracing-subscriber-0.2.20 - tracing-tree-0.1.9 + tracing-tree-0.1.10 ungrammar-1.14.4 unicase-2.6.0 unicode-bidi-0.3.6 @@ -155,8 +155,8 @@ CRATES=" write-json-0.1.2 xflags-0.2.3 xflags-macros-0.2.3 - xshell-0.1.15 - xshell-macros-0.1.15 + xshell-0.1.17 + xshell-macros-0.1.17 " inherit cargo From 9e3dfe0d5b671e27c43cc82a01161b1bdd0ab69a Mon Sep 17 00:00:00 2001 From: Adel KARA SLIMANE Date: Mon, 20 Sep 2021 16:16:57 +0200 Subject: [PATCH 02/11] media-video/obs-vkcapture: fix dependencies Closes: https://bugs.gentoo.org/814035 Signed-off-by: Adel KARA SLIMANE --- media-video/obs-vkcapture/obs-vkcapture-1.0.ebuild | 9 ++++++--- media-video/obs-vkcapture/obs-vkcapture-9999.ebuild | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/media-video/obs-vkcapture/obs-vkcapture-1.0.ebuild b/media-video/obs-vkcapture/obs-vkcapture-1.0.ebuild index 8c56b7ca38..302d654963 100644 --- a/media-video/obs-vkcapture/obs-vkcapture-1.0.ebuild +++ b/media-video/obs-vkcapture/obs-vkcapture-1.0.ebuild @@ -22,14 +22,17 @@ LICENSE="GPL-2" SLOT="0" IUSE="" -DEPEND=" +BDEPEND=" dev-util/vulkan-headers + media-libs/shaderc + media-libs/vulkan-loader + >=media-video/obs-studio-27 +" +RDEPEND=" media-libs/libglvnd - media-libs/mesa[vulkan] >=media-video/obs-studio-27 x11-libs/libxcb:= " -RDEPEND="${DEPEND}" src_unpack() { default diff --git a/media-video/obs-vkcapture/obs-vkcapture-9999.ebuild b/media-video/obs-vkcapture/obs-vkcapture-9999.ebuild index 8c56b7ca38..302d654963 100644 --- a/media-video/obs-vkcapture/obs-vkcapture-9999.ebuild +++ b/media-video/obs-vkcapture/obs-vkcapture-9999.ebuild @@ -22,14 +22,17 @@ LICENSE="GPL-2" SLOT="0" IUSE="" -DEPEND=" +BDEPEND=" dev-util/vulkan-headers + media-libs/shaderc + media-libs/vulkan-loader + >=media-video/obs-studio-27 +" +RDEPEND=" media-libs/libglvnd - media-libs/mesa[vulkan] >=media-video/obs-studio-27 x11-libs/libxcb:= " -RDEPEND="${DEPEND}" src_unpack() { default From ba2acb35c8690458ae883c579778377d502a397b Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Mon, 20 Sep 2021 16:12:32 +0200 Subject: [PATCH 03/11] app-emulation/dxvk-bin: Version bump 1.9.2 Signed-off-by: Ronny (tastytea) Gutbrod --- app-emulation/dxvk-bin/Manifest | 1 + app-emulation/dxvk-bin/dxvk-bin-1.9.2.ebuild | 73 ++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 app-emulation/dxvk-bin/dxvk-bin-1.9.2.ebuild diff --git a/app-emulation/dxvk-bin/Manifest b/app-emulation/dxvk-bin/Manifest index f7159ed899..ff629e47ed 100644 --- a/app-emulation/dxvk-bin/Manifest +++ b/app-emulation/dxvk-bin/Manifest @@ -1,2 +1,3 @@ DIST dxvk-bin-1.9.1.tar.gz 8130256 BLAKE2B 50e49c69f7f43df09098e9c65089826cc4bb92bab53aeb9e07c2876fa1c07c04b600ca0598c790fb4eab6b076cc61f815e8566f6c0adbd6fc5462862fee19324 SHA512 4ab2be529c295ace85ac5731053e894383f72cb1b601b74a6fcfb581fb61568657a7e7f6842f5af1339a58ab57e33e79209f63e659732bd9774f956be2d88b31 +DIST dxvk-bin-1.9.2.tar.gz 8141894 BLAKE2B 69fbecc6328e00aea6196144762dbbcac4d6c1b66b91ed11477a4f533977b950caf26f113f120a9c60d75ac91d974499ce24822862df394ded7f2e24c42f4448 SHA512 5f5fcba0b36270f9c5bb52ae62b3fa4acf0d865b63a1b48c05ab6901ccd716f8b71399773eb2d4fbf66e7606322de1598aebf4414138a73ee1063c77382dd444 DIST dxvk-bin-1.9.tar.gz 8111449 BLAKE2B 3800f38b26ba72fa22b59ce94f64b5cbdacefcad3515fb0c769f672c6add7d8c040e871ec412d11637bf3cbfcd30930c5a6c47917a00ce8c90e1c1d6a23197d2 SHA512 d8fadd0e88ebc11e281b75b59bb980ac8908ea5ce1c7e5849c557cd7eb257ff125b54351adbc9b04241ff2a72705f3a5fa5a9598bf571503a5808b80708f16c5 diff --git a/app-emulation/dxvk-bin/dxvk-bin-1.9.2.ebuild b/app-emulation/dxvk-bin/dxvk-bin-1.9.2.ebuild new file mode 100644 index 0000000000..2db44fbf3b --- /dev/null +++ b/app-emulation/dxvk-bin/dxvk-bin-1.9.2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MULTILIB_COMPAT=( abi_x86_{32,64} ) +inherit multilib-minimal + +MY_P="dxvk-${PV}" +DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine" +HOMEPAGE="https://github.com/doitsujin/dxvk" +SRC_URI="https://github.com/doitsujin/dxvk/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64" +IUSE="video_cards_nvidia" + +DEPEND="" +RDEPEND=" + || ( + video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-440.31 ) + >=media-libs/mesa-20.2 + ) + || ( + >=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP},vulkan] + >=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP},vulkan] + ) +" + +S="${WORKDIR}/${MY_P}" + +# NOTE: Various repos contain dxvk ebuilds that install into …/dxvk. +# To not clash with them, this ebuild installs into …/dxvk-bin. + +src_prepare() { + default + + sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die + + # Delete installation instructions for unused ABIs. + if ! use abi_x86_64; then + sed -i '/installFile "$win64_sys_path"/d' setup_dxvk.sh || die + fi + if ! use abi_x86_32; then + sed -i '/installFile "$win32_sys_path"/d' setup_dxvk.sh || die + fi + + fix_install_dir() { + local bits="${MULTILIB_ABI_FLAG:8:2}" + # Fix installation directory. + sed -i "s|\"x${bits}\"|\"usr/$(get_libdir)/dxvk-bin\"|" \ + setup_dxvk.sh || die + } + multilib_foreach_abi fix_install_dir +} + +multilib_src_install() { + local bits="${MULTILIB_ABI_FLAG:8:2}" + insinto "usr/$(get_libdir)/dxvk-bin" + insopts --mode=755 + doins "${S}/x${bits}/"*.dll +} + +multilib_src_install_all() { + newbin setup_dxvk.sh setup_dxvk-bin.sh +} + +pkg_postinst() { + elog "dxvk-bin is installed, but not activated. You have to create DLL overrides" + elog "in order to make use of it. To do so, set WINEPREFIX and execute" + elog "setup_dxvk-bin.sh install --symlink." +} From 4d165314b0ac41aea3f870934e671d67dabcda59 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Mon, 20 Sep 2021 16:15:56 +0200 Subject: [PATCH 04/11] app-emulation/dxvk-bin: Remove old ebuild Signed-off-by: Ronny (tastytea) Gutbrod --- app-emulation/dxvk-bin/Manifest | 1 - app-emulation/dxvk-bin/dxvk-bin-1.9.ebuild | 73 ---------------------- 2 files changed, 74 deletions(-) delete mode 100644 app-emulation/dxvk-bin/dxvk-bin-1.9.ebuild diff --git a/app-emulation/dxvk-bin/Manifest b/app-emulation/dxvk-bin/Manifest index ff629e47ed..56dc4295b8 100644 --- a/app-emulation/dxvk-bin/Manifest +++ b/app-emulation/dxvk-bin/Manifest @@ -1,3 +1,2 @@ DIST dxvk-bin-1.9.1.tar.gz 8130256 BLAKE2B 50e49c69f7f43df09098e9c65089826cc4bb92bab53aeb9e07c2876fa1c07c04b600ca0598c790fb4eab6b076cc61f815e8566f6c0adbd6fc5462862fee19324 SHA512 4ab2be529c295ace85ac5731053e894383f72cb1b601b74a6fcfb581fb61568657a7e7f6842f5af1339a58ab57e33e79209f63e659732bd9774f956be2d88b31 DIST dxvk-bin-1.9.2.tar.gz 8141894 BLAKE2B 69fbecc6328e00aea6196144762dbbcac4d6c1b66b91ed11477a4f533977b950caf26f113f120a9c60d75ac91d974499ce24822862df394ded7f2e24c42f4448 SHA512 5f5fcba0b36270f9c5bb52ae62b3fa4acf0d865b63a1b48c05ab6901ccd716f8b71399773eb2d4fbf66e7606322de1598aebf4414138a73ee1063c77382dd444 -DIST dxvk-bin-1.9.tar.gz 8111449 BLAKE2B 3800f38b26ba72fa22b59ce94f64b5cbdacefcad3515fb0c769f672c6add7d8c040e871ec412d11637bf3cbfcd30930c5a6c47917a00ce8c90e1c1d6a23197d2 SHA512 d8fadd0e88ebc11e281b75b59bb980ac8908ea5ce1c7e5849c557cd7eb257ff125b54351adbc9b04241ff2a72705f3a5fa5a9598bf571503a5808b80708f16c5 diff --git a/app-emulation/dxvk-bin/dxvk-bin-1.9.ebuild b/app-emulation/dxvk-bin/dxvk-bin-1.9.ebuild deleted file mode 100644 index 44679c85be..0000000000 --- a/app-emulation/dxvk-bin/dxvk-bin-1.9.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit multilib-minimal - -MY_P="dxvk-${PV}" -DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine" -HOMEPAGE="https://github.com/doitsujin/dxvk" -SRC_URI="https://github.com/doitsujin/dxvk/releases/download/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64" -IUSE="video_cards_nvidia" - -DEPEND="" -RDEPEND=" - || ( - video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-440.31 ) - >=media-libs/mesa-20.2 - ) - || ( - >=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP},vulkan] - >=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP},vulkan] - ) -" - -S="${WORKDIR}/${MY_P}" - -# NOTE: Various repos contain dxvk ebuilds that install into …/dxvk. -# To not clash with them, this ebuild installs into …/dxvk-bin. - -src_prepare() { - default - - sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die - - # Delete installation instructions for unused ABIs. - if ! use abi_x86_64; then - sed -i '/installFile "$win64_sys_path"/d' setup_dxvk.sh || die - fi - if ! use abi_x86_32; then - sed -i '/installFile "$win32_sys_path"/d' setup_dxvk.sh || die - fi - - fix_install_dir() { - local bits="${MULTILIB_ABI_FLAG:8:2}" - # Fix installation directory. - sed -i "s|\"x${bits}\"|\"usr/$(get_libdir)/dxvk-bin\"|" \ - setup_dxvk.sh || die - } - multilib_foreach_abi fix_install_dir -} - -multilib_src_install() { - local bits="${MULTILIB_ABI_FLAG:8:2}" - insinto "usr/$(get_libdir)/dxvk-bin" - insopts --mode=755 - doins "${S}/x${bits}/"*.dll -} - -multilib_src_install_all() { - newbin setup_dxvk.sh setup_dxvk-bin.sh -} - -pkg_postinst() { - elog "dxvk-bin is installed, but not activated. You have to create DLL overrides" - elog "in order to make use of it. To do so, set WINEPREFIX and execute" - elog "setup_dxvk-bin.sh install --symlink." -} From 230ae6504e8044193141d4455eff013e56e7aebe Mon Sep 17 00:00:00 2001 From: Adrian Schollmeyer Date: Mon, 20 Sep 2021 16:28:11 +0200 Subject: [PATCH 05/11] net-libs/ixwebsocket: Add new package Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer --- net-libs/ixwebsocket/Manifest | 1 + .../ixwebsocket-11.2.8-remove-deflate.patch | 19 ++++++ ...ebsocket-11.2.8-remove-network-tests.patch | 28 +++++++++ ...xwebsocket-11.2.8-use-gnuinstalldirs.patch | 34 ++++++++++ ...ixwebsocket-11.2.8-use-system-spdlog.patch | 55 ++++++++++++++++ .../ixwebsocket/ixwebsocket-11.2.8.ebuild | 62 +++++++++++++++++++ net-libs/ixwebsocket/metadata.xml | 11 ++++ 7 files changed, 210 insertions(+) create mode 100644 net-libs/ixwebsocket/Manifest create mode 100644 net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-deflate.patch create mode 100644 net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-network-tests.patch create mode 100644 net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-gnuinstalldirs.patch create mode 100644 net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-system-spdlog.patch create mode 100644 net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild create mode 100644 net-libs/ixwebsocket/metadata.xml diff --git a/net-libs/ixwebsocket/Manifest b/net-libs/ixwebsocket/Manifest new file mode 100644 index 0000000000..a2f68d56b8 --- /dev/null +++ b/net-libs/ixwebsocket/Manifest @@ -0,0 +1 @@ +DIST ixwebsocket-11.2.8.tar.gz 583075 BLAKE2B 014af74ec236a49b8bad574761e6d861348ef22f3cbda798862f87591c27c2ee8b94f740d534ed7f6fc0736ea2e06788c64a208dab65575aa815d40472c6c50d SHA512 7938c2b59b5f310afa1a0c94171dd55a4e8821ac0763feb11528d520f1d3bf1037bb8d53d31eec1952888f601f597c00c9490e15cfca7f9c3aa6d80614d7b1f5 diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-deflate.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-deflate.patch new file mode 100644 index 0000000000..fffedc6b77 --- /dev/null +++ b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-deflate.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 77d2f6b..665c35f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -206,14 +206,6 @@ if (USE_ZLIB) + target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_ZLIB) + endif() + +-# brew install libdeflate +-find_package(Deflate) +-if (DEFLATE_FOUND) +- include_directories(${DEFLATE_INCLUDE_DIRS}) +- target_link_libraries(ixwebsocket ${DEFLATE_LIBRARIES}) +- target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_DEFLATE) +-endif() +- + if (WIN32) + target_link_libraries(ixwebsocket wsock32 ws2_32 shlwapi) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-network-tests.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-network-tests.patch new file mode 100644 index 0000000000..a2d1360cb4 --- /dev/null +++ b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-remove-network-tests.patch @@ -0,0 +1,28 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 661aebb..bab73c7 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -11,15 +11,12 @@ option(USE_TLS "Add TLS support" ON) + + # Shared sources + set (TEST_TARGET_NAMES +- IXSocketTest + IXSocketConnectTest + IXWebSocketServerTest + IXWebSocketTestConnectionDisconnection + IXUrlParserTest +- IXHttpClientTest + IXUnityBuildsTest + IXHttpTest +- IXDNSLookupTest + IXWebSocketSubProtocolTest + # IXWebSocketBroadcastTest ## FIXME was depending on cobra / take a broadcast server from ws + IXStrCaseCompareTest +@@ -33,7 +30,6 @@ if (UNIX) + + # Fail on Windows in CI probably because the pathing is wrong and + # some resource files cannot be found +- IXHttpServerTest + IXWebSocketChatTest + ) + endif() diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-gnuinstalldirs.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-gnuinstalldirs.patch new file mode 100644 index 0000000000..a7e2b6ba8e --- /dev/null +++ b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-gnuinstalldirs.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 77d2f6b..4c64106 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -238,23 +238,25 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + target_compile_options(ixwebsocket PRIVATE /MP) + endif() + ++include(GNUInstallDirs) ++ + target_include_directories(ixwebsocket PUBLIC + $ +- $ ++ $ + ) + + set_target_properties(ixwebsocket PROPERTIES PUBLIC_HEADER "${IXWEBSOCKET_HEADERS}") + + install(TARGETS ixwebsocket + EXPORT ixwebsocket +- ARCHIVE DESTINATION lib +- PUBLIC_HEADER DESTINATION include/ixwebsocket/ ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ixwebsocket/ + ) + + install(EXPORT ixwebsocket + FILE ixwebsocket-config.cmake + NAMESPACE ixwebsocket:: +- DESTINATION lib/cmake/ixwebsocket) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ixwebsocket) + + if (USE_WS OR USE_TEST) + include(FetchContent) diff --git a/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-system-spdlog.patch b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-system-spdlog.patch new file mode 100644 index 0000000000..ed329b41de --- /dev/null +++ b/net-libs/ixwebsocket/files/ixwebsocket-11.2.8-use-system-spdlog.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 77d2f6b..86c7172 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -257,13 +257,9 @@ install(EXPORT ixwebsocket + DESTINATION lib/cmake/ixwebsocket) + + if (USE_WS OR USE_TEST) +- include(FetchContent) +- FetchContent_Declare(spdlog +- GIT_REPOSITORY "https://github.com/gabime/spdlog" +- GIT_TAG "v1.8.0" +- GIT_SHALLOW 1) +- +- FetchContent_MakeAvailable(spdlog) ++ find_package(spdlog REQUIRED) ++ find_package(fmt REQUIRED) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSPDLOG_FMT_EXTERNAL") + + if (USE_WS) + add_subdirectory(ws) +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 661aebb..ab0c92e 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -66,7 +66,7 @@ target_include_directories(ixwebsocket_test PRIVATE + ../third_party + ) + target_link_libraries(ixwebsocket_test ixwebsocket) +-target_link_libraries(ixwebsocket_test spdlog) ++target_link_libraries(ixwebsocket_test spdlog::spdlog fmt::fmt) + + foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES}) + add_executable(${TEST_TARGET_NAME} +@@ -89,7 +89,7 @@ foreach(TEST_TARGET_NAME ${TEST_TARGET_NAMES}) + target_link_libraries(${TEST_TARGET_NAME} ixwebsocket_test) + target_link_libraries(${TEST_TARGET_NAME} ixwebsocket) + +- target_link_libraries(${TEST_TARGET_NAME} spdlog) ++ target_link_libraries(${TEST_TARGET_NAME} spdlog fmt) + + add_test(NAME ${TEST_TARGET_NAME} + COMMAND ${TEST_TARGET_NAME} +diff --git a/ws/CMakeLists.txt b/ws/CMakeLists.txt +index 98f15de..10834e5 100644 +--- a/ws/CMakeLists.txt ++++ b/ws/CMakeLists.txt +@@ -31,6 +31,6 @@ add_executable(ws + # library with the most dependencies come first + target_link_libraries(ws ixwebsocket) + +-target_link_libraries(ws spdlog) ++target_link_libraries(ws spdlog::spdlog fmt::fmt) + + install(TARGETS ws RUNTIME DESTINATION bin) diff --git a/net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild new file mode 100644 index 0000000000..43bcde9170 --- /dev/null +++ b/net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild @@ -0,0 +1,62 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +MY_P="IXWebSocket-${PV}" + +DESCRIPTION="C++ websocket client and server library" +HOMEPAGE="https://github.com/machinezone/IXWebSocket" +SRC_URI="https://github.com/machinezone/IXWebSocket/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+ssl test zlib ws" + +DEPEND=" + sys-libs/zlib:= + + ws? ( + >=dev-libs/spdlog-1.8.0:= + ) + test? ( + >=dev-libs/spdlog-1.8.0:= + ) +" +RDEPEND=" + sys-libs/zlib:= +" +BDEPEND="" + +S="${WORKDIR}/${MY_P}" + +RESTRICT="!test? ( test )" + +PATCHES=( + # Upstream installs to hardcoded lib- and include-dirs + "${FILESDIR}/${P}-use-gnuinstalldirs.patch" + # Some tests require network connectivity + "${FILESDIR}/${P}-remove-network-tests.patch" + # Upstream uses git submodules + "${FILESDIR}/${P}-use-system-spdlog.patch" + # Upstream detects deflate dynamically, so let's remove it + "${FILESDIR}/${P}-remove-deflate.patch" +) + +src_configure() { + local mycmakeargs=( + -DUSE_TLS="$(usex ssl)" + -DUSE_ZLIB="$(usex zlib)" + -DUSE_WS="$(usex ws)" + -DUSE_TEST="$(usex test)" + ) + cmake_src_configure +} + +src_test() { + cd "${BUILD_DIR}" || die + ctest --output-on-failure || die +} diff --git a/net-libs/ixwebsocket/metadata.xml b/net-libs/ixwebsocket/metadata.xml new file mode 100644 index 0000000000..1d44d14fb7 --- /dev/null +++ b/net-libs/ixwebsocket/metadata.xml @@ -0,0 +1,11 @@ + + + + + Adrian Schollmeyer + nex+b-g-o@nexadn.de + + + Build the ws utility + + From 950ee2f71daeee5fb2fb56d0acba9470ca15bb83 Mon Sep 17 00:00:00 2001 From: Adrian Schollmeyer Date: Mon, 20 Sep 2021 16:33:29 +0200 Subject: [PATCH 06/11] net-im/abaddon: Add new package Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer --- net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 47 +++++++++++++++++++++++++++++ net-im/abaddon/metadata.xml | 8 +++++ 3 files changed, 56 insertions(+) create mode 100644 net-im/abaddon/Manifest create mode 100644 net-im/abaddon/abaddon-0.1.0.ebuild create mode 100644 net-im/abaddon/metadata.xml diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest new file mode 100644 index 0000000000..a9031ec07d --- /dev/null +++ b/net-im/abaddon/Manifest @@ -0,0 +1 @@ +DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild new file mode 100644 index 0000000000..54be008c51 --- /dev/null +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop git-r3 + +DESCRIPTION="Alternative Discord client using GTK instead of Electron" +HOMEPAGE="https://github.com/uowuo/abaddon" +SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +EGIT_REPO_URI="https://github.com/brofield/simpleini.git" +EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-cpp/gtkmm:3.0= + dev-db/sqlite:3 + net-misc/curl + >=net-libs/ixwebsocket-11.2.8 + sys-libs/zlib:= +" +DEPEND=" + ${RDEPEND} + dev-cpp/nlohmann_json +" +BDEPEND="" + +EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" + +src_unpack() { + default + git-r3_src_unpack +} + +src_install() { + dodoc README.md + + dobin "${BUILD_DIR}"/abaddon + + insinto /usr/share/${PN} + doins -r css res + + make_desktop_entry /usr/bin/${PN} ${PN} +} diff --git a/net-im/abaddon/metadata.xml b/net-im/abaddon/metadata.xml new file mode 100644 index 0000000000..b8439200b0 --- /dev/null +++ b/net-im/abaddon/metadata.xml @@ -0,0 +1,8 @@ + + + + + Adrian Schollmeyer + nex+b-g-o@nexadn.de + + From ecaf6a5d1cee773c8c67a15b1f19b5cfa5e89ca7 Mon Sep 17 00:00:00 2001 From: Adrian Schollmeyer Date: Mon, 20 Sep 2021 16:39:30 +0200 Subject: [PATCH 07/11] net-libs/ixwebsocket: Add missing dependencies Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer --- net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild b/net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild index 43bcde9170..a31363a8cc 100644 --- a/net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild +++ b/net-libs/ixwebsocket/ixwebsocket-11.2.8.ebuild @@ -17,17 +17,26 @@ KEYWORDS="~amd64 ~x86" IUSE="+ssl test zlib ws" DEPEND=" - sys-libs/zlib:= - + ssl? ( + dev-libs/openssl:= + ) ws? ( >=dev-libs/spdlog-1.8.0:= ) + zlib? ( + sys-libs/zlib:= + ) test? ( >=dev-libs/spdlog-1.8.0:= ) " RDEPEND=" - sys-libs/zlib:= + ssl? ( + dev-libs/openssl:= + ) + zlib? ( + sys-libs/zlib:= + ) " BDEPEND="" From 27d10f1ed98688c4761c67670d0c94a9ff6ad4ea Mon Sep 17 00:00:00 2001 From: tiotags Date: Mon, 20 Sep 2021 19:47:12 +0300 Subject: [PATCH 08/11] www-servers/hinsightd: fix config files path Package-Manager: Portage-3.0.23, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu --- www-servers/hinsightd/hinsightd-9999.ebuild | 2 +- www-servers/hinsightd/metadata.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild index 25264fc73e..0248c5caa3 100644 --- a/www-servers/hinsightd/hinsightd-9999.ebuild +++ b/www-servers/hinsightd/hinsightd-9999.ebuild @@ -73,7 +73,7 @@ src_install() { insinto /etc/$PN doins "${S}/workdir/main.lua" doins "${S}/workdir/lib.lua" - doins "${S}/workdir/default_config.lua" + doins -r "${S}/workdir/config/" # logrotate insinto /etc/logrotate.d diff --git a/www-servers/hinsightd/metadata.xml b/www-servers/hinsightd/metadata.xml index 34968a7e2c..1db7cf87d2 100644 --- a/www-servers/hinsightd/metadata.xml +++ b/www-servers/hinsightd/metadata.xml @@ -19,7 +19,7 @@ Enable tls encryption with openssl Enable old/slow cgi support (legacy should not be used) - Enable fast cgi support + Enable fast cgi support (disabling will break the default config) Enable reverse proxying support From fe2095d928cb48d76ee14f5226ba3e03597aa936 Mon Sep 17 00:00:00 2001 From: Adrian Schollmeyer Date: Mon, 20 Sep 2021 19:26:56 +0200 Subject: [PATCH 09/11] sys-process/btop: Bump to version 1.0.2 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Adrian Schollmeyer --- sys-process/btop/Manifest | 2 +- sys-process/btop/{btop-1.0.1.ebuild => btop-1.0.2.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sys-process/btop/{btop-1.0.1.ebuild => btop-1.0.2.ebuild} (100%) diff --git a/sys-process/btop/Manifest b/sys-process/btop/Manifest index f669574494..eeee6acca8 100644 --- a/sys-process/btop/Manifest +++ b/sys-process/btop/Manifest @@ -1 +1 @@ -DIST btop-1.0.1.tar.gz 921264 BLAKE2B a272e9479dbffe18e0000632f9697c5ed59707503c836eafd36f62db55787e56ad4d79a81e699a1821d3630052373daf4568a7096e31385075b1f0db00ed40b4 SHA512 dcbd2daeebf7238e3724f75d1be5a5bc1abf554a938b3a35179d65523098cd74df38cf5d26eea58532ad412805302c6681045ec92df4a860a12c91d7280202ce +DIST btop-1.0.2.tar.gz 921569 BLAKE2B 792f0e9e1e2bf09d3bb98ea9a7a5573f02577dcb40457d00da1edaf1162019650d46327d5534026ec57ea9678623854d3d59d6e27ee76f9c7b2bf330c411a393 SHA512 58bb3c46d4de236a3fc72fb7da42ad9811f25b2122c52103f6f9c670ca2350c188be3d36c38a1216dc35f96638de1bd5691eb027f317a60a220a7dc2053dd02f diff --git a/sys-process/btop/btop-1.0.1.ebuild b/sys-process/btop/btop-1.0.2.ebuild similarity index 100% rename from sys-process/btop/btop-1.0.1.ebuild rename to sys-process/btop/btop-1.0.2.ebuild From 589559e4a035ef7c2fa5000c9eb47ae105842a73 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Mon, 20 Sep 2021 21:26:23 +0300 Subject: [PATCH 10/11] media-sound/tenacity: temporarily remove package As upstream recommends, we should not package tenacity yet. https://github.com/tenacityteam/tenacity/issues/90#issuecomment-901975429 Bug: https://bugs.gentoo.org/810481 Signed-off-by: Arthur Zamarin --- media-sound/tenacity/metadata.xml | 22 ------ media-sound/tenacity/tenacity-9999.ebuild | 84 ----------------------- 2 files changed, 106 deletions(-) delete mode 100644 media-sound/tenacity/metadata.xml delete mode 100644 media-sound/tenacity/tenacity-9999.ebuild diff --git a/media-sound/tenacity/metadata.xml b/media-sound/tenacity/metadata.xml deleted file mode 100644 index f14033f0a4..0000000000 --- a/media-sound/tenacity/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - flewkey@2a03.party - Ryan Fox - - - Enables MIDI support - Enables ID3 tagging with id3tag library - Enables MP3 decoding support - Enables MP2 encoding support - Enables SBSMS timestretching support - Enables SoundTouch timestretching support - Enables VAMP plugin support - Enables LV2 plugin support - Enables VST2 plugin support - - - tenacityteam/tenacity - - diff --git a/media-sound/tenacity/tenacity-9999.ebuild b/media-sound/tenacity/tenacity-9999.ebuild deleted file mode 100644 index 7f13fd04a5..0000000000 --- a/media-sound/tenacity/tenacity-9999.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.0-gtk3" - -inherit git-r3 cmake wxwidgets xdg - -EGIT_REPO_URI="https://github.com/tenacityteam/tenacity.git" - -DESCRIPTION="Audio editor for Linux" -HOMEPAGE="https://tenacityaudio.org/" -LICENSE="GPL-2" -SLOT="0" -IUSE="midi id3tag +mp3 mp2 +ogg +vorbis +flac sbsms soundtouch ffmpeg vamp +lv2 vst2" - -DEPEND=" - dev-db/sqlite - dev-libs/serd - dev-libs/sord - x11-libs/wxGTK:${WX_GTK_VER} - media-libs/libsndfile - media-libs/portaudio - media-libs/soxr - media-sound/lame - sys-libs/zlib - ffmpeg? ( media-video/ffmpeg ) - flac? ( media-libs/flac ) - id3tag? ( media-libs/libid3tag ) - lv2? ( - media-libs/lv2 - media-libs/lilv - media-libs/suil - ) - midi? ( - media-libs/portmidi - media-libs/portsmf - ) - mp2? ( media-sound/twolame ) - mp3? ( media-libs/libmad ) - ogg? ( media-libs/libogg ) - sbsms? ( media-libs/libsbsms ) - soundtouch? ( media-libs/libsoundtouch ) - vamp? ( media-libs/vamp-plugin-sdk ) - vorbis? ( media-libs/libvorbis ) - vst2? ( x11-libs/gtk+[X] ) -" -RDEPEND="${DEPEND}" -BDEPEND="" - -src_prepare() { - sed -i 's/set( CMAKE_BUILD_WITH_INSTALL_RPATH FALSE )/set( CMAKE_BUILD_WITH_INSTALL_RPATH TRUE )/' "${S}/CMakeLists.txt" || die - cmake_src_prepare -} - -src_configure() { - setup-wxwidgets - local mycmakeargs=( - "-DVCPKG=OFF" - "-DMIDI=$(usex midi ON OFF)" - "-DID3TAG=$(usex id3tag ON OFF)" - "-DMP3_DECODING=$(usex mp3 ON OFF)" - "-DMP2_ENCODING=$(usex mp2 ON OFF)" - "-DOGG=$(usex ogg ON OFF)" - "-DVORBIS=$(usex vorbis ON OFF)" - "-DFLAC=$(usex flac ON OFF)" - "-DSBSMS=$(usex sbsms ON OFF)" - "-DSOUNDTOUCH=$(usex soundtouch ON OFF)" - "-DFFMPEG=$(usex ffmpeg ON OFF)" - "-DVAMP=$(usex vamp ON OFF)" - "-DLV2=$(usex lv2 ON OFF)" - "-DVST2=$(usex vst2 ON OFF)" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - # TODO: Improve installation upstream - rm "${ED}/usr/tenacity" || die - mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}" || die - mv "${BUILD_DIR}/lib-src/libnyquist/liblibnyquist.so" "${ED}/usr/$(get_libdir)/${PN}/liblibnyquist.so" || die -} From e9a1e263a237475646e6f38e1d250f65a42ba479 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Mon, 20 Sep 2021 22:00:24 +0300 Subject: [PATCH 11/11] net-im/abaddon: dont use git-r3 Not live packages (non *9999) shouldn't inherit git-r3. We can use GitHub's snapshots to receive a tarball of simpleini at the wanted commit, and then link it in the wanted position by abaddon. Note: here I'm using bundled software, which is discouraged in Gentoo. simpleini should become a new package, on which abaddon depends. Signed-off-by: Arthur Zamarin --- net-im/abaddon/Manifest | 1 + net-im/abaddon/abaddon-0.1.0.ebuild | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index a9031ec07d..b9936a57ad 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1,2 @@ DIST abaddon-0.1.0.tar.gz 12804667 BLAKE2B d158c06050c5bcc394d449d83b59239c1ea41a65ee50f641b3aa1f3f827c404de1b4beae979e76bb06006caa5090b7e9da66925a96b0d124b3a8ac7fc6788474 SHA512 e445d35e121f5e896fbb2355c628060654957cbbc9fcb1855972980dc4f165d16542edd2b1987e5b2088bb48db97c477fbcde7c4237fecd70e929c2492179734 +DIST simpleini.tar.gz 60205 BLAKE2B b72ef78fa3261548188fbd5b971519b64073ea89fde11be1dbdbd850fa72295964fbe22ddd712f7651f833de4a855340e822d9332cf8c48a5ee3821b32e23dd5 SHA512 57b7ab28976fb5e1c54e613fbc9dc6a69054c210927aeba96b00348da0cae75e7ae2764ea5f4e33a842557269eff81522585187d3f1620e779900629db7f59b4 diff --git a/net-im/abaddon/abaddon-0.1.0.ebuild b/net-im/abaddon/abaddon-0.1.0.ebuild index 54be008c51..f987740f99 100644 --- a/net-im/abaddon/abaddon-0.1.0.ebuild +++ b/net-im/abaddon/abaddon-0.1.0.ebuild @@ -3,13 +3,16 @@ EAPI=7 -inherit cmake desktop git-r3 +inherit cmake desktop + +SIMPLEINI_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" DESCRIPTION="Alternative Discord client using GTK instead of Electron" HOMEPAGE="https://github.com/uowuo/abaddon" -SRC_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -EGIT_REPO_URI="https://github.com/brofield/simpleini.git" -EGIT_COMMIT="7bca74f6535a37846162383e52071f380c99a43a" +SRC_URI=" + https://github.com/uowuo/abaddon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/brofield/simpleini/archive/${SIMPLEINI_COMMIT}.tar.gz -> simpleini.tar.gz +" LICENSE="GPL-3" SLOT="0" @@ -28,11 +31,10 @@ DEPEND=" " BDEPEND="" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/thirdparty/simpleini" - src_unpack() { default - git-r3_src_unpack + rm -r "${S}/thirdparty/simpleini" || die + ln -s "../../simpleini-${SIMPLEINI_COMMIT}" "${S}/thirdparty/simpleini" || die } src_install() {