devel/git-cinnabar: update to 0.6.0

Changes:	https://github.com/glandium/git-cinnabar/releases/tag/0.6.0
Reported by:	GitHub (watch releases)

5 files changed, 402 insertions, 128 deletions

diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile
index 87377bd07dd2..54be58e62026 100644
--- a/devel/git-cinnabar/Makefile
+++ b/devel/git-cinnabar/Makefile
@@ -1,44 +1,33 @@
 PORTNAME=	git-cinnabar
-DISTVERSION=	0.5.11
-PORTREVISION=	6
+DISTVERSION=	0.6.0
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Git remote helper to interact with Mercurial repositories
 WWW=		https://github.com/glandium/git-cinnabar
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 MPL20
+LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
 RUN_DEPENDS=	git:devel/git
 
+USES=		cargo gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	glandium
-GH_TUPLE=	git:git:v2.38.1:git/git-core
-
-USES=		gmake iconv python:3.6+,run shebangfix
-TARGET_ORDER_OVERRIDE=	510:fix-shebang # after do-patch
-SHEBANG_FILES=	${PORTNAME} git-remote-hg
-ALL_TARGET=	${PORTNAME}-helper
-MAKE_ENV=	V=1
-MAKE_ARGS=	SUBMODULE_STATUS=dummy NEEDS_LIBICONV=${ICONV_LIB} \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-CFLAGS+=	-ffunction-sections -fdata-sections
-LDFLAGS+=	-Wl,--gc-sections
+GH_TUPLE=	git-for-windows:git:v2.40.0.windows.1:git/git-core
 DATADIR=	${PREFIX}/libexec/git-core
 PORTDATA=	*
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
-do-install:
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${WRKSRC}/git-remote-hg \
-		${STAGEDIR}${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/git-core/${PORTNAME}-helper \
-		${STAGEDIR}${DATADIR}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTNAME:S/git-//}" \
-		${STAGEDIR}${DATADIR}/pythonlib)
+	${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${STAGEDIR}${DATADIR}
+	${RLN} ${STAGEDIR}${DATADIR}/${PORTNAME} \
+		${STAGEDIR}${DATADIR}/git-remote-hg
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
diff --git a/devel/git-cinnabar/Makefile.crates b/devel/git-cinnabar/Makefile.crates
new file mode 100644
index 000000000000..70061f82dc77
--- /dev/null
+++ b/devel/git-cinnabar/Makefile.crates
@@ -0,0 +1,129 @@
+CARGO_CRATES=	addr2line-0.19.0 \
+		adler-1.0.2 \
+		all_asserts-2.3.1 \
+		array-init-2.1.0 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		backtrace-0.3.67 \
+		base64-0.13.1 \
+		bit-vec-0.6.3 \
+		bitflags-1.3.2 \
+		block-buffer-0.10.4 \
+		bstr-1.4.0 \
+		bumpalo-3.12.0 \
+		byteorder-1.4.3 \
+		bzip2-0.4.4 \
+		bzip2-sys-0.1.11+1.0.8 \
+		cc-1.0.79 \
+		cfg-if-1.0.0 \
+		clap-4.0.26 \
+		clap_derive-4.0.21 \
+		clap_lex-0.3.0 \
+		cpufeatures-0.2.6 \
+		crc32fast-1.3.2 \
+		crossbeam-utils-0.8.15 \
+		crypto-common-0.1.6 \
+		cstr-0.2.10 \
+		curl-sys-0.4.61+curl-8.0.1 \
+		derivative-2.2.0 \
+		derive_more-0.99.17 \
+		digest-0.10.6 \
+		either-1.8.1 \
+		fastrand-1.9.0 \
+		filetime-0.2.16 \
+		flate2-1.0.25 \
+		form_urlencoded-1.1.0 \
+		generic-array-0.14.7 \
+		getrandom-0.2.8 \
+		getset-0.1.2 \
+		gimli-0.27.2 \
+		git-version-0.3.5 \
+		git-version-macro-0.3.5 \
+		hashbrown-0.12.3 \
+		heck-0.4.1 \
+		hermit-abi-0.1.19 \
+		hex-0.4.3 \
+		idna-0.3.0 \
+		indexmap-1.9.3 \
+		instant-0.1.12 \
+		itertools-0.10.5 \
+		jobserver-0.1.26 \
+		js-sys-0.3.61 \
+		libc-0.2.140 \
+		libz-sys-1.1.8 \
+		log-0.4.17 \
+		lzma-sys-0.1.20 \
+		make-cmd-0.1.0 \
+		memchr-2.5.0 \
+		miniz_oxide-0.6.2 \
+		num_enum-0.5.11 \
+		num_enum_derive-0.5.11 \
+		object-0.30.3 \
+		once_cell-1.17.1 \
+		openssl-sys-0.9.83 \
+		os_str_bytes-6.5.0 \
+		percent-encoding-2.2.0 \
+		pkg-config-0.3.26 \
+		ppv-lite86-0.2.17 \
+		proc-macro-crate-1.3.1 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro-hack-0.5.20+deprecated \
+		proc-macro2-1.0.54 \
+		quote-1.0.26 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.4 \
+		redox_syscall-0.2.16 \
+		regex-1.7.3 \
+		regex-syntax-0.6.29 \
+		remove_dir_all-0.5.3 \
+		ring-0.16.20 \
+		rustc-demangle-0.1.22 \
+		rustls-0.20.8 \
+		rustls-ffi-0.8.2 \
+		rustls-pemfile-0.2.1 \
+		sct-0.7.0 \
+		semver-1.0.17 \
+		serde-1.0.159 \
+		sha-1-0.10.1 \
+		shared_child-1.0.0 \
+		spin-0.5.2 \
+		strsim-0.10.0 \
+		syn-1.0.109 \
+		tar-0.4.38 \
+		target-2.0.0 \
+		tee-0.1.0 \
+		tempfile-3.3.0 \
+		termcolor-1.2.0 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.1 \
+		toml_datetime-0.6.1 \
+		toml_edit-0.19.8 \
+		typenum-1.16.0 \
+		unicode-bidi-0.3.13 \
+		unicode-ident-1.0.8 \
+		unicode-normalization-0.1.22 \
+		untrusted-0.7.1 \
+		url-2.3.1 \
+		vcpkg-0.2.15 \
+		version_check-0.9.4 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.84 \
+		wasm-bindgen-backend-0.2.84 \
+		wasm-bindgen-macro-0.2.84 \
+		wasm-bindgen-macro-support-0.2.84 \
+		wasm-bindgen-shared-0.2.84 \
+		web-sys-0.3.61 \
+		webpki-0.22.0 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		winnow-0.4.1 \
+		xattr-0.2.3 \
+		xz2-0.1.7 \
+		zip-0.6.4 \
+		zstd-0.12.3+zstd.1.5.2 \
+		zstd-safe-6.0.4+zstd.1.5.4 \
+		zstd-sys-2.0.7+zstd.1.5.4
diff --git a/devel/git-cinnabar/distinfo b/devel/git-cinnabar/distinfo
index bc074e0e86f8..3ca3bce213a5 100644
--- a/devel/git-cinnabar/distinfo
+++ b/devel/git-cinnabar/distinfo
@@ -1,5 +1,263 @@
-TIMESTAMP = 1667018365
-SHA256 (glandium-git-cinnabar-0.5.11_GH0.tar.gz) = 20f94f6a9b05fff2684e8c5619a1a5703e7d472fd2d0e87b020b20b4190a6338
-SIZE (glandium-git-cinnabar-0.5.11_GH0.tar.gz) = 184004
-SHA256 (git-git-v2.38.1_GH0.tar.gz) = 91456b031324f7909f35e067dcfb907956d1a5c3d2069cfc5b4549e42089e546
-SIZE (git-git-v2.38.1_GH0.tar.gz) = 10480172
+TIMESTAMP = 1680347674
+SHA256 (rust/crates/addr2line-0.19.0.crate) = a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97
+SIZE (rust/crates/addr2line-0.19.0.crate) = 33210
+SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
+SIZE (rust/crates/adler-1.0.2.crate) = 12778
+SHA256 (rust/crates/all_asserts-2.3.1.crate) = ca77caf0ca1057c274cda103cda1363d892b7cad5f2e646afde4df0697bea100
+SIZE (rust/crates/all_asserts-2.3.1.crate) = 10598
+SHA256 (rust/crates/array-init-2.1.0.crate) = 3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc
+SIZE (rust/crates/array-init-2.1.0.crate) = 11927
+SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
+SIZE (rust/crates/atty-0.2.14.crate) = 5470
+SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
+SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
+SHA256 (rust/crates/backtrace-0.3.67.crate) = 233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca
+SIZE (rust/crates/backtrace-0.3.67.crate) = 78564
+SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8
+SIZE (rust/crates/base64-0.13.1.crate) = 61002
+SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb
+SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927
+SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
+SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
+SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
+SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
+SHA256 (rust/crates/bstr-1.4.0.crate) = c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09
+SIZE (rust/crates/bstr-1.4.0.crate) = 345921
+SHA256 (rust/crates/bumpalo-3.12.0.crate) = 0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535
+SIZE (rust/crates/bumpalo-3.12.0.crate) = 81604
+SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
+SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
+SHA256 (rust/crates/bzip2-0.4.4.crate) = bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8
+SIZE (rust/crates/bzip2-0.4.4.crate) = 34197
+SHA256 (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc
+SIZE (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 633444
+SHA256 (rust/crates/cc-1.0.79.crate) = 50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f
+SIZE (rust/crates/cc-1.0.79.crate) = 62624
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/clap-4.0.26.crate) = 2148adefda54e14492fb9bddcc600b4344c5d1a3123bd666dcb939c6f0e0e57e
+SIZE (rust/crates/clap-4.0.26.crate) = 205197
+SHA256 (rust/crates/clap_derive-4.0.21.crate) = 0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014
+SIZE (rust/crates/clap_derive-4.0.21.crate) = 27567
+SHA256 (rust/crates/clap_lex-0.3.0.crate) = 0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8
+SIZE (rust/crates/clap_lex-0.3.0.crate) = 9671
+SHA256 (rust/crates/cpufeatures-0.2.6.crate) = 280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181
+SIZE (rust/crates/cpufeatures-0.2.6.crate) = 11467
+SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
+SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
+SHA256 (rust/crates/crossbeam-utils-0.8.15.crate) = 3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b
+SIZE (rust/crates/crossbeam-utils-0.8.15.crate) = 42326
+SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
+SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
+SHA256 (rust/crates/cstr-0.2.10.crate) = a60f0dd132e4b67f20fd764d4835d968f666ff1a2f59e432983d168b98424deb
+SIZE (rust/crates/cstr-0.2.10.crate) = 5761
+SHA256 (rust/crates/curl-sys-0.4.61+curl-8.0.1.crate) = 14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79
+SIZE (rust/crates/curl-sys-0.4.61+curl-8.0.1.crate) = 3101374
+SHA256 (rust/crates/derivative-2.2.0.crate) = fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b
+SIZE (rust/crates/derivative-2.2.0.crate) = 48076
+SHA256 (rust/crates/derive_more-0.99.17.crate) = 4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321
+SIZE (rust/crates/derive_more-0.99.17.crate) = 55771
+SHA256 (rust/crates/digest-0.10.6.crate) = 8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f
+SIZE (rust/crates/digest-0.10.6.crate) = 19527
+SHA256 (rust/crates/either-1.8.1.crate) = 7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91
+SIZE (rust/crates/either-1.8.1.crate) = 16027
+SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be
+SIZE (rust/crates/fastrand-1.9.0.crate) = 11910
+SHA256 (rust/crates/filetime-0.2.16.crate) = c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c
+SIZE (rust/crates/filetime-0.2.16.crate) = 14502
+SHA256 (rust/crates/flate2-1.0.25.crate) = a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841
+SIZE (rust/crates/flate2-1.0.25.crate) = 70210
+SHA256 (rust/crates/form_urlencoded-1.1.0.crate) = a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8
+SIZE (rust/crates/form_urlencoded-1.1.0.crate) = 8734
+SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
+SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
+SHA256 (rust/crates/getrandom-0.2.8.crate) = c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31
+SIZE (rust/crates/getrandom-0.2.8.crate) = 30553
+SHA256 (rust/crates/getset-0.1.2.crate) = e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9
+SIZE (rust/crates/getset-0.1.2.crate) = 8831
+SHA256 (rust/crates/gimli-0.27.2.crate) = ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4
+SIZE (rust/crates/gimli-0.27.2.crate) = 721636
+SHA256 (rust/crates/git-version-0.3.5.crate) = f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899
+SIZE (rust/crates/git-version-0.3.5.crate) = 3203
+SHA256 (rust/crates/git-version-macro-0.3.5.crate) = fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f
+SIZE (rust/crates/git-version-macro-0.3.5.crate) = 4302
+SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888
+SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968
+SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
+SIZE (rust/crates/heck-0.4.1.crate) = 11567
+SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
+SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
+SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
+SIZE (rust/crates/hex-0.4.3.crate) = 13299
+SHA256 (rust/crates/idna-0.3.0.crate) = e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6
+SIZE (rust/crates/idna-0.3.0.crate) = 271128
+SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99
+SIZE (rust/crates/indexmap-1.9.3.crate) = 54653
+SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
+SIZE (rust/crates/instant-0.1.12.crate) = 6128
+SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473
+SIZE (rust/crates/itertools-0.10.5.crate) = 115354
+SHA256 (rust/crates/jobserver-0.1.26.crate) = 936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2
+SIZE (rust/crates/jobserver-0.1.26.crate) = 22645
+SHA256 (rust/crates/js-sys-0.3.61.crate) = 445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730
+SIZE (rust/crates/js-sys-0.3.61.crate) = 80158
+SHA256 (rust/crates/libc-0.2.140.crate) = 99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c
+SIZE (rust/crates/libc-0.2.140.crate) = 669153
+SHA256 (rust/crates/libz-sys-1.1.8.crate) = 9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf
+SIZE (rust/crates/libz-sys-1.1.8.crate) = 2481844
+SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e
+SIZE (rust/crates/log-0.4.17.crate) = 38028
+SHA256 (rust/crates/lzma-sys-0.1.20.crate) = 5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27
+SIZE (rust/crates/lzma-sys-0.1.20.crate) = 760045
+SHA256 (rust/crates/make-cmd-0.1.0.crate) = a8ca8afbe8af1785e09636acb5a41e08a765f5f0340568716c18a8700ba3c0d3
+SIZE (rust/crates/make-cmd-0.1.0.crate) = 1432
+SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
+SIZE (rust/crates/memchr-2.5.0.crate) = 65812
+SHA256 (rust/crates/miniz_oxide-0.6.2.crate) = b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa
+SIZE (rust/crates/miniz_oxide-0.6.2.crate) = 54536
+SHA256 (rust/crates/num_enum-0.5.11.crate) = 1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9
+SIZE (rust/crates/num_enum-0.5.11.crate) = 16772
+SHA256 (rust/crates/num_enum_derive-0.5.11.crate) = dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799
+SIZE (rust/crates/num_enum_derive-0.5.11.crate) = 15552
+SHA256 (rust/crates/object-0.30.3.crate) = ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439
+SIZE (rust/crates/object-0.30.3.crate) = 258901
+SHA256 (rust/crates/once_cell-1.17.1.crate) = b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3
+SIZE (rust/crates/once_cell-1.17.1.crate) = 32856
+SHA256 (rust/crates/openssl-sys-0.9.83.crate) = 666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b
+SIZE (rust/crates/openssl-sys-0.9.83.crate) = 63079
+SHA256 (rust/crates/os_str_bytes-6.5.0.crate) = ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267
+SIZE (rust/crates/os_str_bytes-6.5.0.crate) = 23166
+SHA256 (rust/crates/percent-encoding-2.2.0.crate) = 478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e
+SIZE (rust/crates/percent-encoding-2.2.0.crate) = 10075
+SHA256 (rust/crates/pkg-config-0.3.26.crate) = 6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160
+SIZE (rust/crates/pkg-config-0.3.26.crate) = 18662
+SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
+SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
+SHA256 (rust/crates/proc-macro-crate-1.3.1.crate) = 7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919
+SIZE (rust/crates/proc-macro-crate-1.3.1.crate) = 9678
+SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
+SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
+SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
+SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
+SHA256 (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068
+SIZE (rust/crates/proc-macro-hack-0.5.20+deprecated.crate) = 15045
+SHA256 (rust/crates/proc-macro2-1.0.54.crate) = e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534
+SIZE (rust/crates/proc-macro2-1.0.54.crate) = 43485
+SHA256 (rust/crates/quote-1.0.26.crate) = 4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc
+SIZE (rust/crates/quote-1.0.26.crate) = 28397
+SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
+SIZE (rust/crates/rand-0.8.5.crate) = 87113
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
+SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
+SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
+SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
+SHA256 (rust/crates/regex-1.7.3.crate) = 8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d
+SIZE (rust/crates/regex-1.7.3.crate) = 239886
+SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1
+SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752
+SHA256 (rust/crates/remove_dir_all-0.5.3.crate) = 3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7
+SIZE (rust/crates/remove_dir_all-0.5.3.crate) = 9184
+SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc
+SIZE (rust/crates/ring-0.16.20.crate) = 5082615
+SHA256 (rust/crates/rustc-demangle-0.1.22.crate) = d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b
+SIZE (rust/crates/rustc-demangle-0.1.22.crate) = 29044
+SHA256 (rust/crates/rustls-0.20.8.crate) = fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f
+SIZE (rust/crates/rustls-0.20.8.crate) = 270142
+SHA256 (rust/crates/rustls-ffi-0.8.2.crate) = 9da52707cca59e6eef8a78f3ad8d04024254a168ed1b41eb4dfa9616eace781a
+SIZE (rust/crates/rustls-ffi-0.8.2.crate) = 74742
+SHA256 (rust/crates/rustls-pemfile-0.2.1.crate) = 5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9
+SIZE (rust/crates/rustls-pemfile-0.2.1.crate) = 14278
+SHA256 (rust/crates/sct-0.7.0.crate) = d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4
+SIZE (rust/crates/sct-0.7.0.crate) = 27502
+SHA256 (rust/crates/semver-1.0.17.crate) = bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed
+SIZE (rust/crates/semver-1.0.17.crate) = 29685
+SHA256 (rust/crates/serde-1.0.159.crate) = 3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065
+SIZE (rust/crates/serde-1.0.159.crate) = 77014
+SHA256 (rust/crates/sha-1-0.10.1.crate) = f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c
+SIZE (rust/crates/sha-1-0.10.1.crate) = 12018
+SHA256 (rust/crates/shared_child-1.0.0.crate) = b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef
+SIZE (rust/crates/shared_child-1.0.0.crate) = 8939
+SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d
+SIZE (rust/crates/spin-0.5.2.crate) = 12004
+SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
+SIZE (rust/crates/strsim-0.10.0.crate) = 11355
+SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
+SIZE (rust/crates/syn-1.0.109.crate) = 237611
+SHA256 (rust/crates/tar-0.4.38.crate) = 4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6
+SIZE (rust/crates/tar-0.4.38.crate) = 49158
+SHA256 (rust/crates/target-2.0.0.crate) = ba852e71502340e2eaf2fa51f9b3ec6aa25750da1aa65771491c69d67789b05c
+SIZE (rust/crates/target-2.0.0.crate) = 6761
+SHA256 (rust/crates/tee-0.1.0.crate) = 37c12559dba7383625faaff75be24becf35bfc885044375bcab931111799a3da
+SIZE (rust/crates/tee-0.1.0.crate) = 3315
+SHA256 (rust/crates/tempfile-3.3.0.crate) = 5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4
+SIZE (rust/crates/tempfile-3.3.0.crate) = 27578
+SHA256 (rust/crates/termcolor-1.2.0.crate) = be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6
+SIZE (rust/crates/termcolor-1.2.0.crate) = 17917
+SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
+SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
+SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
+SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
+SHA256 (rust/crates/toml_datetime-0.6.1.crate) = 3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622
+SIZE (rust/crates/toml_datetime-0.6.1.crate) = 10765
+SHA256 (rust/crates/toml_edit-0.19.8.crate) = 239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13
+SIZE (rust/crates/toml_edit-0.19.8.crate) = 94457
+SHA256 (rust/crates/typenum-1.16.0.crate) = 497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba
+SIZE (rust/crates/typenum-1.16.0.crate) = 42477
+SHA256 (rust/crates/unicode-bidi-0.3.13.crate) = 92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460
+SIZE (rust/crates/unicode-bidi-0.3.13.crate) = 44477
+SHA256 (rust/crates/unicode-ident-1.0.8.crate) = e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4
+SIZE (rust/crates/unicode-ident-1.0.8.crate) = 41962
+SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921
+SIZE (rust/crates/unicode-normalization-0.1.22.crate) = 122604
+SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a
+SIZE (rust/crates/untrusted-0.7.1.crate) = 7924
+SHA256 (rust/crates/url-2.3.1.crate) = 0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643
+SIZE (rust/crates/url-2.3.1.crate) = 72777
+SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
+SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
+SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
+SIZE (rust/crates/version_check-0.9.4.crate) = 14895
+SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
+SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
+SHA256 (rust/crates/wasm-bindgen-0.2.84.crate) = 31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b
+SIZE (rust/crates/wasm-bindgen-0.2.84.crate) = 172947
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.84.crate) = 95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9
+SIZE (rust/crates/wasm-bindgen-backend-0.2.84.crate) = 26344
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.84.crate) = 4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5
+SIZE (rust/crates/wasm-bindgen-macro-0.2.84.crate) = 12857
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.84.crate) = 2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.84.crate) = 19076
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.84.crate) = 0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d
+SIZE (rust/crates/wasm-bindgen-shared-0.2.84.crate) = 7219
+SHA256 (rust/crates/web-sys-0.3.61.crate) = e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97
+SIZE (rust/crates/web-sys-0.3.61.crate) = 706333
+SHA256 (rust/crates/webpki-0.22.0.crate) = f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd
+SIZE (rust/crates/webpki-0.22.0.crate) = 58663
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178
+SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/winnow-0.4.1.crate) = ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28
+SIZE (rust/crates/winnow-0.4.1.crate) = 138177
+SHA256 (rust/crates/xattr-0.2.3.crate) = 6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc
+SIZE (rust/crates/xattr-0.2.3.crate) = 11959
+SHA256 (rust/crates/xz2-0.1.7.crate) = 388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2
+SIZE (rust/crates/xz2-0.1.7.crate) = 23892
+SHA256 (rust/crates/zip-0.6.4.crate) = 0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef
+SIZE (rust/crates/zip-0.6.4.crate) = 62396
+SHA256 (rust/crates/zstd-0.12.3+zstd.1.5.2.crate) = 76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806
+SIZE (rust/crates/zstd-0.12.3+zstd.1.5.2.crate) = 29693
+SHA256 (rust/crates/zstd-safe-6.0.4+zstd.1.5.4.crate) = 7afb4b54b8910cf5447638cb54bf4e8a65cbedd783af98b98c62ffe91f185543
+SIZE (rust/crates/zstd-safe-6.0.4+zstd.1.5.4.crate) = 20856
+SHA256 (rust/crates/zstd-sys-2.0.7+zstd.1.5.4.crate) = 94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5
+SIZE (rust/crates/zstd-sys-2.0.7+zstd.1.5.4.crate) = 732100
+SHA256 (glandium-git-cinnabar-0.6.0_GH0.tar.gz) = 609f5cdb103db2017989fcdaee8595fa3432d172e3224772aac2e5d26067451f
+SIZE (glandium-git-cinnabar-0.6.0_GH0.tar.gz) = 195301
+SHA256 (git-for-windows-git-v2.40.0.windows.1_GH0.tar.gz) = 53e207293bc226ad129ed0ed6ea8d314c01a060dcfff5774f54c4639fde5f427
+SIZE (git-for-windows-git-v2.40.0.windows.1_GH0.tar.gz) = 10795725
diff --git a/devel/git-cinnabar/files/patch-no-unused b/devel/git-cinnabar/files/patch-no-unused
deleted file mode 100644
index 240a8158fc35..000000000000
--- a/devel/git-cinnabar/files/patch-no-unused
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/glandium/git-cinnabar/commit/970abc2994ff
-https://github.com/glandium/git-cinnabar/commit/70f35a268199
-
---- Makefile.orig	2022-10-28 23:43:03 UTC
-+++ Makefile
-@@ -51,7 +51,7 @@ include git-core/config.mak.uname
- 
- .PHONY: FORCE
- 
--git-cinnabar-helper$X: EXTRA_FLAGS=USE_LIBPCRE= USELIBPCRE1= USELIBPCRE2= FSMONITOR_DAEMON_BACKEND=
-+git-cinnabar-helper$X: EXTRA_FLAGS=NO_GETTEXT?=1 NO_OPENSSL?=1 USE_LIBPCRE1= USE_LIBPCRE2= FSMONITOR_DAEMON_BACKEND=
- git-cinnabar-helper$X git git-install: FORCE
- 
- helper: git-cinnabar-helper$X
diff --git a/devel/git-cinnabar/files/patch-no-wrapper b/devel/git-cinnabar/files/patch-no-wrapper
deleted file mode 100644
index d24e02a196b1..000000000000
--- a/devel/git-cinnabar/files/patch-no-wrapper
+++ /dev/null
@@ -1,88 +0,0 @@
-Disable wrappers as Python version is controlled by FLAVORS
-
---- README.md.orig	2022-07-15 21:17:31 UTC
-+++ README.md
-@@ -53,17 +53,6 @@ - A native helper is used for faster operations. You c
- 
-   If you want to build git along the helper, you can run `make git`.
- 
--Python:
---------
--
--git-cinnabar will use one of `python3`, `python`, `python2.7` or `python2`,
--whichever has mercurial libraries. If none of them does, it will use the first
--that can be found.
--
--You may force a specific python through the `GIT_CINNABAR_PYTHON` environment
--variable.
--
--
- Usage:
- ------
- 
---- git-cinnabar.orig	2022-07-15 21:17:31 UTC
-+++ git-cinnabar
-@@ -1,29 +1,4 @@
--#!/bin/sh
--''':'
--py="$GIT_CINNABAR_PYTHON"
--if test -z "$py"; then
--  for py in python3 python python2.7 python2; do
--    "$py" -c "from mercurial import hg" >/dev/null 2>&1 && break
--    py=
--  done
--fi
--if test -z "$py"; then
--  for py in python3 python python2.7 python2 "py -3" "py -2"; do
--    # Make sure this Python actually works. On Windows, python.exe, etc. might
--    # try to run the Windows Store app even if it's not installed.
--    $py -c "import sys" >/dev/null 2>&1 && break
--    py=python3
--  done
--fi
--if test -n "$GIT_CINNABAR_PYTHON"; then
--  # $GIT_CINNABAR_PYTHON is an executable which might contain spaces.
--  exec "$GIT_CINNABAR_PYTHON" "$0" "$@"
--else
--  # If $py contains spaces, these will be arguments.
--  exec $py "$0" "$@"
--fi
--exit 1
--'''
-+#!/usr/bin/env python
- 
- import os
- import sys
---- git-remote-hg.orig	2022-07-15 21:17:31 UTC
-+++ git-remote-hg
-@@ -1,29 +1,4 @@
--#!/bin/sh
--''':'
--py="$GIT_CINNABAR_PYTHON"
--if test -z "$py"; then
--  for py in python3 python python2.7 python2; do
--    "$py" -c "from mercurial import hg" >/dev/null 2>&1 && break
--    py=
--  done
--fi
--if test -z "$py"; then
--  for py in python3 python python2.7 python2 "py -3" "py -2"; do
--    # Make sure this Python actually works. On Windows, python.exe, etc. might
--    # try to run the Windows Store app even if it's not installed.
--    $py -c "import sys" >/dev/null 2>&1 && break
--    py=python3
--  done
--fi
--if test -n "$GIT_CINNABAR_PYTHON"; then
--  # $GIT_CINNABAR_PYTHON is an executable which might contain spaces.
--  exec "$GIT_CINNABAR_PYTHON" "$0" "$@"
--else
--  # If $py contains spaces, these will be arguments.
--  exec $py "$0" "$@"
--fi
--exit 1
--'''
-+#!/usr/bin/env python
- 
- from __future__ import division
- import os