gentoo resync : 04.01.2022

28 files changed, 423 insertions, 183 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 85a695381c38..12c0f82f4457 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-extras/Manifest b/dev-vcs/git-extras/Manifest
index 2fb7d9629770..f8fe111c4703 100644
--- a/dev-vcs/git-extras/Manifest
+++ b/dev-vcs/git-extras/Manifest
@@ -1,6 +1,4 @@
 AUX git-extras-6.1.0-no-bash-completion-install.patch 556 BLAKE2B 9fbf1516888da9c5952fdaedf28987bcf46e62c6dd1342f810c9150625a78198224855dd18b386076a4fd689418c05d61cc8f0c5c0f747fb96ac6209a4fb402f SHA512 70d25e577174238f5fce6a3810146358904493a7ec3963eef6be8780de7b62bcda7e2c542e8f02cf2dd229acfc7368b72dfd4aff668fbc4e841eb6754b2036f2
-DIST git-extras-6.2.0.tar.gz 156703 BLAKE2B 71e3be3f56ca049d2060c79b8dd52aacf613d9157fc5d6fa76c827b59e9355f16903cce94e09dcf73e0c7c4f81b422a37234dbc8f9eb146ca9925da8778ea2dc SHA512 b2e36f887eb101b56734a824f2a3068c568dfca19172733e9263234c1a0f241440727d79bb37aa22c201fd679f37e87c10e521f68a914ec6345b294964fd3d08
 DIST git-extras-6.3.0.tar.gz 159258 BLAKE2B 263e192015e46da7867f131c19ae47243e60355cba02b1860b45abafdc4fc6adf916dffce58b853960d8bb22f5da067e1dca6ed0b02f108953571896d1c981c4 SHA512 2be0a6f3f3907754638ffd975b0b28908e8c9490418fa170f47a73a2cdc9d0b8fd5d11e4734440ffe3114cd63aa7decf8b1cafc78a63d2794d06f7fcd2925ead
-EBUILD git-extras-6.2.0.ebuild 1154 BLAKE2B d03463f2c86e13f65d6324b0d6023712301b4ec3073f6b99b1b889492ae4ae64663580c5c12a77234d9cecf6254576a92bb7af768c11c3dc9443a0138065fe6f SHA512 38f70b4cdcce1d26a318c96467701cefaf17de1b87291d713a9ee666c7f0b011d25b5ae16f09f920038ce4ecf060ee132e46b0665fbcc9a98a2bf8c086109b99
 EBUILD git-extras-6.3.0.ebuild 1154 BLAKE2B d03463f2c86e13f65d6324b0d6023712301b4ec3073f6b99b1b889492ae4ae64663580c5c12a77234d9cecf6254576a92bb7af768c11c3dc9443a0138065fe6f SHA512 38f70b4cdcce1d26a318c96467701cefaf17de1b87291d713a9ee666c7f0b011d25b5ae16f09f920038ce4ecf060ee132e46b0665fbcc9a98a2bf8c086109b99
 MISC metadata.xml 318 BLAKE2B d62d3d04e485a54a0790bbe4390525d6f3ee34ce8ce0c863de54f80c54bfd78f60a32222c0ad101343c3ee7040d5894671a7669c8fc89082bef827cb4edff7ef SHA512 608c0ded622cf20a6d23659fd42295b4c3d70127896b35be659c6d200d649cf496eda5a217deb356754919e0e9d0b635ad38d9b23ae4badd9fdfcf9887f20258
diff --git a/dev-vcs/git-extras/git-extras-6.2.0.ebuild b/dev-vcs/git-extras/git-extras-6.2.0.ebuild
deleted file mode 100644
index 8076a70196d7..000000000000
--- a/dev-vcs/git-extras/git-extras-6.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Git utilities -- repo summary, repl, changelog population, author commit percentages and more"
-HOMEPAGE="https://github.com/tj/git-extras"
-SRC_URI="https://github.com/tj/git-extras/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x64-macos"
-
-RDEPEND="
-	app-shells/bash
-	dev-vcs/git
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.1.0-no-bash-completion-install.patch
-)
-
-src_prepare() {
-	default
-
-	# For now, don't force including the git completion
-	# sed -i -e "1 i source $(get_bashcompdir)\/git" etc/bash_completion.sh || die
-}
-
-src_configure() {
-	return
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		SYSCONFDIR="${EPREFIX}/etc" \
-		install
-
-	# TODO: Unfortunately, none of the completion seems to
-	# actually work for me yet(?)
-
-	#newbashcomp "${S}"/etc/bash_completion.sh ${PN}
-
-	#insinto /usr/share/zsh/site-functions
-	#newins "${S}"/etc/${PN}-completion.zsh _${PN}
-
-	#insinto /usr/share/fish/vendor_completions.d
-	#doins "${S}"/etc/${PN}.fish
-}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 8cdd87822470..45e4a2452413 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -22,12 +22,12 @@ DIST git-htmldocs-2.34.1.tar.xz 1406464 BLAKE2B 6ee2f58df3c1622d96ac4b1a70d4dc3d
 DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e
 DIST git-manpages-2.33.1.tar.xz 494288 BLAKE2B 1f8bd4f23de31a285d3f4327e562dddafdf9f28e8b36334e54f5e280c81fc8170e8b153ca42baa642d02d8e6fdfcac9a8fdd3cee1e32c29bcd53f689d1a6c463 SHA512 d465a7b491046b7a5da6ad1fc6c62b351c69905932e0672263de5a1d3abe1113660cff9fe30c7be1d1695c6170ceca5a11b3f65e9b2d1545f35cc653e4c6ad62
 DIST git-manpages-2.34.1.tar.xz 497280 BLAKE2B aa3c67cec861eb40eda3e7827d3e380fdfb6f189027fb7e5618258b80ac33918cb3c2ca4d2f8dc5fbee959578766564137e9c4818672f5138304270c486658fe SHA512 8f3b56fa477e5aafec3ef29933234c362a372f59ed95694c4fb82ebb82d2a8ebc0ac17ae36caa9185964eef1700ea8732816e73df4ddd918afc949a8371fa0d8
