diff --git a/dev-vcs/gitui/Manifest b/dev-vcs/gitui/Manifest index 9289720..a903f3e 100644 --- a/dev-vcs/gitui/Manifest +++ b/dev-vcs/gitui/Manifest @@ -50,7 +50,7 @@ DIST gh-emoji-1.0.6.crate 21780 BLAKE2B b1eef99adfb8e4ebda2c44fa51ae4a80c428f802 DIST gimli-0.26.1.crate 716168 BLAKE2B c138e890457e8724295cc8996f8e60f1f4d3eed46c865dc7ff2379c65e8d470080953eee70718867b73524f57d54d4a91b5d5ba74d79bd3da38084a880f3fed6 SHA512 c341354e13a78c4afeb651a0ed651f60d188957216ba51079512531ab1273b1b79c86c57e904b87064015f8e7efe4280d9edd4acf90e25fb29f8813a4c7bf9a9 DIST git-version-0.3.5.crate 3203 BLAKE2B f73d2f076c79c10c7395e584d811b6fffc7f348954c2c142099c48ba4440d257eb1be59ff26c3a61f37a6bc119afd82105a1697c37f8d7b973f3a43108f099f6 SHA512 7017d59ec7eef1d69c333ce8bcdee355dced8e912c4b5eabcb2abb93f6075ef3d1fd9486661d472c29787b75d7866fc49835d1faf5d06e42837c95c856398629 DIST git-version-macro-0.3.5.crate 4302 BLAKE2B 39173a36199b34cec11a1924faed795334586b21e3042bb91f3d38cee2d8b97ffb5bb4dd45a3c192d8c1b8d2b2a5bf4e0d3b23927b6f4212cfeb7cb9dbb16d4e SHA512 319729646469ab6508e16e6f3b88f588580fe7089479f70522edd6ac7eadb3c4576f0a57863bd3927d1ada693c3fe3706dc6a75e6cd75723db7f23199dc69ae0 -DIST git2-0.13.25.crate 194192 BLAKE2B 7286ce8f37421e5cb626c3b3d4f0005d4ddbf4f893fa4885a9bad28ba3f0e24d4b2161df8788430d909394ceff77eae586b26ffe343d6b0ca287ea0b63087068 SHA512 666f11464f34d82abd994f00a0b81e960551c4c524b4f00d28e5c728172dfa894fec65050767cc96d18d1d5de57f1e901154fe8d70e2e31b93b93790bce021ab +DIST git2-0.14.0.crate 196624 BLAKE2B 1180492058a90f21ef168c5429839f3c6dce4b06af99429d39902b82b58c2e9f9fe9b27c6da95d816e948e4af65e4ba0fd4f9bb9dd15d589e12fa10e12dfc47a SHA512 1493aa611efa69d22ab421754317036a066f29040be067342d308a9f96258b865ab0741a3f303eabcbfd1fdb9e6d4abf96da363cba147b25797cd3f30f7e4094 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f @@ -63,7 +63,7 @@ DIST jobserver-0.1.24.crate 21303 BLAKE2B 571e6f18f09d56d8281d2b2d206647666dc6e9 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d DIST libc-0.2.114.crate 565213 BLAKE2B 29da9084d82ae36defef55521d956db4aa1f571a8786cdfb4133837e7ec3bc7e7ad0f70f9de5f258833c3d43d8a57fd1864cb5e2dfffa5c98fd32461723addb0 SHA512 7fd0840ebdde766f6a671184da29092902a1244cf191c1ce88c0a2986422abaec865283e47332dd35cb0d4ba6db0ebf3369553ff9f2fd930041e051452929bfc -DIST libgit2-sys-0.12.26+1.3.0.crate 1476836 BLAKE2B 953756b4ed1e6f90d9eabf03dd9f3db50a085ecee4018c6f5e598b2b030e3332a6281f5e033810134356a48b92a4b910fd534813f2111cefc6de3bbf2954e1c8 SHA512 de30865b3d4ab0288e090381e5646e3e8028c341fac93014168fcfa5f166f7fbad9fc4ebd285919247cc6bac178658eb936ea1fdf168068248be07ad34ecc54d +DIST libgit2-sys-0.13.0+1.4.1.crate 1492769 BLAKE2B d4ab537718fa38adcc3c817d84ed587d986ab814b0f784c17ee2fa793ba41a051b96f0bf353054e056ed9eb1110016ae05b1996a6a06ad62974e18224584a287 SHA512 9a51512fe0d055314a98f82d3a89016bb39919b4720ffd28a361235d0baa40235c4b06088d66081f3223c125328a0448e9377ac097ba76cc007851ff025fa526 DIST libssh2-sys-0.2.23.crate 493516 BLAKE2B 00c0c1396f3d6723ad750112e7af8c8ac098af7b3d11e3fafbb4dc3b90c0defeb8184e007de3c740bf1111e12a53b71c355d697c4567deb3a30ebe3fee2e0caa SHA512 9617fb1d5826dacce23658b42e3eb3f8427b33db1b5a4424081e148bd90a3f776aa50ef66183c93ae19086d64321fc10b19b1a496c3feb12a669c7313cdf39cf DIST libz-sys-1.1.3.crate 1341394 BLAKE2B 24df26f2102fb05231bf1c866ae4bb33aaaa0db7e963f452d29091b870d3cdb80736b8013bd39c028ec84b97d265f005dbd650515f503d04655bf7054ee537b2 SHA512 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb diff --git a/dev-vcs/gitui/gitui-0.20.1.ebuild b/dev-vcs/gitui/gitui-0.20.1-r1.ebuild similarity index 84% rename from dev-vcs/gitui/gitui-0.20.1.ebuild rename to dev-vcs/gitui/gitui-0.20.1-r1.ebuild index 47a4bab..58a40d6 100644 --- a/dev-vcs/gitui/gitui-0.20.1.ebuild +++ b/dev-vcs/gitui/gitui-0.20.1-r1.ebuild @@ -57,7 +57,7 @@ CRATES=" gimli-0.26.1 git-version-0.3.5 git-version-macro-0.3.5 - git2-0.13.25 + git2-0.14.0 hashbrown-0.11.2 hermit-abi-0.1.19 idna-0.2.3 @@ -70,7 +70,7 @@ CRATES=" lazy_static-1.4.0 lazycell-1.3.0 libc-0.2.114 - libgit2-sys-0.12.26+1.3.0 + libgit2-sys-0.13.0+1.4.1 libssh2-sys-0.2.23 libz-sys-1.1.3 line-wrap-0.1.1 @@ -188,10 +188,10 @@ SRC_URI="$(cargo_crate_uris) LICENSE="BSD Apache-2.0 MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="nerd trace-libgit" +IUSE="trace-libgit" RDEPEND=" - >=dev-libs/libgit2-1.2.0:= + >=dev-libs/libgit2-1.4.0:= trace-libgit? ( dev-libs/libgit2[trace(+)] ) dev-libs/openssl " @@ -200,31 +200,8 @@ DEPEND="${RDEPEND}" RESTRICT="mirror" src_prepare() { - ( - # https://github.com/extrawurst/gitui/issues/459 - # `vendored-openssl` is for portability and static linking, - # wich we are don't use - set -e - - cd "${CARGO_HOME}" - source="$(sed -n '/^replace-with/{s/.*"\(.*\)"$/\1/p;q}' <./config)" - sed -i "./${source}/asyncgit-${AG_PV}/Cargo.toml" \ - -e '/"vendored[^"]*"/d' - ) || die 'failed to `sed` asyncgit' - - if use nerd; then - sed -i "${S}/src/keys/symbols.rs" \ - -e 's/\\u{238b}/ESC/' \ - -e 's/\\u{2325}/M^/' \ - -e 's/23ce/f810/' \ - -e 's/232b/f56d/' \ - -e 's/2912/f015/' \ - -e 's/2913/fb00/' \ - -e 's/21de/f077/' \ - -e 's/21df/f078/' \ - -e 's/2326/fae7/' \ - -e 's/2380/0049/' - fi || die + cd "${S}" + sed -i -e 's!git2 = "0.13"!git2 = "0.14"!g' asyncgit/Cargo.toml filter-flags -flto* # building fails when compiling with LTO