[gentoo-commits] repo/gentoo:master commit in: dev-util/git-delta/

[Michał Górny]

commit:     c4717ef744934bdf1eae117c10456a6c67f1f490
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 26 13:35:20 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 26 15:59:34 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4717ef7

dev-util/git-delta: Support system libgit2-1.8*

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/git-delta/Manifest                   |   2 +
 dev-util/git-delta/git-delta-0.18.2-r2.ebuild | 279 ++++++++++++++++++++++++++
 2 files changed, 281 insertions(+)

diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index a8e6b1a31f0b..206186c49cff 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -65,6 +65,7 @@ DIST futures-util-0.3.30.crate 159977 BLAKE2B 
9012edf76336952dab02cb61db48dfc74b
 DIST getrandom-0.2.11.crate 35391 BLAKE2B 
cc3af20769f8effebcd6fe4f48bb762211f78cfad016b796ce4b6b83a25d0a758ecee4352af18ef97e84c17fb4efb0c7bf113b53d2dd30eaa32067fed97978fa
 SHA512 
2230c219e1080b4b13f207bdfd54b1acff37d9e5fec5263ec9952df9c0279939b231c722b54524deab85002caf1047a471f3fba8090428d918e99d53edf82345
 DIST git-delta-0.18.2.tar.gz 531261 BLAKE2B 
6a1dc650de50e495b0d1ced9369518a19d2b92270e58d9a1c93edd4b61cc5565bb23f5b6d69a250178e8f2ba13169dda700450539eafcc6f042ef35c03d19ed2
 SHA512 
c096e22e07945f004f4ef8e805d6dfe45ae53a2e9bcb46736f9764d76fcfa556ce1622157ab66021b8fa36a1e322f80fee217e7f3d9d3489ec4df1f8fc61ca67
 DIST git2-0.18.2.crate 212536 BLAKE2B 
fffdea2d9a279ec6c371b03489f85039a50250bed9177ebb82090b74a7deddb988b3456ac7e7323be00822e3c243820839f00bd2478cc4d17d0d5d9ad943b4c6
 SHA512 
d7b7f61ee2c074da28b85bce8475d1b0b953e047ddea70d834fbcffc58a910f0fee3cb91b6e3a0e6fd14b76d142ea02909330db0266299b73c743463a8443a99
+DIST git2-0.19.0.crate 215910 BLAKE2B 
e6dfbc292dd580dfe2b5964745d73c29ab4e43d91af37893eb2b915c7967d557940284c388b5693c8f366d98979cfb43f184627319799a359b2ec40c6d875a83
 SHA512 
9d868ba1594ace291002c4a10dcd43f192dbb8c2070abd74883e57a7f53825c7a29080ecbe4279f6c7ee845c261bcbc93b10004b99df27de41cd29bd48e137e8
 DIST glob-0.3.1.crate 18880 BLAKE2B 
dc89b3a664e810264dd7a01ad892e865ce35b504bfe5dba12d7ea8084da7de84feaa94c2208f1a1eefed90297e552636ad61ccebf6fc8cb4d01f27d605ad0a09
 SHA512 
29368160138bcb7ea5660f9f30c5711cfca8bc8ba836bbade3fbe8c424e7b4118daf27cffa677962e37e36f025fd2bb5a9c2aea865b0ff155cace455dfbb658b
 DIST globset-0.4.14.crate 25090 BLAKE2B 
2c3e6f8384a066ebfa1f36bf03125b5eae79329255674e32c58963451d4b342ada10f17524232a953bee133b3c77b678a141543759ebc622b5fd659fe55622ae
 SHA512 
e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc
 DIST grep-cli-0.1.10.crate 19376 BLAKE2B 
d4a3010361632d04147f7edbd31bab8f5c4ea92e867d24ed5c1cb64aaa2c7d201b1981a0a447a962ce39ab703c99929e1a7e00fe1623e382be793862b292cd6c
 SHA512 