-EBUILD git-2.32.0-r1.ebuild 18215 BLAKE2B e4e5e4a4685cfc0c6b9879c1b900e5be5ab1acec26ed6a070901987e3c538303430429ef92a94c2746791ea88bf01d07557479e6cda8655608c00ec682767875 SHA512 bcac636fe83b1e84c20288f8c184b836df340eacdbc7e4edae661c3eac320d43131bdddbabe5d2e8552ed1a8a0025825d6e4fb26a4c8b7e4e3497d48530d80a5
-EBUILD git-2.33.1.ebuild 18114 BLAKE2B be0b03e1ccd9b20e23aba02214fdd3b3805077d6422a9a16bf099f15d230d6d76c947e816e5cc4d38b5dd9a4d522efa56e078c3d6d53817da8cf5e26b88ae5fb SHA512 d0c395555164515e9f30176ff3e18fac16f918a8a78b2f47b3a020fd80b2ee39568151ba7d2d125ace5b4b24bc06b7cc14a45e8c598591634e5eec62172d3a84
-EBUILD git-2.34.1-r1.ebuild 18118 BLAKE2B 99540b9caf3c75821424ed90eb577e3568c232ccb406033b5f6fee52e0f5294052b4dbae14a19c5d898e385fb2cded89e1857efdf51ac7a7c81cbf433630600e SHA512 d490a95e04b0f3175517b7301812ccdcbcc4c7e2082b8975171f82ffb6a8918e17445f9ce92eb9ee1f48c70e186fccd071bb2d9e831d17aacacdd8e024ecd665
-EBUILD git-2.34.1.ebuild 18118 BLAKE2B b5e31506c006f4cce9f270ecbb1160984196da8d3e9cc4439c85091f6a3490c5c26346432804d94fb2ca98f81875fbac02104ca9248d937d6c094a971d178912 SHA512 f4fb4b2fd673636908b6672e961ba3833037d585f19dfc4ad95d896afad64bbf14d3ed631525498af02cb62c2bc22b2db7e6606f9a95064bce203bc63b45b027
-EBUILD git-9999-r1.ebuild 18118 BLAKE2B 99540b9caf3c75821424ed90eb577e3568c232ccb406033b5f6fee52e0f5294052b4dbae14a19c5d898e385fb2cded89e1857efdf51ac7a7c81cbf433630600e SHA512 d490a95e04b0f3175517b7301812ccdcbcc4c7e2082b8975171f82ffb6a8918e17445f9ce92eb9ee1f48c70e186fccd071bb2d9e831d17aacacdd8e024ecd665
-EBUILD git-9999-r2.ebuild 18118 BLAKE2B 99540b9caf3c75821424ed90eb577e3568c232ccb406033b5f6fee52e0f5294052b4dbae14a19c5d898e385fb2cded89e1857efdf51ac7a7c81cbf433630600e SHA512 d490a95e04b0f3175517b7301812ccdcbcc4c7e2082b8975171f82ffb6a8918e17445f9ce92eb9ee1f48c70e186fccd071bb2d9e831d17aacacdd8e024ecd665
-EBUILD git-9999-r3.ebuild 18118 BLAKE2B 99540b9caf3c75821424ed90eb577e3568c232ccb406033b5f6fee52e0f5294052b4dbae14a19c5d898e385fb2cded89e1857efdf51ac7a7c81cbf433630600e SHA512 d490a95e04b0f3175517b7301812ccdcbcc4c7e2082b8975171f82ffb6a8918e17445f9ce92eb9ee1f48c70e186fccd071bb2d9e831d17aacacdd8e024ecd665
-EBUILD git-9999.ebuild 18118 BLAKE2B 99540b9caf3c75821424ed90eb577e3568c232ccb406033b5f6fee52e0f5294052b4dbae14a19c5d898e385fb2cded89e1857efdf51ac7a7c81cbf433630600e SHA512 d490a95e04b0f3175517b7301812ccdcbcc4c7e2082b8975171f82ffb6a8918e17445f9ce92eb9ee1f48c70e186fccd071bb2d9e831d17aacacdd8e024ecd665
+EBUILD git-2.32.0-r1.ebuild 17990 BLAKE2B 82b6dbbc1e95178bd988f02c37cddec6a0e36489baf73ea3ebc875f8a1c4fbc2bffde169e43cf47042460e7ae15d2c5843d7f97544b90949297f07db835e08a2 SHA512 1c3a49115a87fffcd664ac413601a2c2dad631f7fd6660881d300869c3ea707197b9932d843333749925e9d96fe84c52b1f5202bc256956fa6b303f4517cf787
+EBUILD git-2.33.1.ebuild 17886 BLAKE2B 3e21f1806e2b3ccecf9de213a5edd0c287004ede5e5653469e7575acf928b8e207a7e8b1b660125797b74e539041f66f23f2272896cb32a57f52fd24945e3354 SHA512 dbdcdcd1a508a4bd8423939bb6ee0ce1510f12f2ec8b0fa02752454fdcddc4fbd786b99bb15ea11f4906001ec67b57aefdf9de038a1ccdcff1ab6c1165c67060
+EBUILD git-2.34.1-r1.ebuild 17893 BLAKE2B fa3da8c57ae9571816599eae3d036daba285c7abd213041dc23c5de42dcebc90f5e0b9a0049508f86a3dc88fc112e5d537ced3b19682d31492d3d2a0fc03571f SHA512 8fd18136791a45c7e205aac6a4453d376287daa27abc28f5263bedd986c4e562c78b83c036193583c5145d697b1c3c1df1d36557f5f01cc92b94565efa484f18
+EBUILD git-2.34.1.ebuild 17885 BLAKE2B 016e3535fe918c345f42c0f0eb8d09a523c3c57529ddeb26a677aa0d3a74f78b26ccede54407485642652f64c4df9d1a6bec80f7792d6bfedecb7d52a9529db8 SHA512 401e8dacfc58c8b8b76393473c8ae809b77c088b461e1fb2a4ba148c1811144cd43d40f977ade29d1386f094b76ceb85d7e0f55a1baf2ef95ee7047120c70c4d
+EBUILD git-9999-r1.ebuild 17893 BLAKE2B fa3da8c57ae9571816599eae3d036daba285c7abd213041dc23c5de42dcebc90f5e0b9a0049508f86a3dc88fc112e5d537ced3b19682d31492d3d2a0fc03571f SHA512 8fd18136791a45c7e205aac6a4453d376287daa27abc28f5263bedd986c4e562c78b83c036193583c5145d697b1c3c1df1d36557f5f01cc92b94565efa484f18
+EBUILD git-9999-r2.ebuild 17893 BLAKE2B fa3da8c57ae9571816599eae3d036daba285c7abd213041dc23c5de42dcebc90f5e0b9a0049508f86a3dc88fc112e5d537ced3b19682d31492d3d2a0fc03571f SHA512 8fd18136791a45c7e205aac6a4453d376287daa27abc28f5263bedd986c4e562c78b83c036193583c5145d697b1c3c1df1d36557f5f01cc92b94565efa484f18
+EBUILD git-9999-r3.ebuild 17893 BLAKE2B fa3da8c57ae9571816599eae3d036daba285c7abd213041dc23c5de42dcebc90f5e0b9a0049508f86a3dc88fc112e5d537ced3b19682d31492d3d2a0fc03571f SHA512 8fd18136791a45c7e205aac6a4453d376287daa27abc28f5263bedd986c4e562c78b83c036193583c5145d697b1c3c1df1d36557f5f01cc92b94565efa484f18
+EBUILD git-9999.ebuild 17893 BLAKE2B fa3da8c57ae9571816599eae3d036daba285c7abd213041dc23c5de42dcebc90f5e0b9a0049508f86a3dc88fc112e5d537ced3b19682d31492d3d2a0fc03571f SHA512 8fd18136791a45c7e205aac6a4453d376287daa27abc28f5263bedd986c4e562c78b83c036193583c5145d697b1c3c1df1d36557f5f01cc92b94565efa484f18
 MISC metadata.xml 2225 BLAKE2B 3744d602bb87d31fa9da5a4f6cc78e1d7251024323d1c2ad3f3e0b2ef78de61041fecf7026f0ada5d856139852776e8539b0a9f9fb5b32b3ae742ae6a9d09cda SHA512 3629e08d8ecfe05cc194f3ba03656308da2c7bcac5bd33cbc967b5a4269a60538ff4e119fb9d1a4e59c5d53c31659c55d5fdd0ee52473175147f8fae73a4cd22
diff --git a/dev-vcs/git/git-2.32.0-r1.ebuild b/dev-vcs/git/git-2.32.0-r1.ebuild
index 50b3cfccc709..6c3d422fd38b 100644
--- a/dev-vcs/git/git-2.32.0-r1.ebuild
+++ b/dev-vcs/git/git-2.32.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -226,13 +226,6 @@ exportmakeopts() {
 		myopts+=( ASCIIDOC8=YesPlease )
 	fi
 
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	if [[ "${CHOST}" == *-uclibc* ]] ; then
-		myopts+=( NO_NSEC=YesPlease )
-		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-	fi
-
 	export MY_MAKEOPTS="${myopts[@]}"
 	export EXTLIBS="${extlibs[@]}"
 }
diff --git a/dev-vcs/git/git-2.33.1.ebuild b/dev-vcs/git/git-2.33.1.ebuild
index a11db72fc562..26673133f9f9 100644
--- a/dev-vcs/git/git-2.33.1.ebuild
+++ b/dev-vcs/git/git-2.33.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -222,13 +222,6 @@ exportmakeopts() {
 		myopts+=( ASCIIDOC8=YesPlease )
 	fi
 
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	if [[ "${CHOST}" == *-uclibc* ]] ; then
-		myopts+=( NO_NSEC=YesPlease )
-		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-	fi
-
 	export MY_MAKEOPTS="${myopts[@]}"
 	export EXTLIBS="${extlibs[@]}"
 }
diff --git a/dev-vcs/git/git-2.34.1-r1.ebuild b/dev-vcs/git/git-2.34.1-r1.ebuild
index 74e58d7f357a..c77551019c67 100644
--- a/dev-vcs/git/git-2.34.1-r1.ebuild
+++ b/dev-vcs/git/git-2.34.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -222,13 +222,6 @@ exportmakeopts() {
 		myopts+=( ASCIIDOC8=YesPlease )
 	fi
 
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	if [[ "${CHOST}" == *-uclibc* ]] ; then
-		myopts+=( NO_NSEC=YesPlease )
-		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-	fi
-
 	export MY_MAKEOPTS="${myopts[@]}"
 	export EXTLIBS="${extlibs[@]}"
 }
diff --git a/dev-vcs/git/git-2.34.1.ebuild b/dev-vcs/git/git-2.34.1.ebuild
index 6fd30df80506..30f56796419f 100644
--- a/dev-vcs/git/git-2.34.1.ebuild
+++ b/dev-vcs/git/git-2.34.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -222,13 +222,6 @@ exportmakeopts() {
 		myopts+=( ASCIIDOC8=YesPlease )
 	fi
 
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	if [[ "${CHOST}" == *-uclibc* ]] ; then
-		myopts+=( NO_NSEC=YesPlease )
-		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-	fi
-
 	export MY_MAKEOPTS="${myopts[@]}"
 	export EXTLIBS="${extlibs[@]}"
 }
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 74e58d7f357a..c77551019c67 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -222,13 +222,6 @@ exportmakeopts() {
 		myopts+=( ASCIIDOC8=YesPlease )
 	fi
 
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	if [[ "${CHOST}" == *-uclibc* ]] ; then
-		myopts+=( NO_NSEC=YesPlease )
-		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-	fi
-
 	export MY_MAKEOPTS="${myopts[@]}"
 	export EXTLIBS="${extlibs[@]}"
 }
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 74e58d7f357a..c77551019c67 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -222,13 +222,6 @@ exportmakeopts() {
 		myopts+=( ASCIIDOC8=YesPlease )
 	fi
 
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	if [[ "${CHOST}" == *-uclibc* ]] ; then
-		myopts+=( NO_NSEC=YesPlease )
-		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-	fi
-
 	export MY_MAKEOPTS="${myopts[@]}"
 	export EXTLIBS="${extlibs[@]}"
 }
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 74e58d7f357a..c77551019c67 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -222,13 +222,6 @@ exportmakeopts() {
 		myopts+=( ASCIIDOC8=YesPlease )
 	fi
 
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	if [[ "${CHOST}" == *-uclibc* ]] ; then
-		myopts+=( NO_NSEC=YesPlease )
-		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-	fi
-
 	export MY_MAKEOPTS="${myopts[@]}"
 	export EXTLIBS="${extlibs[@]}"
 }
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 74e58d7f357a..c77551019c67 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -222,13 +222,6 @@ exportmakeopts() {
 		myopts+=( ASCIIDOC8=YesPlease )
 	fi
 
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	if [[ "${CHOST}" == *-uclibc* ]] ; then
-		myopts+=( NO_NSEC=YesPlease )
-		use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
-	fi
-
 	export MY_MAKEOPTS="${myopts[@]}"
 	export EXTLIBS="${extlibs[@]}"
 }
diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index a5087e055746..a99ad33fc41f 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,3 +1,5 @@
 DIST gitg-3.32.1.tar.xz 10613836 BLAKE2B 43c2c37f5c06cb6155906d5988f0787334af7a9091e537fa7b0fc1a9de3138f261a3e3c578afc663c7b57a33f39c19318a53daf7896c465922138197c3bbb778 SHA512 243e630b3e5bb1919dc307e6b3fed1b1b0e3884d2a2507e4526b4af61e86f1cd7004a3dbb96001ffb0280cefe7cdb9b109c39996718913c7410224830c0145a4
+DIST gitg-41.tar.xz 10604696 BLAKE2B bc8a07565338f77a0a4706d6ff145ed09096acb0230fb160218a6374b87968ffde6615b6e2970ca9162ef542f877c3c8ab2023396c13e023cc47dd5bf466f22c SHA512 4e8fe0b1ab5302f975f58277e5ae42300a96d20bb1c41426d8c0e058a53420fcca73f75566f593f5aa2882b3a0e1608cdd542bc4f68c731153ba9185972d6f51
 EBUILD gitg-3.32.1-r1.ebuild 1952 BLAKE2B 1f5b072583bd1777ab7b54bed220921ea94880b46d94ac06bddcdbc5b9828cbb386152b381fcc6d5a106dc9b0abe00911fa235ac46abb486bcf6f5b045ecc3ef SHA512 be9308fd5438f6867b275ae7afa01cc12bcb1bd36213b0456614571604f386d9ec358d2e7039322ad8901deced33688e44529a5fb10cbd77ec28a536c2a37ecc
+EBUILD gitg-41.ebuild 2067 BLAKE2B d8d44516f97e4179d1d6d9c1073cbbfe226f6c7f9bbaddba57769f2e343a2a4702b7db77cfd31903441bca23c202af0c70b7e07adad5261f0083723134b8aff7 SHA512 4c1bc859a401d9b165a322856411a773b7f848ae706bffd5bc594209eca38a8519f8f05fa7474cf2fe52dba12f919b82e6d93ef0e02cfe89072bd023a951ce56
 MISC metadata.xml 825 BLAKE2B 80afe83910f10e46ef7367897965440086ac6d0af1d88d24501f83ee79e3f1e0f6616bb8b76e89822a496ed5101fefe9ac927a773543b8f84bc9f7ad08bfdec2 SHA512 397f02a9fe2d282a12e1128210c5818e86cc123729aaabcdbdc038a319132d9c16e9b8a30ecc54ef1c03da0bc35892a9b1093eaa02aba60789ba43de9969fcb8
diff --git a/dev-vcs/gitg/gitg-41.ebuild b/dev-vcs/gitg/gitg-41.ebuild
new file mode 100644
index 000000000000..37bca5db740d
--- /dev/null
+++ b/dev-vcs/gitg/gitg-41.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+# vala-0.36 fails to build, https://bugs.gentoo.org/692538
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson python-r1 vala xdg-utils
+
+DESCRIPTION="git repository viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="glade +python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test if unbundling of libgd is possible
+# Currently it seems not to be (unstable API/ABI)
+RDEPEND="
+	app-crypt/libsecret[vala]
+	>=app-text/gspell-1[vala]
+	>=dev-libs/glib-2.38:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.1:=
+	dev-libs/json-glib
+	dev-libs/libdazzle[vala]
+	dev-libs/libgee:0.8[introspection]
+	dev-libs/libgit2:=[threads]
+	>=dev-libs/libgit2-glib-1.0.0[ssh]
+	>=dev-libs/libpeas-1.5.0[gtk]
+	>=dev-libs/libxml2-2.9.0:2
+	>=gnome-base/gsettings-desktop-schemas-0.1.1
+	>=x11-libs/gtk+-3.20.0:3
+	>=x11-libs/gtksourceview-4.0.3:4
+	x11-themes/adwaita-icon-theme
+	glade? ( >=dev-util/glade-3.2:3.10 )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-libs/libgit2-glib-1.0.0[vala]
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	vala_src_prepare
+	xdg_environment_reset
+
+	# it doesn't do anything in DESTDIR mode, except for failing
+	# when python3 symlink is not present
+	echo "#!/bin/sh" > meson_post_install.py || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use glade glade_catalog)
+		# we install the module manually anyway
+		-Dpython=false
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule libgitg-ext/GitgExt.py
+	fi
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-vcs/gitolite-gentoo/Manifest b/dev-vcs/gitolite-gentoo/Manifest
index 653d77f704ab..7fb086996dee 100644
--- a/dev-vcs/gitolite-gentoo/Manifest
+++ b/dev-vcs/gitolite-gentoo/Manifest
@@ -2,4 +2,4 @@ DIST gitolite-gentoo-2.3.1.tar.bz2 198849 BLAKE2B 88268e4588003cb1b8b4e340fd858a
 DIST gitolite-gentoo-3.6.6.1.tar.bz2 155262 BLAKE2B 3dfa89223824ea04be6c0598abad3c6fb982c0031507aa2ab4ad8ecb9cfc5b64846e48f1710cf4436b4947d2f7288398b2603ac8f9a732902cf17a9a168e6b3d SHA512 76765972b06e985879bd3384be62e4b57676d0d67e6d55b56a63a2d802fe3ee76576e0da20896f11764a311dfcde0bfaf4309105ddc8c55c0c09bb098ed6a1bb
 EBUILD gitolite-gentoo-2.3.1-r2.ebuild 1653 BLAKE2B 7af6010dcf5b536224c5e57755f454a931e8a4061aad2f7dddbe86891618c60bbe0c40fd579bc1527fe99799eac1d7f73f31eb9ac4dc1f7376fd5218c676eadb SHA512 dc8a8874d218fb56ce4666118e421d24ddf323bbb12541be79cc0d29481222155797fe1dc3d4fa69ace0a37e1e58cf2d17d51aad42de094579fc8d2efe55af74
 EBUILD gitolite-gentoo-3.6.6.1-r2.ebuild 2699 BLAKE2B ffcf08d0d62fbc88af4a98b6936f8855dba65fe766f20a0b3801755ad0bdbfb758a5843def3856278fbb93cdd8e63019eb8d68f7669e2763b61b1a652ff7d083 SHA512 00c0a45523ef4a2b69c6d5a7a7df71021167159275b3a8826c2f00ffb1872c4120471d719c7b2add5aa2f5428f3ee643b27769e8e6f3f806fed38fc508807e8c
-MISC metadata.xml 479 BLAKE2B 794e249a6bf2f05c54d9352d5ac25e178b354c025f5aa30791d6af163b301465dce37bfbdd568ba41b382ae78d90799c0b0c084f7e28141f9dcea1b9bd820339 SHA512 3bda8d0d45ced162529a04c786ee960c1a595bc82ac5d6931913ce97b02497d923d5962707a96c6bcbec71bf35f4baee82375e6b57ccb01dc3fb0f0429a0bdbb
+MISC metadata.xml 480 BLAKE2B d3524b1d64cf32814329c1cc96d92c816b333dec23a2f9fe03f22b7d361b449ef6700985d94e98253dcb60862e38fc6f5a36ac3bd92f110fa92291a85627b308 SHA512 bf7340f6554cd04dc1b8fc7c9d4f08023ce56514a38344f83a03a235b63389df4fb20b2f5d5761c4d82f1cf67e687420a52395b9afc807322d39d96e96ec7915
diff --git a/dev-vcs/gitolite-gentoo/metadata.xml b/dev-vcs/gitolite-gentoo/metadata.xml
index ece90c49764e..2999e4b2c5d0 100644
--- a/dev-vcs/gitolite-gentoo/metadata.xml
+++ b/dev-vcs/gitolite-gentoo/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>idl0r@gentoo.org</email>
-		<name>Christian Ruppert</name>
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
 	</maintainer>
 	<use>
 		<flag name="contrib">Install user-contributed files</flag>
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index b136ade0d303..9ffd14751f0e 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -2,4 +2,4 @@ DIST gitolite-2.3.1.tar.gz 255807 BLAKE2B b51a664d6e786702cad999fa8df6d86f80eb9c
 DIST gitolite-3.6.11.tar.gz 198340 BLAKE2B 9daf1e2cb2ebdca652d87aaa67b433174d35ece2ad859de6c6d6295f453b6fa86d15240e964fdc58fc4ee5b1018b935b7032e6bacef9743487189857782220cd SHA512 7c11b3dfde9ecf9ef66185aab175d78302c42cc24f13e3e855fa27ffaee65b5887bdd7f96b00b6eed944b91af2b86993b284d1a09fe5a5a3cce82acd33631212
 EBUILD gitolite-2.3.1-r2.ebuild 1448 BLAKE2B 5635d6b5666137d57635d399edf6c9d8715f509019848cadaa69f297d7c340361ea2c12e5b22b3f5ecf877cf4e231268142a0e50da25d92defdfec6c3dd3854e SHA512 1a313c4ad8bf4dc6c61c569cdf0ca1ba3f8f566f2156756c6fd3f4881b7330b299f8e6a6e4b1b774dabfb6f271323ea686d093f928d19a69f173362c500baeb2
 EBUILD gitolite-3.6.11-r1.ebuild 2289 BLAKE2B bbef6eb06d89f93a645f7fba5e5758d3a7ae1ba1d35f24efad7d606aa270798a7347cfea38e556239397e31f5fd35491b06795d89e5d364c2c52456ca39e6943 SHA512 0c2d25c27980391a0f23218857be340e7a9e14600dfb23c3bac92d79c0e39127b9d4a5bc2b21fd042276e9cf2cb98886611e1149c8b2dd1d3c444773a79cce8c