057bc0192bc2dab55babdc40c94d421f2e30d3001801469480bbdd77eeee896c3b4a2f17e7a648e7d21f178636ab1363eb3b3abbd3a6e453d07d1c2d60a53112
@@ -83,6 +84,7 @@ DIST js-sys-0.3.66.crate 80765 BLAKE2B 
366f2741a1f7bc76f78068e183080bc221d45fb9a
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 
25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23
 SHA512 
e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.155.crate 743539 BLAKE2B 
42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16
 SHA512 
05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
 DIST libgit2-sys-0.16.2+1.7.2.crate 1773674 BLAKE2B 
86eedb63c1d92a15cbe2ce735530b60abb3d915a9f6051f7a084b9f6e6402dbdbffad2a261689f5e5abc2353b7765a390eff7cb86e88e50fb4cfe4346487bb8b
 SHA512 
45e23f66e1823c551b1f91d1466d971b05927e591684b35b75047ac5f7d23de889910b662ec403388b88a35dfd19b8ad9787481d36e10949e610aa02fcc35c40
+DIST libgit2-sys-0.17.0+1.8.1.crate 1812997 BLAKE2B 
91f61437450398c24a7dbb85803665a0cba268615a0e9d8176e094a192b9e8441d5d985a430722ebdf8c003acd47d40dc5b9e464fb7dae8d9c12b3adbad796fe
 SHA512 
4c37c30426dbba1d9981d65ee42210ec07e2dae73ce2d18beee17b161eb96de0c7b1696cc8b97fa514eb9fdcb8b853713cd19174fc55f033b6a9c1e25520f75b
 DIST libredox-0.0.1.crate 4212 BLAKE2B 
fecbb90e2842a69f3967bb2a09b0181dce1720b60c5d762a334a279b52c00a9b4b52de72c6484603981c0c3e1cd8e173ef5e15fa290ce8b8888739204956be92
 SHA512 
31a9234201f5128f1519e108f7424d1740a67699828265cc725304a70f6a51e139f1d0c0e626b487857a7b421f25ad93e81b95b65cf0d3e0ad912388deecfb41
 DIST libz-sys-1.1.12.crate 3030648 BLAKE2B 
ab8cb974481f86f7ef40eb27ee08ee5535cb914cb76608683b53b57e89d7c92ee4d0831d6d0977ec76476036fdb8c6374ebdf3daa639cfb627e0153d40ca752a
 SHA512 
03daeb5f03193887b692cbe8d631c83ac632f3e92fca4f10e881058fea38d85e11c090de04be9d70d52a22dec669474a0044a3d45d4adeb3a0f39e3398cdac11
 DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 
0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093
 SHA512 
031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707