-MISC metadata.xml 781 BLAKE2B 58d4c06760bc04e746a5268ad628242c181c7f2ce5290bc3ae3090fd0827c9db07b18fef13c4434b7bc231380bc0faf46fcacc9b87802a9b6b49df8b8afe287e SHA512 7a23e8e3e7001eb389767b208007d551feae1193d43d1ec17f0790c6021e88fc6b201d5c5bef59cb0ad7101da51b87e8b53e28a211ffa9f7f4cbdf8aab0bf748
+MISC metadata.xml 782 BLAKE2B 4200d317ed8e94aec00251d532408b25ac3b93433f136870bd2d991517eb3360064a5a2514f4d8fa12a53b699107a971aed65ee474d9391b0436c34a85625412 SHA512 e0bec70e3165fb253fa01a57133f5dc592117e8a5679a545902b18266b137bca1083998af8fa771c826a89915cd3c0bb2ea7b848c453bdc740d25a83f595dcc4
diff --git a/dev-vcs/gitolite/metadata.xml b/dev-vcs/gitolite/metadata.xml
index 4ea2442c7985..0cd6cf3bfd14 100644
--- a/dev-vcs/gitolite/metadata.xml
+++ b/dev-vcs/gitolite/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>idl0r@gentoo.org</email>
-		<name>Christian Ruppert</name>
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
 	</maintainer>
 	<longdescription lang="en">
 	Gitolite is an access control layer on top of git, which allows access
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index b5247e2942e8..78fc1e34a795 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,6 +1,7 @@
 AUX 70mercurial-gentoo.el 76 BLAKE2B 2b9488757b2516dc494ce4f38c89b63669886eefaeb5a867cfcc2c2301dcadd01c54745fca3504460c13546f6947677764c87a2e3f30c1949baa4da4c4fe402c SHA512 2efb67d5f595842ccdb9b9ea0c6b6fbc3a28a77955d7255817309486fac19e7550ee0a545d5824e3f9acaf586d93533e90ccd05e15d76884d6493f50fb390a44
 AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90
 AUX mercurial-5.8.1-testing-timeout.patch 494 BLAKE2B 010ab51a2bf4963ab8340052c5becee5a4ace471755b97e8d9409a9697a6697ac87bb2a5fc7556948a68f81bd3a78d17a7ec7523a70ca79848b5c175ff4f3515 SHA512 d4a8f05ebc2f8f44f9646fbaebee4f522cd271dcb4f72681fcb53df58b09fd031643dd5644aff80bda0480aaa21daf333245cb5d83d71941fa74d81858f8da33
+AUX mercurial-6.0-testing-bigendian.patch 15551 BLAKE2B 03fccd80642be2f041bbdc905548ff0560857f8d121cf6e5d9a0660e20a80067743751573fc2050ec036440a29c3b7f00e6dcc5ea8e5742e9485d85ef262b485 SHA512 d49c5d4433d435971fc8c4ee593a146001ddd7d01723511e83218e452421b3eaea893af6705078fd146e0d6c970799bf7be647c45551083afb6d9efafe438f44
 DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
@@ -21,7 +22,7 @@ DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42
 DIST const_fn-0.4.4.crate 16138 BLAKE2B 80885ad10a5649876d37635dc6eb8b426e68f23d7bfdac234ae32816e7fae6d246ff0657d904a3b18dc5ab93fcaa3d4ff28984a1144fa3557d082c1c4d064fd1 SHA512 d79f07982c8ead364f314672ed471d41c6f31431cf511eff5e4c42ebdde324842110ffb8238394d9e8ba2ac19d884fa5f359ba04cef83acb1ca9431e14acb030
 DIST cpufeatures-0.1.4.crate 10129 BLAKE2B a497cb23661b52c8627ec7a794a6ded37277ecc6aa3a405258e712cca4194811645947368ac5db4e22360f52a98205d9420de2288879635e5269e3de3aa684ea SHA512 8d6fbdf934359f4fa5f65df30801fef2ef1d011107884060b542a8f521c86ad3ce808f39bd78e971794a888d53df8dc045efc00e208df8c26ccaa9d951e5570c
 DIST cpython-0.5.2.crate 118024 BLAKE2B f50bfbc15b280cda22a7c7c47ec5453139fb8591b66c78de7897937296bb3805d7fd356ab09233293cedb5fe131699cf4517fcbf9b1ef61bb7ebb99d1c21e84a SHA512 9b2406afa2e309f9c748e42ac8d7d875b125e5cd40b8dc515c45ec87d1610bce50ab1ba2d95d7bec584de98e171377f08cb8a3ce0a0268383f030ed8631b728e
-DIST cpython-0.6.0.crate 120585 BLAKE2B e5d39cf53d982839125cc74f362974a8fa455f19094c6cd1955e9a7012dd2d4b6172e1a74a3fd609ca0063af48099b48f2f1fcd6f1ba903ee3127b5357165dc5 SHA512 d656b3671c5d50216f80d757278d2b25c91a6da659f65832fbc621b7aa2e5975318189e33139fa31d84dad1cf052fd7af2c6b1fa6287ab19dc4ec89939e537c5
+DIST cpython-0.7.0.crate 125875 BLAKE2B 7965a16c7f25423703eb041c02f9b31ddfbed7290bcbac57ba09496021fb1effe934bb0a0ca597ecbef2221f916964e71bad307c02b69e65e017757f5e1dfcd0 SHA512 74508ee2a58bf20ed374c92c8ee67fb850f807c84a6b53c01007db87541c4ede8690c376fe9958903f716b2d0024c3f8562377b63abf630dd6c8964c7946d40f
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crossbeam-channel-0.4.4.crate 86868 BLAKE2B 88629c72c0be41bb3a0d7dc92f6908d46cb397223449da5b2c990b7660e09dfd3e3f3fb708d13586f5dbf199d62f781f1f7e0b73d279de0ef810f7bcf25b3f27 SHA512 2933721d6af3126f492f112f3d662fc40fb49139a84c72d33b6c2b0aa94fe964acb302fe726e999be4292a1410d3ee896169a0434dccfbf44d166008719846d3
 DIST crossbeam-channel-0.5.0.crate 86811 BLAKE2B 9af4384f2b74d202971f1967887cfd0e71ddba9a6456ffbdfc80bf192d527f61242239d2eb6a0d9dcbe47be22eb414736976e6b1840c021610d96a3bf03c3d18 SHA512 838b433d48b84f1fea020a1d1324e366e6cdae30ef07396140f195afc45b8f705de6347d949b68ce1ed0708fe533ffaa2cfdedc9d2e6288a7325c188ccde9aa2
@@ -56,10 +57,11 @@ DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca1
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
 DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
+DIST memmap2-0.4.0.crate 19851 BLAKE2B 6bf418db7ad4af69121cc525be4ecb834c6ace06a0ab011e536f52d7b7f02659747891f26aaccefc9805865b7e336386a36d7d747c30e4fd50eb9962c2adf2e9 SHA512 80a688941af4fa7a6d78909bed0cb08652bba0a045b7808449fec011771428154eb0199d74891247532c9a679076c6b662cfaa9b8510a8cd06a4865ade20dd32
 DIST memoffset-0.6.1.crate 7706 BLAKE2B 351e6ff24a61b1016e7749571e1e66dae370c58746baf00b4688bb1e2d8c88621aa6f135468593bcd8ba30acf2c097d06a0dd7243eb06b9825e3fc1ffd31ea52 SHA512 74d081af00b7e442198b786d79e4ef35c243d2e78347ab9cb50e127569aed3fd77b47b95df6f361a716abce27c8cc6cb1dfa12c92b0b2208b21f9eb9527b61be
 DIST mercurial-5.8.1.tar.gz 7988000 BLAKE2B 7805a7141a503f8533a25d0cfd3c58c421c966cb9ec83503c855e02aeb8a7fff98bf529f4807bf6fc5f606ae110c4a0571e0e249441bd4be6b5eefb07284958e SHA512 d17c809fc48c55d646b677ad23b5cf4a1755f5a81790988109cd50ac259acc230edad7bf5ccc7a6384a490aeba4a7492327bb9878a541d5fa7207e2c378be966
 DIST mercurial-5.8.tar.gz 7985326 BLAKE2B 3b64343b692c389368b9c61baf367fe739bb79a7b555308fcd4f09069472b393343f57608954017038c849d6812cd6fe5e1e20bbc6a95974d827d7e402c60bd7 SHA512 79eec3a468a1826d4910d140797f26f281ff5e5fb9a0e09656d458577e05cf11ac6032c0d282aeec2996edbd7af954652c97097ea4485b211dad7424c4d20979
-DIST mercurial-5.9.3.tar.gz 8126023 BLAKE2B 8799f7ec1533a1b1b97b683cf002a0562f5feb52ec02b2b627a2467b83a3ec667b39b28ad8a38a0b5f7f1d1a4561cdf68c83c3332f7d3d2f3740a3d4157b8565 SHA512 d2a91cf63ca8f7621a2d36af7993c9878a2a36c7c95a027f2ff9d5ec3cdb01b9f86a60108cf3ca674b5b306488f61f749c3d8c5f814d6c90c04941d551d458dd
+DIST mercurial-6.0.tar.gz 8137797 BLAKE2B d6b4021e3ee249280c99e4f84f393801ac1feb0560fe20333c2b5c99eac46d704afe6788a1ca27ba22b8fd2a2f363869da05d2880e7ad6a19774a297310b89aa SHA512 342440af75b8e48b75ca604ee4f81298b652413a07f84cb475d9ed3c875a8b69bc22289c2a22d6f07c7bc54fdb1bc25a51a179eb9dcdc299b85fdd0fa4827dad
 DIST micro-timer-0.3.1.crate 3357 BLAKE2B 13c518d2b3de6fa683078b9906b719498da2e2be5a23e7a2511f3d1d69730769031ed6b488927bec845c0405782f55cfe5af8610d56d92e716ff5d9056650f5a SHA512 197beadbdf35dd0892f6e0c1a09b6b57472166ecaec3e10be12c436e1381540100092c9e717684db44b53375390cf2c245fdc6fdb376117fdf5b4405ade73cf7
 DIST micro-timer-macros-0.3.1.crate 2928 BLAKE2B 148639d1f22965c7487fefd19b1413797aad0f9e0c4eb8ee7be181e7b6bd39e03a6d3d68131b05e09f87a3ef653d6eda643952025983b49736a9c6ddb778aafa SHA512 9c9ffc8432c9377d2de3fce931f398d7f77012f496dd6c011718abd46535205766d9f5a7c97ff14ecd87bb172039d8e92a8c45cfd9c14d220a368448da1b7917
 DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
@@ -77,9 +79,9 @@ DIST pretty_assertions-0.6.1.crate 61551 BLAKE2B 1e92be2282e42720c9e1d1d26f9e675
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST python27-sys-0.5.2.crate 37459 BLAKE2B a122bf29fbb16b46876c885811219e08376f666e385055ddc4976a0ba9a7d90954143a55a68033113d1e52375bdba68519fbade2cc8bba56174ada9e89448790 SHA512 670087e6edf55084fbe005f33baddd7936900f18753181288d9fb06deec56bc09cb78cd2ec2c94529be5ae603b95de364ea7f92e5d4cd2aad727672fe96754ec
-DIST python27-sys-0.6.0.crate 37198 BLAKE2B 9d35f3ceb1be97d9404d5a3de6419696a13a941522701b6b6506a3f8e936ead2046eeb62986a70fa35fd5283c451379288b80d5ce1bc358ff1b57365368023bc SHA512 8104d7675ef9e92d17bcb34b2e7919a5dd7163be3fee66f4802c99153787a2d38f3959bb72f8d975e2cbca3d35949408d1911bc79e31b20905a5ee173775504d
+DIST python27-sys-0.7.0.crate 37506 BLAKE2B 739d2094fa5d7ead7508acf54073692a0e5e40989034fb91edd5e3a23fc1470a71e7a9e0294daa0e4715d4205f4cc8c04bc775faec8000b7d2a3a4464615955f SHA512 5748e7db36a97ba1b9d44096aab5dec9e18b1eb8723f301921f430edfee7f9bde54b205c6f8816eb1c0f1aa9d8e9a1da1fe046bf381da6a56548eeb058db3ea2
 DIST python3-sys-0.5.2.crate 44605 BLAKE2B 72e68e32334e709bb291ef609b1da2f123cb0f080f6bc517bedc9eb46ae68fe37b6fe4655aca9b478a65726f03097ef6400c351b7a301885e019fa45328161d2 SHA512 abcc7624b5c8b018f553c5971414a33974e759056b50a20883c98168e790b26b94287f111fa1e00c6c78841cc5cc1a7462262462e6a9e72e5991140b729d4046
-DIST python3-sys-0.6.0.crate 44905 BLAKE2B 2cd2d4379182a5af623fa7b1f35c4c999a02235600d669e717e34e7550161ff5702f300d84bb148790cbc3517a1f1c4d34e61af71f24a85b111d2f09682f23bc SHA512 c5fa01dffd12aa95794c71798de21ac8619c42da2b6f408203032d6c4d1c17b72716cab7c54e981fb1eb1983dbaf0a845c6294893058c2ce2ce818e5378e72fd
+DIST python3-sys-0.7.0.crate 46268 BLAKE2B 0c79cd30c69c10ec3dc30f574e7cbefd465e7d8f13c8495e8090cfd8a69ae6d6095eace734bff5b4ff0b8b7de76425aa1b61aadf798ac3e5a2633397fe762b2c SHA512 f2debc89c6f415a5e5eb00699e2d40e30b9f2bf5b82f3ffcc62695e45a9345a8c30f39a823e01fb13ce8a22624b09d6a4f40729614b826964203c3787f99951f
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3
@@ -106,6 +108,7 @@ DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST sha-1-0.9.6.crate 13758 BLAKE2B 8199c2cbdab2954edd44aae6bee8fdbaa883f27993722845179aa2117849c5ea86df08ef58da514d0bb78612381977f9d101928a764a62b8b14ac04e86e83d6b SHA512 10a37e30b0c65cdb64a49e14185faf7d0bb776910f87c5dff128674762b4375aa1f9f2bf90b38ef37c521ad365d3a2f02c0e33157593fac15fecf9b33a5fa9fc
 DIST sized-chunks-0.6.2.crate 40265 BLAKE2B eb02254a9feaf421460130345969ac244f8b46a536f6eae27e9fe55133ab6149f545864bacee70d839a492b81b790a9eb74a0f31f44c6f2d6ce7f470a6a2eb48 SHA512 524eb5ca27cbadc6b3a2ee32e4968308ab7fd01c961511b2c783338fbc0435303a607d92c2066a9dc1fe1772ccfdc0a97875da9a929e7cfcbbb8d0647768d26d
+DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-1.0.54.crate 228322 BLAKE2B bf4455927b913902fcf1804284660c0b7c9fbe3c50a9f854b8e44d3fc726825fcde85c563f3df4404406d51b517299eda19dbd085bde552dfe5d4f0d9a7510f4 SHA512 2cbed3fafcb3c628623273b83678238d0e66f899599e3364a6511c59c881ad4a3299b806462c06f19ddabfade096c1a7dedea95273461ea3f8ae347a2b3c1ecb
@@ -131,8 +134,8 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST zstd-0.5.3+zstd.1.4.5.crate 26013 BLAKE2B 033e839622b8403268a1a98c2f525b4f6dc624378e64fd644e09cd1b11a8751c1097f134a5f40793a8a6b57635ad28ba3534dfc48e7ec818873dd4819311c80b SHA512 cb6d2adbb3d400ffec19ce7c942b47a0e5826ed62bb8de195b0e8817b4a1e00c1569a080457452180cf869b7bd99fdb150e4a981a992f977b2dbd03eb5a073ff
 DIST zstd-safe-2.0.5+zstd.1.4.5.crate 9002 BLAKE2B bf92884b629d5685dd563e481e63c67dd4c6aff52a402e0ec4f675cb40dad1f9e5ab675b45d4f326bfd0f75a22673ad8538b2924c4bb6220cb1fe23fce2262fe SHA512 cb4b33059da628e103a0fc9a83217fe96f5201cc9db0572b3c2d102b181dc29c346aea12ddec902ecf36886fcb6a2177155791d00ee2fbb267ddf84a48d3c2c6
 DIST zstd-sys-1.4.17+zstd.1.4.5.crate 2046794 BLAKE2B 40584094797d4cc479cff9d1b89abd1f7e800f774725dc03c531b67078027d5b82464984d4e2a76cabcd9d336234d245f93692d0111e2469ef21ca1ea6260d77 SHA512 89439b20e4e0bce6455d982fb7467c45436ee68572395db662d056eb2e09e95ad600947bf11c27ba60b161c2e2511e04cac8dcfacc5f85fcf9222d4a206bdc30
-EBUILD mercurial-5.8.1.ebuild 6813 BLAKE2B 0ea37a47b866a30a44928426e6cd2f2850a506a9ed06282e73a33c6788aa4ed610e6e5c9292f041e6e20e35dc0c734576b7a5184a5f32dcf6767c1f30c362c58 SHA512 8adeba2a54b2af67c0be1ab2ab546bee158c31475a43dde3d06e84a838eff170e89b8a990a170bc08f6f3db81d5202ad5f3c29f13cb342ce6275864af463da19
-EBUILD mercurial-5.8.ebuild 6725 BLAKE2B 58728901788b4055ca9283ecdad0bb1225baa98ae814c5807ed3bd2fb77100f2ba2e6678630bbc4736e9522254bd3098bcce5f0aa764d35f7187ed65fd958171 SHA512 570f8c6b535bc7d8d68da878f179388c15a75a6edb37ef4e0de0e78ef7ceaf32452ea603624ad980fb0f9bbbb32cc610f0e84897927ccc3351345ecc0961a67d
-EBUILD mercurial-5.9.3.ebuild 6821 BLAKE2B d4103d4abcb82343b945c5bbf1c9f6cc891377a9ced5b90e909c83921dba5327a79a96fcc320402268d2eba50f2182590b140fb6ce6a9ec675a599cc9fc968b5 SHA512 a946b8497083529f39962f8737e97a97d84b824a57690ddb22593104ccda7491d86255bfe39541f08efb10a68becdc8e1e3051c1b341481150260c4c3002e67e
-EBUILD mercurial-9999.ebuild 4323 BLAKE2B 79df61d71aad73073e513cb5e9b2417d62cffdf1358a5c92f4295df8c64e6ac693ab934c9efc6812a81516cf3e71efdef59efa0fe722d4bb769b3d47400ff07f SHA512 6476fadf553ac6d9c82ec0b5af41c41f0183840374e3e0e9ef007bfbee43efab60c2e9da3c6d792daeb223a6a7755aecf99ed97746b633bb489712426fd8d40c
+EBUILD mercurial-5.8.1.ebuild 6925 BLAKE2B 6b596fa90725216369711ad26d3337528e6a566b56e3c3db79db4da7aa3d8340c5e0472e18004b8af1870c4ec1589bad37a36e0ddcd87f3ace4a2e3d1922b11f SHA512 c670e33e09991bf5858d1438ae37d8dd74bf507ecc6ed2d082919530a24696a67fdd5fd9a8ea5f4b5194c892cc58fb9d6074d92cad894a76cd964e7b7bb020c0
+EBUILD mercurial-5.8.ebuild 6747 BLAKE2B a3da7343aa99b86ad639d063e2cfcf573be29e9286dcec2fd105bb0cbd3f51e635ff61bfa977c8d65b64812579ab2de192bdc1de0711be36da3a2e071f188afa SHA512 8005efead82f501f3da9c5caba43237a86e7980e7f8537ed49b684cf227f849b85c90261dbe1dd459555cc3ef26c91fbcd71f76b6a9d8b55dda328c6b7e49ebf
+EBUILD mercurial-6.0.ebuild 6774 BLAKE2B 565474227d90472b5f021b74dfbcb1105bb461acc2fe272c815022d8f9721bb062b5debeab8d5f2ae80cbacfb26d2aa457e6fca811f1ddb66f8ae72495c82b06 SHA512 1013c7d03100ea2a38f9112b544c4684db4ea7bbd29fcf05351d3cd84f65e91a00c0fd023a8b8d747d16c6b77c74afc20324fa93a5526fa4ebf408d00a70229b
+EBUILD mercurial-9999.ebuild 4435 BLAKE2B f3a1ea930b7b824771b32ac4a898098431e1c04956a017abf2a2cb517e89fa31b4c669922c2cf3e32503d214e3b062b06a13200a1dd92ff15691c195a609a93f SHA512 7cea11e2939e44a5be9f1de9f3679e5a4a0b952d1243e39412b0add0419bbcbab50f5957ef12bcc0a6ce7a7f3b44bcb4b5b98330c37938b44d14cdfa4edce178
 MISC metadata.xml 532 BLAKE2B c25f7820716a18cf155149294fde42126376d025fa569043d6b7fc25f6d1fe87e37b22424cde59d2437ecd6a6b75f0258b5a06282d3f2eed0b928bd858e0c0a2 SHA512 c4be6ddb455c2464ebbbffcdd0c2545b064e1a2058c41f418ddd96704688e08c48c7ee71cdf005a8b9b90f6deaab595c938a6ba9c8c788559dfc62e6b65a76ba