diff --git a/dev-util/git-delta/git-delta-0.18.2-r2.ebuild 
b/dev-util/git-delta/git-delta-0.18.2-r2.ebuild
new file mode 100644
index 000000000000..50c018759ef1
--- /dev/null
+++ b/dev-util/git-delta/git-delta-0.18.2-r2.ebuild
@@ -0,0 +1,279 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.2
+
+EAPI=8
+
+CRATES="
+       adler@1.0.2
+       aho-corasick@1.1.2
+       android-tzdata@0.1.1
+       android_system_properties@0.1.5
+       ansi_colours@1.2.2
+       ansi_term@0.12.1
+       anstream@0.6.5
+       anstyle-parse@0.2.3
+       anstyle-query@1.0.2
+       anstyle-wincon@3.0.2
+       anstyle@1.0.4
+       anyhow@1.0.79
+       approx@0.5.1
+       autocfg@1.1.0
+       base64@0.22.1
+       bat@0.24.0
+       bincode@1.3.3
+       bitflags@1.3.2
+       bitflags@2.4.1
+       box_drawing@0.1.2
+       bstr@1.9.0
+       bumpalo@3.14.0
+       bytelines@2.5.0
+       bytemuck@1.14.0
+       bytesize@1.3.0
+       cc@1.0.83
+       cfg-if@1.0.0
+       chrono-humanize@0.2.3
+       chrono@0.4.31
+       clap@4.4.13
+       clap_builder@4.4.12
+       clap_complete@4.4.6
+       clap_derive@4.4.7
+       clap_lex@0.6.0
+       clircle@0.4.0
+       colorchoice@1.0.0
+       console@0.15.7
+       content_inspector@0.2.4
+       core-foundation-sys@0.8.6
+       crc32fast@1.3.2
+       ctrlc@3.4.2
+       deranged@0.3.11
+       dirs-sys@0.4.1
+       dirs@5.0.1
+       either@1.9.0
+       encode_unicode@0.3.6
+       encoding_rs@0.8.33
+       equivalent@1.0.1
+       errno@0.3.8
+       etcetera@0.8.0
+       fast-srgb8@1.0.0
+       flate2@1.0.28
+       fnv@1.0.7
+       form_urlencoded@1.2.1
+       futures-channel@0.3.30
+       futures-core@0.3.30
+       futures-executor@0.3.30
+       futures-io@0.3.30
+       futures-macro@0.3.30
+       futures-sink@0.3.30
+       futures-task@0.3.30
+       futures-timer@3.0.3
+       futures-util@0.3.30
+       futures@0.3.30
+       getrandom@0.2.11
+       git2@0.19.0
+       glob@0.3.1
+       globset@0.4.14
+       grep-cli@0.1.10
+       hashbrown@0.14.3
+       heck@0.4.1
+       home@0.5.9
+       iana-time-zone-haiku@0.1.2
+       iana-time-zone@0.1.59
+       idna@0.5.0
+       indexmap@2.1.0
+       insta@1.39.0
+       itertools@0.10.5
+       itoa@1.0.10
+       jobserver@0.1.27
+       js-sys@0.3.66
+       lazy_static@1.4.0
+       libc@0.2.155
+       libgit2-sys@0.17.0+1.8.1
+       libredox@0.0.1
+       libz-sys@1.1.12
+       linked-hash-map@0.5.6
+       linux-raw-sys@0.4.12
+       log@0.4.20
+       memchr@2.7.1
+       miniz_oxide@0.7.1
+       mio@0.8.11
+       nix@0.27.1
+       ntapi@0.4.1
+       nu-ansi-term@0.49.0
+       num-conv@0.1.0
+       num-traits@0.2.17
+       once_cell@1.19.0
+       onig@6.4.0
+       onig_sys@69.8.1
+       option-ext@0.2.0
+       palette@0.7.3
+       palette_derive@0.7.3
+       path_abs@0.5.1
+       pathdiff@0.2.1
+       percent-encoding@2.3.1
+       phf@0.11.2
+       phf_generator@0.11.2
+       phf_macros@0.11.2
+       phf_shared@0.11.2
+       pin-project-lite@0.2.14
+       pin-utils@0.1.0
+       pkg-config@0.3.28
+       plist@1.7.0
+       powerfmt@0.2.0
+       proc-macro-crate@3.1.0
+       proc-macro2@1.0.75
+       quick-xml@0.32.0
+       quote@1.0.35
+       rand@0.8.5
+       rand_core@0.6.4
+       redox_syscall@0.4.1
+       redox_users@0.4.4
+       regex-automata@0.4.3
+       regex-syntax@0.8.2
+       regex@1.10.2
+       relative-path@1.9.3
+       rgb@0.8.37
+       rstest@0.21.0
+       rstest_macros@0.21.0
+       rustc_version@0.4.0
+       rustix@0.38.28
+       ryu@1.0.16
+       same-file@1.0.6
+       semver@1.0.21
+       serde@1.0.194
+       serde_derive@1.0.194
+       serde_json@1.0.111
+       serde_yaml@0.9.30
+       shell-words@1.1.0
+       similar@2.5.0
+       siphasher@0.3.11
+       slab@0.4.9
+       smol_str@0.1.24
+       std_prelude@0.2.12
+       strsim@0.10.0
+       syn@2.0.48
+       syntect@5.2.0
+       sysinfo@0.29.11
+       termcolor@1.4.0
+       terminal-colorsaurus@0.4.3
+       terminal-trx@0.2.1
+       terminal_size@0.3.0
+       thiserror-impl@1.0.56
+       thiserror@1.0.56
+       time-core@0.1.2
+       time-macros@0.2.18
+       time@0.3.36
+       tinyvec@1.6.0
+       tinyvec_macros@0.1.1
+       toml_datetime@0.6.6
+       toml_edit@0.21.1
+       unicode-bidi@0.3.14
+       unicode-ident@1.0.12
+       unicode-normalization@0.1.22
+       unicode-segmentation@1.10.1
+       unicode-width@0.1.12
+       unsafe-libyaml@0.2.10
+       url@2.5.0
+       utf8parse@0.2.1
+       vcpkg@0.2.15
+       walkdir@2.4.0
+       wasi@0.11.0+wasi-snapshot-preview1
+       wasm-bindgen-backend@0.2.89
+       wasm-bindgen-macro-support@0.2.89
+       wasm-bindgen-macro@0.2.89
+       wasm-bindgen-shared@0.2.89
+       wasm-bindgen@0.2.89
+       wild@2.2.0
+       winapi-i686-pc-windows-gnu@0.4.0
+       winapi-util@0.1.6
+       winapi-x86_64-pc-windows-gnu@0.4.0
+       winapi@0.3.9
+       windows-core@0.52.0
+       windows-sys@0.45.0
+       windows-sys@0.48.0
+       windows-sys@0.52.0
+       windows-targets@0.42.2
+       windows-targets@0.48.5
+       windows-targets@0.52.0
+       windows_aarch64_gnullvm@0.42.2
+       windows_aarch64_gnullvm@0.48.5
+       windows_aarch64_gnullvm@0.52.0
+       windows_aarch64_msvc@0.42.2
+       windows_aarch64_msvc@0.48.5
+       windows_aarch64_msvc@0.52.0
+       windows_i686_gnu@0.42.2
+       windows_i686_gnu@0.48.5
+       windows_i686_gnu@0.52.0
+       windows_i686_msvc@0.42.2
+       windows_i686_msvc@0.48.5
+       windows_i686_msvc@0.52.0
+       windows_x86_64_gnu@0.42.2
+       windows_x86_64_gnu@0.48.5
+       windows_x86_64_gnu@0.52.0
+       windows_x86_64_gnullvm@0.42.2
+       windows_x86_64_gnullvm@0.48.5
+       windows_x86_64_gnullvm@0.52.0
+       windows_x86_64_msvc@0.42.2
+       windows_x86_64_msvc@0.48.5
+       windows_x86_64_msvc@0.52.0
+       winnow@0.5.40
+       xdg@2.5.2
+       yaml-rust@0.4.5
+"
+
+inherit cargo shell-completion
+
+DESCRIPTION="A syntax-highlighting pager for git"
+HOMEPAGE="https://github.com/dandavison/delta";
+SRC_URI="
+       https://github.com/dandavison/delta/archive/refs/tags/${PV}.tar.gz -> 
${P}.tar.gz
+       ${CARGO_CRATE_URIS}
+"
+S="${WORKDIR}/${P/git-/}"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 BSD LGPL-3+ MIT MPL-2.0 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+
+BDEPEND="
+       virtual/pkgconfig
+"
+DEPEND="
+       dev-libs/libgit2:0/1.8
+       dev-libs/oniguruma:=
+       sys-libs/zlib
+"
+RDEPEND="
+       ${DEPEND}
+       !app-text/delta
+"
+
+QA_FLAGS_IGNORED="usr/bin/delta"
+
+pkg_setup() {
+       rust_pkg_setup
+}
+
+src_prepare() {
+       default
+
+       # unpin crates, and allow newer libgit2
+       rm Cargo.lock || die
+       sed -i -e '/git2/s:0\.18\.2:*:' Cargo.toml || die
+
+       export LIBGIT2_NO_VENDOR=1
+       export PKG_CONFIG_ALLOW_CROSS=1
+       export RUSTONIG_SYSTEM_LIBONIG=1
+}
+
+src_install() {
+       cargo_src_install
+
+       # Completions
+       newbashcomp "${S}"/etc/completion/completion.bash delta
+       newzshcomp "${S}"/etc/completion/completion.zsh _delta
+       newfishcomp "${S}"/etc/completion/completion.fish delta.fish
+}