diff --git a/dev-vcs/mercurial/files/mercurial-6.0-testing-bigendian.patch b/dev-vcs/mercurial/files/mercurial-6.0-testing-bigendian.patch
new file mode 100644
index 000000000000..c47eaff7b385
--- /dev/null
+++ b/dev-vcs/mercurial/files/mercurial-6.0-testing-bigendian.patch
@@ -0,0 +1,255 @@
+# HG changeset patch
+# User Julien Cristau <jcristau@debian.org>
+# Date 1629904487 -7200
+#      Wed Aug 25 17:14:47 2021 +0200
+# Branch stable
+# Node ID e11f903fd7a6e80b6168c7ef6e28f20349e681e2
+# Parent  132819e1fa1565b45fc09093ebbfbe991b0a0f5d
+tests: allow for variation in zstd output as seen on s390x and powerpc
+
+--- a/tests/hghave.py
++++ b/tests/hghave.py
+@@ -1141,8 +1141,13 @@ def has_lzma():
+         return True
+     except ImportError:
+         return False
+ 
+ 
+ @check("bash", "bash shell")
+ def has_bash():
+     return matchoutput("bash -c 'echo hi'", b'^hi$')
++
++
++@check("bigendian", "big-endian CPU")
++def has_bigendian():
++    return sys.byteorder == 'big'
+--- a/tests/test-clone-stream.t
++++ b/tests/test-clone-stream.t
+@@ -399,21 +399,23 @@ getbundle requests with stream=1 are unc
+   00b0: 00 00 00 00 00 00 00 01 ff ff ff ff ff ff ff ff |................|
+   00c0: 80 29 63 a0 49 d3 23 87 bf ce fe 56 67 92 67 2c |.)c.I.#....Vg.g,|
+   00d0: 69 d1 ec 39 00 00 00 00 00 00 00 00 00 00 00 00 |i..9............|
+   00e0: 75 30 73 26 45 64 61 74 61 2f 30 30 63 68 61 6e |u0s&Edata/00chan|
+   00f0: 67 65 6c 6f 67 2d 61 62 33 34 39 31 38 30 61 30 |gelog-ab349180a0|
+ #endif
+ #if zstd no-rust
+   $ f --size --hex --bytes 256 body
+-  body: size=116340
++  body: size=116340 (no-bigendian !)
++  body: size=116335 (bigendian !)
+   0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......|
+   0010: 9a 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......|
+   0020: 06 09 04 0c 5e 62 79 74 65 63 6f 75 6e 74 31 30 |....^bytecount10|
+-  0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109|
++  0030: 31 32 37 36 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1276filecount109| (no-bigendian !)
++  0030: 31 32 37 31 66 69 6c 65 63 6f 75 6e 74 31 30 39 |1271filecount109| (bigendian !)
+   0040: 33 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 |3requirementsdot|
+   0050: 65 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 |encode%2Cfncache|
+   0060: 25 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 |%2Cgeneraldelta%|
+   0070: 32 43 72 65 76 6c 6f 67 2d 63 6f 6d 70 72 65 73 |2Crevlog-compres|
+   0080: 73 69 6f 6e 2d 7a 73 74 64 25 32 43 72 65 76 6c |sion-zstd%2Crevl|
+   0090: 6f 67 76 31 25 32 43 73 70 61 72 73 65 72 65 76 |ogv1%2Csparserev|
+   00a0: 6c 6f 67 25 32 43 73 74 6f 72 65 00 00 80 00 73 |log%2Cstore....s|
+   00b0: 08 42 64 61 74 61 2f 30 2e 69 00 03 00 01 00 00 |.Bdata/0.i......|
+@@ -528,17 +530,18 @@ Clone with background file closing enabl
+   1093 files to transfer, 102 KB of data (no-zstd !)
+   1093 files to transfer, 98.9 KB of data (zstd !)
+   starting 4 threads for background file closing
+   starting 4 threads for background file closing
+   updating the branch cache
+   transferred 102 KB in * seconds (* */sec) (glob) (no-zstd !)
+   bundle2-input-part: total payload size 118984 (no-zstd !)
+   transferred 98.9 KB in * seconds (* */sec) (glob) (zstd !)
+-  bundle2-input-part: total payload size 116145 (zstd !)
++  bundle2-input-part: total payload size 116145 (zstd no-bigendian !)
++  bundle2-input-part: total payload size 116140 (zstd bigendian !)
+   bundle2-input-part: "listkeys" (params: 1 mandatory) supported
+   bundle2-input-bundle: 2 parts total
+   checking for updated bookmarks
+   updating the branch cache
+   (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob)
+ #endif
+ 
+ Cannot stream clone when there are secret changesets
+--- a/tests/test-generaldelta.t
++++ b/tests/test-generaldelta.t
+@@ -285,21 +285,24 @@ test maxdeltachainspan
+        47       3       30       46      p1         58       1380       1729   1.25290      1729         0    0.00000
+        48       3       31       47      p1         58       1426       1787   1.25316      1787         0    0.00000
+        49       4        1       -1    base        197        316        197   0.62342       197         0    0.00000 (no-zstd !)
+        50       4        2       49      p1         58        362        255   0.70442       255         0    0.00000 (no-zstd !)
+        51       4        3       50    prev        356        594        611   1.02862       611         0    0.00000 (no-zstd !)
+        52       4        4       51      p1         58        640        669   1.04531       669         0    0.00000 (no-zstd !)
+        49       4        1       -1    base        205        316        205   0.64873       205         0    0.00000 (zstd !)
+        50       4        2       49      p1         58        362        263   0.72652       263         0    0.00000 (zstd !)
+-       51       4        3       50    prev        366        594        629   1.05892       629         0    0.00000 (zstd !)
+-       52       4        4       51      p1         58        640        687   1.07344       687         0    0.00000 (zstd !)
++       51       4        3       50    prev        366        594        629   1.05892       629         0    0.00000 (zstd no-bigendian !)
++       52       4        4       51      p1         58        640        687   1.07344       687         0    0.00000 (zstd no-bigendian !)
++       51       4        3       50    prev        367        594        630   1.06061       630         0    0.00000 (zstd bigendian !)
++       52       4        4       51      p1         58        640        688   1.07500       688         0    0.00000 (zstd bigendian !)
+        53       5        1       -1    base          0          0          0   0.00000         0         0    0.00000
+        54       6        1       -1    base        369        640        369   0.57656       369         0    0.00000 (no-zstd !)
+-       54       6        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd !)
++       54       6        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd no-bigendian !)
++       54       6        1       -1    base        376        640        376   0.58750       376         0    0.00000 (zstd bigendian !)
+   $ hg clone --pull source-repo --config experimental.maxdeltachainspan=2800 relax-chain --config format.generaldelta=yes
+   requesting all changes
+   adding changesets
+   adding manifests
+   adding file changes
+   added 55 changesets with 53 changes to 53 files (+2 heads)
+   new changesets 61246295ee1e:c930ac4a5b32
+   updating to branch default
+@@ -357,20 +360,22 @@ test maxdeltachainspan
+        48       3       31       47      p1         58       1426       1787   1.25316      1787         0    0.00000
+        49       4        1       -1    base        197        316        197   0.62342       197         0    0.00000 (no-zstd !)
+        50       4        2       49      p1         58        362        255   0.70442       255         0    0.00000 (no-zstd !)
+        51       2       13       17      p1         58        594        739   1.24411      2781      2042    2.76319 (no-zstd !)
+        52       5        1       -1    base        369        640        369   0.57656       369         0    0.00000 (no-zstd !)
+        49       4        1       -1    base        205        316        205   0.64873       205         0    0.00000 (zstd !)
+        50       4        2       49      p1         58        362        263   0.72652       263         0    0.00000 (zstd !)
+        51       2       13       17      p1         58        594        739   1.24411      2789      2050    2.77402 (zstd !)
+-       52       5        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd !)
++       52       5        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd no-bigendian !)
++       52       5        1       -1    base        376        640        376   0.58750       376         0    0.00000 (zstd bigendian !)
+        53       6        1       -1    base          0          0          0   0.00000         0         0    0.00000
+        54       7        1       -1    base        369        640        369   0.57656       369         0    0.00000 (no-zstd !)
+-       54       7        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd !)
++       54       7        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd no-bigendian !)
++       54       7        1       -1    base        376        640        376   0.58750       376         0    0.00000 (zstd bigendian !)
+   $ hg clone --pull source-repo --config experimental.maxdeltachainspan=0 noconst-chain --config format.usegeneraldelta=yes --config storage.revlog.reuse-external-delta-parent=no
+   requesting all changes
+   adding changesets
+   adding manifests
+   adding file changes
+   added 55 changesets with 53 changes to 53 files (+2 heads)
+   new changesets 61246295ee1e:c930ac4a5b32
+   updating to branch default
+@@ -427,9 +432,10 @@ test maxdeltachainspan
+        47       3       30       46      p1         58       1380       1729   1.25290      1729         0    0.00000
+        48       3       31       47      p1         58       1426       1787   1.25316      1787         0    0.00000
+        49       1        7        5      p1         58        316        389   1.23101      2857      2468    6.34447
+        50       1        8       49      p1         58        362        447   1.23481      2915      2468    5.52125
+        51       2       13       17      p1         58        594        739   1.24411      2642      1903    2.57510
+        52       2       14       51      p1         58        640        797   1.24531      2700      1903    2.38770
+        53       4        1       -1    base          0          0          0   0.00000         0         0    0.00000
+        54       5        1       -1    base        369        640        369   0.57656       369         0    0.00000 (no-zstd !)
+-       54       5        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd !)
++       54       5        1       -1    base        375        640        375   0.58594       375         0    0.00000 (zstd no-bigendian !)
++       54       5        1       -1    base        376        640        376   0.58750       376         0    0.00000 (zstd bigendian !)
+--- a/tests/test-persistent-nodemap.t
++++ b/tests/test-persistent-nodemap.t
+@@ -1017,17 +1017,18 @@ Simple case
+ No race condition
+ 
+   $ hg clone -U --stream ssh://user@dummy/test-repo stream-clone --debug | egrep '00(changelog|manifest)'
+   adding [s] 00manifest.n (62 bytes)
+   adding [s] 00manifest-*.nd (118 KB) (glob)
+   adding [s] 00changelog.n (62 bytes)
+   adding [s] 00changelog-*.nd (118 KB) (glob)
+   adding [s] 00manifest.d (452 KB) (no-zstd !)
+-  adding [s] 00manifest.d (491 KB) (zstd !)
++  adding [s] 00manifest.d (491 KB) (zstd no-bigendian !)
++  adding [s] 00manifest.d (492 KB) (zstd bigendian !)
+   adding [s] 00changelog.d (360 KB) (no-zstd !)
+   adding [s] 00changelog.d (368 KB) (zstd !)
+   adding [s] 00manifest.i (313 KB)
+   adding [s] 00changelog.i (313 KB)
+   $ ls -1 stream-clone/.hg/store/ | egrep '00(changelog|manifest)(\.n|-.*\.nd)'
+   00changelog-*.nd (glob)
+   00changelog.n
+   00manifest-*.nd (glob)
+@@ -1057,17 +1058,18 @@ setup the step-by-step stream cloning
+   > [extensions]
+   > steps=$RUNTESTDIR/testlib/ext-stream-clone-steps.py
+   > EOF
+ 
+ Check and record file state beforehand
+ 
+   $ f --size test-repo/.hg/store/00changelog*
+   test-repo/.hg/store/00changelog-*.nd: size=121088 (glob)
+-  test-repo/.hg/store/00changelog.d: size=376891 (zstd !)
++  test-repo/.hg/store/00changelog.d: size=376891 (zstd no-bigendian !)
++  test-repo/.hg/store/00changelog.d: size=376889 (zstd bigendian !)
+   test-repo/.hg/store/00changelog.d: size=368890 (no-zstd !)
+   test-repo/.hg/store/00changelog.i: size=320384
+   test-repo/.hg/store/00changelog.n: size=62
+   $ hg -R test-repo debugnodemap --metadata | tee server-metadata.txt
+   uid: * (glob)
+   tip-rev: 5005
+   tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
+   data-length: 121088
+@@ -1087,28 +1089,30 @@ Do a mix of clone and commit at the same
+   $ touch $HG_TEST_STREAM_WALKED_FILE_2
+   $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_3
+   $ cat clone-output
+   adding [s] 00manifest.n (62 bytes)
+   adding [s] 00manifest-*.nd (118 KB) (glob)
+   adding [s] 00changelog.n (62 bytes)
+   adding [s] 00changelog-*.nd (118 KB) (glob)
+   adding [s] 00manifest.d (452 KB) (no-zstd !)
+-  adding [s] 00manifest.d (491 KB) (zstd !)
++  adding [s] 00manifest.d (491 KB) (zstd no-bigendian !)
++  adding [s] 00manifest.d (492 KB) (zstd bigendian !)
+   adding [s] 00changelog.d (360 KB) (no-zstd !)
+   adding [s] 00changelog.d (368 KB) (zstd !)
+   adding [s] 00manifest.i (313 KB)
+   adding [s] 00changelog.i (313 KB)
+ 
+ Check the result state
+ 
+   $ f --size stream-clone-race-1/.hg/store/00changelog*
+   stream-clone-race-1/.hg/store/00changelog-*.nd: size=121088 (glob)
+   stream-clone-race-1/.hg/store/00changelog.d: size=368890 (no-zstd !)
+-  stream-clone-race-1/.hg/store/00changelog.d: size=376891 (zstd !)
++  stream-clone-race-1/.hg/store/00changelog.d: size=376891 (zstd no-bigendian !)
++  stream-clone-race-1/.hg/store/00changelog.d: size=376889 (zstd bigendian !)
+   stream-clone-race-1/.hg/store/00changelog.i: size=320384
+   stream-clone-race-1/.hg/store/00changelog.n: size=62
+ 
+   $ hg -R stream-clone-race-1 debugnodemap --metadata | tee client-metadata.txt
+   uid: * (glob)
+   tip-rev: 5005
+   tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
+   data-length: 121088
+@@ -1152,17 +1156,18 @@ get changed, however to make thing simpl
+ this test.
+ 
+ Check the initial state
+ 
+   $ f --size test-repo/.hg/store/00changelog*
+   test-repo/.hg/store/00changelog-*.nd: size=121344 (glob) (rust !)
+   test-repo/.hg/store/00changelog-*.nd: size=121344 (glob) (pure !)
+   test-repo/.hg/store/00changelog-*.nd: size=121152 (glob) (no-rust no-pure !)
+-  test-repo/.hg/store/00changelog.d: size=376950 (zstd !)
++  test-repo/.hg/store/00changelog.d: size=376950 (zstd no-bigendian !)
++  test-repo/.hg/store/00changelog.d: size=376948 (zstd bigendian !)
+   test-repo/.hg/store/00changelog.d: size=368949 (no-zstd !)
+   test-repo/.hg/store/00changelog.i: size=320448
+   test-repo/.hg/store/00changelog.n: size=62
+   $ hg -R test-repo debugnodemap --metadata | tee server-metadata-2.txt
+   uid: * (glob)
+   tip-rev: 5006
+   tip-node: ed2ec1eef9aa2a0ec5057c51483bc148d03e810b
+   data-length: 121344 (rust !)
+@@ -1203,17 +1208,18 @@ Performe the mix of clone and full refre
+   adding [s] 00changelog.i (313 KB)
+ 
+ Check the result.
+ 
+   $ f --size stream-clone-race-2/.hg/store/00changelog*
+   stream-clone-race-2/.hg/store/00changelog-*.nd: size=121344 (glob) (rust !)
+   stream-clone-race-2/.hg/store/00changelog-*.nd: size=121344 (glob) (pure !)
+   stream-clone-race-2/.hg/store/00changelog-*.nd: size=121152 (glob) (no-rust no-pure !)
+-  stream-clone-race-2/.hg/store/00changelog.d: size=376950 (zstd !)
++  stream-clone-race-2/.hg/store/00changelog.d: size=376950 (zstd no-bigendian !)
++  stream-clone-race-2/.hg/store/00changelog.d: size=376948 (zstd bigendian !)
+   stream-clone-race-2/.hg/store/00changelog.d: size=368949 (no-zstd !)
+   stream-clone-race-2/.hg/store/00changelog.i: size=320448
+   stream-clone-race-2/.hg/store/00changelog.n: size=62
+ 
+   $ hg -R stream-clone-race-2 debugnodemap --metadata | tee client-metadata-2.txt
+   uid: * (glob)
+   tip-rev: 5006
+   tip-node: ed2ec1eef9aa2a0ec5057c51483bc148d03e810b
diff --git a/dev-vcs/mercurial/mercurial-5.8.1.ebuild b/dev-vcs/mercurial/mercurial-5.8.1.ebuild
index bed3532e284f..001bdb53dcb0 100644
--- a/dev-vcs/mercurial/mercurial-5.8.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -291,11 +291,13 @@ src_test() {
 }
 
 python_test() {
-	local TEST_DIR
-
+	if [[ ${EPYTHON} == python3.10 ]]; then
+		einfo "Skipping tests for unsupported Python 3.10"
+		return
+	fi
 	distutils_install_for_testing
 	cd tests || die
-	"${PYTHON}" run-tests.py \
+	PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \
 		--jobs $(makeopts_jobs) \
 		--timeout 0 \
 		|| die "Tests fail with ${EPYTHON}"
diff --git a/dev-vcs/mercurial/mercurial-5.8.ebuild b/dev-vcs/mercurial/mercurial-5.8.ebuild
index 4ba1088ae8c0..baafc45334e3 100644
--- a/dev-vcs/mercurial/mercurial-5.8.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -290,7 +290,7 @@ python_test() {
 	rm -rf "${TMPDIR}"/test
 	distutils_install_for_testing
 	cd tests || die
-	"${PYTHON}" run-tests.py --verbose \
+	PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py --verbose \
 		--tmpdir="${TMPDIR}"/test \
 		--with-hg="${TEST_DIR}"/scripts/hg \
 		|| die "Tests fail with ${EPYTHON}"
diff --git a/dev-vcs/mercurial/mercurial-5.9.3.ebuild b/dev-vcs/mercurial/mercurial-6.0.ebuild
index 3f1017f98f7f..3fbbe98117a5 100644
--- a/dev-vcs/mercurial/mercurial-5.9.3.ebuild
+++ b/dev-vcs/mercurial/mercurial-6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ CRATES="
 	clap-2.33.3
 	const_fn-0.4.4
 	cpufeatures-0.1.4
-	cpython-0.6.0
+	cpython-0.7.0
 	crc32fast-1.2.1
 	crossbeam-channel-0.4.4
 	crossbeam-channel-0.5.0
@@ -59,7 +59,7 @@ CRATES="
 	log-0.4.11
 	maybe-uninit-2.0.0
 	memchr-2.3.4
-	memmap-0.7.0
+	memmap2-0.4.0
 	memoffset-0.6.1
 	micro-timer-0.3.1
 	micro-timer-macros-0.3.1
@@ -75,8 +75,8 @@ CRATES="
 	pretty_assertions-0.6.1
 	proc-macro-hack-0.5.19
 	proc-macro2-1.0.24
-	python27-sys-0.6.0
-	python3-sys-0.6.0
+	python27-sys-0.7.0
+	python3-sys-0.7.0
 	quick-error-1.2.3
 	quote-1.0.7
 	rand-0.7.3
@@ -96,6 +96,7 @@ CRATES="
 	scopeguard-1.1.0
 	sha-1-0.9.6
 	sized-chunks-0.6.2
+	stable_deref_trait-1.2.0
 	static_assertions-1.1.0
 	strsim-0.8.0
 	syn-1.0.54
@@ -123,7 +124,7 @@ CRATES="
 	zstd-sys-1.4.17+zstd.1.4.5
 "
 
-inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="https://www.mercurial-scm.org/"
@@ -148,6 +149,10 @@ DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 		dev-python/pygments[${PYTHON_USEDEP}]
 		)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-testing-bigendian.patch
+)
+
 SITEFILE="70${PN}-gentoo.el"
 
 RESTRICT="!test? ( test )"
@@ -261,13 +266,6 @@ src_test() {
 	rm -f test-largefiles*		# tends to time out
 	rm -f test-https*			# requires to support tls1.0
 	rm -rf test-removeemptydirs*	# requires access to access parent directories
-	if [[ $(tc-endian) == "big" ]]; then
-		# tests no working on big-endian
-		# https://bz.mercurial-scm.org/show_bug.cgi?id=6607
-		rm -f test-clone-uncompressed.t
-		rm -f test-generaldelta.t
-		rm -f test-persistent-nodemap.t
-	fi
 	if [[ ${EUID} -eq 0 ]]; then
 		einfo "Removing tests which require user privileges to succeed"
 		rm -f test-convert*
@@ -283,11 +281,13 @@ src_test() {
 }
 
 python_test() {
-	local TEST_DIR
-
+	if [[ ${EPYTHON} == python3.10 ]]; then
+		einfo "Skipping tests for unsupported Python 3.10"
+		return
+	fi
 	distutils_install_for_testing
 	cd tests || die
-	"${PYTHON}" run-tests.py \
+	PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \
 		--jobs $(makeopts_jobs) \
 		--timeout 0 \
 		|| die "Tests fail with ${EPYTHON}"
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 5d9e3029059d..d60f93143ed4 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -164,11 +164,13 @@ src_test() {
 }
 
 python_test() {
-	local TEST_DIR
-
+	if [[ ${EPYTHON} == python3.10 ]]; then
+		einfo "Skipping tests for unsupported Python 3.10"
+		return
+	fi
 	distutils_install_for_testing
 	cd tests || die
-	"${PYTHON}" run-tests.py \
+	PYTHONWARNINGS=ignore "${PYTHON}" run-tests.py \
 		--jobs $(makeopts_jobs) \
 		--timeout 0 \
 		|| die "Tests fail with ${EPYTHON}"
diff --git a/dev-vcs/notify-webhook/Manifest b/dev-vcs/notify-webhook/Manifest
index 49736d4e21a8..d35888395401 100644
--- a/dev-vcs/notify-webhook/Manifest
+++ b/dev-vcs/notify-webhook/Manifest
@@ -1,3 +1,3 @@
 DIST notify-webhook-0.1.0.tar.gz 17525 BLAKE2B 947027414bd30f96c9e27ca8b7f965a077792a6b8962180094df6bdeef8261140c063041f1b6598c518edfd3b6807da5020a4640aadbddb202887bac91d3b51d SHA512 1694f32b1263baecac473ffa49e6e7f9cbfdb73d1abaa88e228771e28a5ed915d9f5f21ab26b05934bdcd8694b4c4f1506763dd2f0c89c35ffa51e1d1b7d03b4
-EBUILD notify-webhook-0.1.0.ebuild 640 BLAKE2B 27c0cd0bf4a4005d3e220fa0e86e574c725892860fb2c5ea54a28eb328f6e6d2a396adc94da94db6c3ceaee48a6ed924439e6bb74f06cf8d18db0497342048f0 SHA512 103a71f3cedd325ec4dccd5b4c6d11f73c57f892a8916638b255535dd9831bc13f2cea2eed33b27f2f8bceed09a92fa8772f34ecd053afba7564f9a4c8a1beb6
+EBUILD notify-webhook-0.1.0.ebuild 639 BLAKE2B fae7158b394b187fd646ef14b49ab97654ae9c6de7023d09063473d7d5378614675321b0cdea440efb5e8d7bea4c955a92b0c98dd4b7860cf3de216ca470e845 SHA512 bbe1b3c5899e1a640b933fa0d78fc5cff3f25f1e8280298ac30a4b524099584e95373421dca5dd4a94d73340c46944d6c995b98602c6a9fd001d6c2c87473d39
 MISC metadata.xml 599 BLAKE2B 843e9537eb205fc24c1f6a3f33727b99fc7fcc7167bc33c8b264984da1153bdf4827836afd252feb238fab7c411036819cbfe2d34f3ca9745102dc06e6e3e210 SHA512 d2b360a6bfe0240851a2a82cef66ce5c6eeadd44c078b19a7f04fa2c368497e1208612e959a19c8aaf3cf5ccc250c816f2724ca25d9950ef9c196b8c7ee8ecc0
diff --git a/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
index 0f9aa3a06371..d28f6b8bbff9 100644
--- a/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
+++ b/dev-vcs/notify-webhook/notify-webhook-0.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 PYTHON_COMPAT=( pypy3 )
 
-DESCRIPTION="Git post-receive web hook notifier in Python."
+DESCRIPTION="Git post-receive web hook notifier in Python"
 HOMEPAGE="https://github.com/metajack/notify-webhook"
 #COMMIT='c571160f155122446e97bb01c1150b4d14ea69d6'
 SRC_URI="https://github.com/metajack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index 9df0b0b4a249..29ab1ba95e2d 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -1,5 +1,5 @@
-DIST pre-commit-2.13.0.tar.gz 252631 BLAKE2B 7e6b3af46dfaf9928d2cb2aa6cad05423bf6e417e2324af71b241e1aaa2eec6fcb271869f98c040cd4fb8c608a1fabd244c8286864f469a06c44684cd2bf33eb SHA512 5dfc297b3f900afef8f1c355b38ce086af7c836d1e577af8ec95ffb30e82df8b866131da4ff12933339bda63e4a90833c3852265d4f2d4a59bf92bce2b972a5e
 DIST pre-commit-2.15.0.tar.gz 255545 BLAKE2B 8fbb1fd6b1298ff1c5a6884dae53c79d108e8c4b74d05d6be36d562327fd024432d60e6df4570217e1b3f4ad8e33ee4d0d54a5d940f4833a46d4e9cb59698b3c SHA512 b87985aa625509d7a21e31e5774f259c264ec74fef88fc5e290cbac0326cdbadc37ab54b5bf3048d815cf9bc6d4adb71619fcb84c955c1bc9741da8dfd34251c
-EBUILD pre-commit-2.13.0.ebuild 2089 BLAKE2B be856789c2a63790f0ea56a91dabf75f9e808b15f7c1d8e347e72cd097209c46d19496c176c707eec4299a2732415176286349cec08e764e05a2c73265fe51f1 SHA512 9f697bb93155a308769f4f2b52f6f9c7681b76755300c96c4d92d575e14d34151f9c33cd8fe5a79888edab526bcd886e867d9f8d8f1f4d3f18fc457944943fb9
+DIST pre-commit-2.16.0.tar.gz 256930 BLAKE2B e515dcc9109c91cc7ab5ce60f662ebd62cce4f23e32676b7c295332c959fa10a34c320a197d15d7307b94aee53e7ade5da62aed8bbe122262db15d88d82e9757 SHA512 c9eb14a40e25e8408c2b2b5687eba4908d609bbb7bcf58a0153326696d272bca555156fd75f3ec5f0dec219aeeb4084df77f329f47cf190e40052c11e92fe185
 EBUILD pre-commit-2.15.0.ebuild 2055 BLAKE2B 118b92db9ad79a4ee2478255906e7f4c4f311f02d4b381a6a169da37ab0bf384defae18275bbf72d1ea4139fa3df2cf559fc98ed6fd33ff5f609333ef7ce5474 SHA512 146c889595830f1c6e90c1785d18a544bf2c72fe538f451412968942653c4227d74a2879a85bd52ed0eadbe18224f4d9238d3f9ca05630a8e1c061451d7d5368
+EBUILD pre-commit-2.16.0.ebuild 2088 BLAKE2B 992c8a5dd400f442469abd5b53dadef3ede090b3dd3087b4a231bcb52da61c0fd7857cbe5b61935966971b25c5f06cb78731e81ebfd9d2aa1fbc03c2ed541459 SHA512 18017370fde8385652e9c0a0f4ba0b3856d22322503f3e0cc77b0aa3a8b94b3ca7e4541907c24979cdc42c551cea250a5bf17dc360cfa1c9469afa01aaa595bd
 MISC metadata.xml 380 BLAKE2B 99842a97367e91700c6f714f427b7b3d4b7212c401abae5ab715dfaa724776f02fe250184a33504d3433bb58cd5679af59a32ec21a7e7432481160dab36a4d95 SHA512 45330930d1e58fc1de0fd0ba55cd488dee96579ceab3be5073b91ff8f4f2b9adefff533dbfa5b0e8b23fbb648d45c0b7b4073a1ec57b586600cc2bf6347e0bbb
diff --git a/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild b/dev-vcs/pre-commit/pre-commit-2.16.0.ebuild
index b950b9251989..a75c6d3fd4cb 100644
--- a/dev-vcs/pre-commit/pre-commit-2.13.0.ebuild
+++ b/dev-vcs/pre-commit/pre-commit-2.16.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
@@ -16,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 
 # TODO: figure out why these tests - all of which invoke git - fail:
 #  - tests/main_test.py::test_all_cmds[autoupdate,hook-impl,install,install-hooks,migrate-config,run,uninstall],
@@ -32,10 +31,10 @@ RESTRICT="test"
 
 RDEPEND="dev-vcs/git
 	$(python_gen_cond_dep '
-		dev-python/cfgv[${PYTHON_USEDEP}]
-		dev-python/identify[${PYTHON_USEDEP}]
-		dev-python/nodeenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/cfgv-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/identify-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/nodeenv-0.11.1[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 		dev-python/toml[${PYTHON_USEDEP}]
 		>=dev-python/virtualenv-20.0.8[${PYTHON_USEDEP}]
 	')"