gentoo resync : 08.07.2021

14 files changed, 107 insertions, 30 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 3248519f0b25..20966ef31790 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index c60462e06699..aaa15ce0cdbe 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -2,7 +2,9 @@ AUX fossil-2.10-check-lib64-for-tcl.patch 445 BLAKE2B a8282820edafb15ae6542b9f13
 DIST fossil-src-2.12.1.tar.gz 6011181 BLAKE2B f9437c4fb20314706bbbec70efbb6a53e2ac7760986baf88ea72505f03877a5d1069d0d2828aa2bfefac96c1358e4c8f824405d61fd24d490442fa8b768711e9 SHA512 08b7fef5a3071e968dedbc645aebf2e873ecf80049b5986d38f851a407b2b8b0c854cfcdfa5ec80eac5bc1b158c5fac3bb4b263d1adb8be470529e67dc6e8cee
 DIST fossil-src-2.13.tar.gz 6121223 BLAKE2B 41bb83b40faf05d38ccbcc13bde858ee31ab0182193631d738a6e287414b2a93bc49bfa5ed0a16aabbc26190c1a3cd993ce9f1706ecd05b214461313b13c1086 SHA512 bd756aaac2f39005b690230c5a4ef4d618a3200a8eb499aa964285050c247edfb0abfa5db5522269e0a5ee2737c71393a523dc2d7e37eae076364185137964f8
 DIST fossil-src-2.14.tar.gz 6207277 BLAKE2B 9a70a49e83e16414150e777289543a984c6b77c4c2ea245ed3187b393a80f6926c80bada31081735d09a9d0febf430587c120e16d60ddbf96d1116c9da6cf008 SHA512 f95291886484c9fb98224c17e07c9c2ada3d79974359234f1cc6a8fce603e45bf980ffe4f43a473d74d190b6975fff66e8d35ca680747385e72981caabfd6b10
+DIST fossil-src-2.16.tar.gz 6275775 BLAKE2B 504f828f121385ec73311b340e0abfdba7da6a8571adb390c55c75fea0ef027366fb914c12552e177988bedbb735a3148d87ebdb23ffc2ce4b7bef8ef603692a SHA512 0569640a3b509c592f812a42526eec88ead034ba0ba3de93da62cfb1caa751954ae185eaa3398d411a02ee2a858ecae6cdf4e47199847527f7524fc9798a4b12
 EBUILD fossil-2.12.1-r1.ebuild 1770 BLAKE2B 0f40b5192c52a571dd9068635724699b260d06aa24f28e2d54e94f5ad23f206f71788577a9faaae69f40c52be693d9cb639b133cbdeba67888a84bde64975f58 SHA512 f123482c63264d7c7e88f4fcbfce8f611d4d6d3c5af05abed709356499ba4da9ac3143ca602e12a545ca5cd6efe908829b053bf67541a1a7b8f797f97bfdc675
 EBUILD fossil-2.13-r1.ebuild 1817 BLAKE2B 2a8e9c15e79fa1f61e40f33eecc2ef2b67e8b7617a7243c612a4c2707ad07dd987f86ff39249f4245697b41c67afdec1a57d3d916726b530287edf5de7883369 SHA512 802c9b28a0a66bca35dfefac6225c7d87354dcb5a270fcbf977364f15f3a07b69800bb33a9f2119012b1fea3db3204e6ebf5e0f568ba8a1e73e9cc76ec93470b
 EBUILD fossil-2.14-r1.ebuild 1775 BLAKE2B 50bc7dc2a8e533732a572f8b08c1dae70490e8625d1df3cb07a4386a9e36c4355239848ca9951ef1dccfd4630e670afb93438e8dcfa80712d8feedbc541cd052 SHA512 2a471704b102b8a9f585d25d6a7724db48862e6347600d18adc3e81ec004ed93b0adf8ca82df99e8efefa992fd47bde6528b92071ffa13ffde04f22eeb53a828
+EBUILD fossil-2.16-r1.ebuild 1892 BLAKE2B f80cf6a20ed5b7bf78bdfa3a7c72de949e7423701f1d6012b750be83360af7c2df04ede9f47158041c3d1f7862f53582833495b7167ff337deeafa103136c560 SHA512 2195e292cd1e0d060b203f8f4efad086f6c7495f1403652cbb1c888f02ad0fd47564e5685503865f4ce2d55351b510afedfc98f7353ab08bbb74dbd5b741dc20
 MISC metadata.xml 949 BLAKE2B 66f47f3ef7e50cb1df12246aa7b673a5900c27e89ecc52b3cbd1a1b8b3dc6ef0b5408a61840df02c75ccfcc80b784f921ab1e2f59e3a10c36406f1d07449de90 SHA512 90326d1694a4204dea726ae5f67e8404325719271b4ad06837d45f35fa7c536310bc7248b20c80f50e38aceed7daf997e2f88041008db666ad273cb46e0c14d0
diff --git a/dev-vcs/fossil/fossil-2.16-r1.ebuild b/dev-vcs/fossil/fossil-2.16-r1.ebuild
new file mode 100644
index 000000000000..73ab8971fdbf
--- /dev/null
+++ b/dev-vcs/fossil/fossil-2.16-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_TAG=7aedd5675883d4412cf20917d340b6985e3ecb842e88a39f135df034b2d5f4d3
+
+DESCRIPTION="Simple, high-reliability, source control management, and more"
+HOMEPAGE="https://www.fossil-scm.org/"
+SRC_URI="https://fossil-scm.org/home/tarball/${MY_TAG}/fossil-src-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
+IUSE="debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs
+	  tcl-private-stubs th1-docs th1-hooks"
+
+REQUIRED_USE="ssl? ( !miniz )"
+
+RDEPEND="
+	sys-libs/zlib
+	|| (
+		sys-libs/readline:0
+		dev-libs/libedit
+	)
+	system-sqlite? ( >=dev-db/sqlite-3.35.0:3 )
+	ssl? ( dev-libs/openssl:0= )
+	tcl? ( dev-lang/tcl:0= )
+"
+
+# Either tcl or jimtcl need to be present to build Fossil (Bug #675778)
+DEPEND="${RDEPEND}
+	!tcl? (
+		|| (
+			dev-lang/tcl:*
+			dev-lang/jimtcl:*
+		)
+	)
+"
+
+# Tests can't be run from the build directory
+RESTRICT="test"
+
+# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
+PATCHES=( "${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch )
+
+S="${WORKDIR}/fossil-src-${PV}"
+
+src_configure() {
+	# this is not an autotools situation so don't make it seem like one
+	# --with-tcl: works
+	# --without-tcl: dies
+	local myconf="--with-openssl=$(usex ssl auto none)"
+	use debug         && myconf+=' --fossil-debug'
+	use json          && myconf+=' --json'
+	use system-sqlite && myconf+=' --disable-internal-sqlite'
+	use static        && myconf+=' --static'
+	use tcl           && myconf+=' --with-tcl=1'
+	use fusefs        || myconf+=' --disable-fusefs'
+
+	local u useflags
+	useflags=( miniz tcl-stubs tcl-private-stubs th1-docs th1-hooks )
+	for u in ${useflags[@]} ; do
+		use ${u} &&  myconf+=" --with-${u}"
+	done
+
+	tc-export CC CXX
+	CC_FOR_BUILD=${CC} ./configure ${myconf} || die
+}
+
+src_install() {
+	dobin fossil
+}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 3a58d7de91d3..82dfcd5ceb00 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -30,14 +30,14 @@ DIST git-manpages-2.29.3.tar.xz 478456 BLAKE2B e568b92badda851be5d5c0524455d1eb7
 DIST git-manpages-2.30.2.tar.xz 482180 BLAKE2B 97180d13ba73f229d205b662ca16d497baff57a23b9b621fab69bc1bb4f2ac4f52b861443917ae01ebab7130640e1b7352aa193d7c0cd945cb552749ee1367c9 SHA512 fcb2ab9dd4c29593d08b80f6731ccc3b9a54514d6cc002434f8e36277fd814d4be7e69f0563291cea4f16c35e4822def57ade50d7d10a897619b13c6a6893aa7
 DIST git-manpages-2.31.1.tar.xz 487784 BLAKE2B 9fe67839cca51f18b0aca16678eadb9ee8e609cbbae26bf1804c39b8bf5415e1069cb50162b75f9f8ec69bd6511f271d3116ac33016af2e57e65b88ad6c4b165 SHA512 a5fb8a1c3f08707d4d2d835a55b295677559856984ffeeb650827b433625a74f22ef4aac10e1b14eba5860e11567543b146d52dd055b2613e5a510e0f4f3c3fd
 DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e
-EBUILD git-2.26.3.ebuild 19107 BLAKE2B 179378cc1e95801735e26890af170385d10b66987745fa222405e7b16a261b888b13b11314aed0bccbdf1f96aa522fbe941fb41f4c4fd65ca32271810e0cefe3 SHA512 0587749fb008de4ff70a238fdec702e5cd8d50946c01a1cc780445f0dd856c3856ddeb24396e810285695b161a678913739cbd8cdc7bca9bd82daf916f942ad3
-EBUILD git-2.28.1.ebuild 19115 BLAKE2B 961dd5d1a8cc9fcc93bb6edbd8be11135272e569429fff34d468e498888b1d1bc8e4cc609ad03152aa4adf2d674ca87c2dfafcddda5521638a0fb34fb8c17728 SHA512 b0f5d927f70a09ae0607f362014c62f01960cbde0f82850b59c855f5eedaa255c532d7cd009df86b288043f65073a6ddf223355562db69824dd26a3ae0260f99
-EBUILD git-2.29.3.ebuild 18172 BLAKE2B ecffedbbf6d6936c50e11a42d658270ae8830694f3ace431893d33384c5aadb6f13d9b996fb43cb50c20461d3db6b438fb870a02bed78e1be8355590cfe9eaf8 SHA512 0ae5cd383ded761461492acd67acd910cb0b46ee6ce54747b03452e4c4358baa41ba276a0574e8f9bc914a1e5eb252eccd52bae3b44de6b76e3b96b6d6e1003f
-EBUILD git-2.30.2.ebuild 18173 BLAKE2B 4429fabf567077c22a78f25430c44b5a37ae7322445b57cd22f7e95a4153f41d2b879a48b16fcf8b2855ed08d4a60c529f972e31ccb0cd03e1f9dd6b829510d7 SHA512 eaddad6c5a51f1fb8e3df432c63ed27bf418acbbe42d312a9903dd4fccc833ec9150e134cd57a78661a04ebc12a1632953c42e226df3cb8516876b21cdb6cf75
-EBUILD git-2.31.1.ebuild 18055 BLAKE2B ea16b293db77aca43fdd3f63b0a51d4c550d50a161cfc9f996597abf75c7362b84a27fb2ea1a1959505c0c65960a5a0ac88d93b197312b20da6828d9c6da091a SHA512 5f4c6ab18bfedffe5a85323cf04e424c9f7fdfbd8f3d55d7ef784f03e7d5973c602c4779ad59beff4b9f0f9d9a00fd603e0ba4a8f2bc9d7459b231a4d6c00f01
-EBUILD git-2.32.0.ebuild 18064 BLAKE2B c0b71b212216fa28e4a70629162a2a5dcebc144a2dbc85275e3cfd7f6c1bebe51577ef752abb69d72625897c7ce096b44081d4374900ca7e0ac83f74d7cb1a76 SHA512 dfcc3595b4ec0f90b31ac5e804b4f3fa50f485a0012c774f0231c1f71f6aceb78464a3fc5b743b4a325f8290182b156b86278b1626e0aa42100f5985ad357abe
-EBUILD git-9999-r1.ebuild 18036 BLAKE2B 2f5763790baad0c4c27f05ac837649f9c861ed2ab4c3f84f80cbcd8f7413320aca9f0a1337e4f1f89487400ba2cc22e6cd882fbba3113ca67a53d9d9f1027e60 SHA512 1c040da8a1335a44b807b14f6b89cde15794481d2e7a05decd7693b6d1baa655b3edf15e705f02361feb661bf6a7b3be7ed24e29de814fe957cf4ba6e35fcb59
-EBUILD git-9999-r2.ebuild 18036 BLAKE2B 2f5763790baad0c4c27f05ac837649f9c861ed2ab4c3f84f80cbcd8f7413320aca9f0a1337e4f1f89487400ba2cc22e6cd882fbba3113ca67a53d9d9f1027e60 SHA512 1c040da8a1335a44b807b14f6b89cde15794481d2e7a05decd7693b6d1baa655b3edf15e705f02361feb661bf6a7b3be7ed24e29de814fe957cf4ba6e35fcb59
-EBUILD git-9999-r3.ebuild 18066 BLAKE2B ded96d874acbaf9148591d4e0718d16aad9e6c8a4686483a559498f98d399e9b965e56d87f51a3c4077f3bef8f0c541ef2e259ec8479e126c224794a42f56b2c SHA512 10e5f75804a4f61d2aad099a76f21b14eccd1b71fb060dc7e1bed5dc5ecc0750db4f0dd4d13b7f4cf500fbf22ba71802e838a245302f1d229ad27b68c60708a8
-EBUILD git-9999.ebuild 18036 BLAKE2B eb6e8778a69d293f093f4aa875936a7659dbd51cf885942ab448730d2b90cdd2164eb8e5404e12cf1d1ed786459fb93306013360a11f6784edbb4da835f07788 SHA512 6f6dd5190c7c772b6607a0e4c865158a717d0d4ce5079b395a5d3f6ab69d86273620d5dfbbf44d51f1c7ec4f4643f564d3da97abcd5b47628253c33571e2707d
+EBUILD git-2.26.3.ebuild 19110 BLAKE2B ab185603ed965942ab60b3625386f13fa9d155b1c010e97704d77317ea568792667d8ad15c067fd5e4907e13b56aed636289fc2dbb68c486d3c139acd311630e SHA512 e13bf874a1518e669bfcfea73e87852bc2a9c568948d83b498d271948934b1a98e402bb18d8abe4ac8dd1f001312d89c9edf783f5ea8a35f2c07f337e4e8e20b
+EBUILD git-2.28.1.ebuild 19118 BLAKE2B c71bfb6eda842ceaf6e752e911e09c602997987d5374bda2408bcfb2cad24b3eaa69ab0c1fd5522ae224b87279727fcf2840c096a91f57696a2d2b32ff73c2ef SHA512 bdca277daae10c52f72e721a0680d5f4508b696566ecfc128ecc10049aefd857fbfe03148452a8b05e932d76ce7fa9e9dd339fa83c3ed3f8890df4a588604388
+EBUILD git-2.29.3.ebuild 18175 BLAKE2B badfec96e42d4cfbf8327298313c381ae526efbaff3b145abe8c8aa4afdab824175b6db015f28f8f9bd8d3bf4cad99c46a3594901ebaf3859df367dc73804c62 SHA512 825c386bfbae0b51358924c7ee1d232a59e45155e792c485b543e9ecde77fea6870de66f2144d0787c5a084166756e01666db27cbc1055de10a093c781a8f1a5
+EBUILD git-2.30.2.ebuild 18176 BLAKE2B 693b6d1f83be107234f2922a55993b66b41fb987cc2dc62f076c3a16b2d387374f44cc55c2ef3210583e4972b0783d32d1e49802fd4b5f8fc7d54a5e6d5c70e9 SHA512 5fe5ebbebef55cc29e23984ecda3c3e8814bf8c17ef4329960ff561a857058e998ee5c5f9bdb3b26e7dfe7d408dd0fce772074f17bbaf0f3a9fbbb776e3b6242
+EBUILD git-2.31.1.ebuild 18058 BLAKE2B 9c9c7530527ace419f1191e6aa671dfb0d4dcf25760ad30658ebd83889ac0df396021030d0e0499b497340c47a1a3e8b7b12575f2817fb9231c11dd5652d7bc6 SHA512 e5ae923aed189506a97512be5e87492098cdd876645f837f28035875c46745a2b2a03e7374e8d05276b7d0a76a9d47df117329dbae175386cb5ce5d0d96e4c51
+EBUILD git-2.32.0.ebuild 18067 BLAKE2B 223ca7bcb3cbddbd1a1ca0dcce894c963dd2d0fb335817ac210c812349421359ae196300c18e41b79764922b6b5d3992caa6d72708fe7b842ffb26873d0317c2 SHA512 ae11a376f3e2cf2a6340a298aaf49d208d4247f439547bdc516d366efe5cba6f9fbc493586d4d30e127f1944dc1d2c899435792fe4e5ca3b20ff7311e3d31b9a
+EBUILD git-9999-r1.ebuild 18039 BLAKE2B dff571f7598c6794666d78739983cb7d12f5b8055a0885af9b06febf36dc3aacef88d5e500a51b34360866a52afc4ca61233d64ccefc7d02cbb1d5a11ad4e8ec SHA512 4cd9fac8efa1cb67663649b68ed41d0426f80fd7459b5313a3a881af4126a8e33d3ae3fadf4e5c15f13f1737eac10924e21c580ef1446095c66fd32f82ffccbd
+EBUILD git-9999-r2.ebuild 18039 BLAKE2B dff571f7598c6794666d78739983cb7d12f5b8055a0885af9b06febf36dc3aacef88d5e500a51b34360866a52afc4ca61233d64ccefc7d02cbb1d5a11ad4e8ec SHA512 4cd9fac8efa1cb67663649b68ed41d0426f80fd7459b5313a3a881af4126a8e33d3ae3fadf4e5c15f13f1737eac10924e21c580ef1446095c66fd32f82ffccbd
+EBUILD git-9999-r3.ebuild 18069 BLAKE2B 23ac05053716c14bd8208256def6eda4ac8963320fd7b64cd300a98204e2a408930c4dd3d743fcdeac3c71746e97e873cbcef63991899cd3c579968e9c8bc007 SHA512 7937459a8e01f1771eeeb4e8e06524d25e4ceeeb6eeca0d6b404d1aef8c4ba02572b05336daf91ca6e5bf705b8b4e90e458f5189e884de98d212f9e8350cfa07
+EBUILD git-9999.ebuild 18039 BLAKE2B fffcc4a0fee56289fb712fff9814af344645e7e3970dc88e7b10e2841fbfa58b81758e515af4aff5d24aef9925b08133c0b680c7a56bab262ce5faf2b3fd13c4 SHA512 071a279a0407e7513fe04b7be176b640979941fbff6b26b84a872b738a581b38d2b7edd066dfbca6ebb6d01fac290649ecc9e57e3fab2765c9906b97474485a3
 MISC metadata.xml 2277 BLAKE2B 49819fd1ea6ca2a1cf2043fde6d4cd9197db5ef44543fae528475524a35ee52d31a04f20c638b892a6d8c4dd757d302bfd43efb41242e98351d01db7654c2a05 SHA512 65b8ef639ddbec202cc7bcbed31c109d8f6fc64e52d47522eb38955401bea86a846390cfddbebd946f5f5941be83c401a1028d6721e12c6317f92a63568b56cb
diff --git a/dev-vcs/git/git-2.26.3.ebuild b/dev-vcs/git/git-2.26.3.ebuild
index a498677949f5..d76017fa888e 100644
--- a/dev-vcs/git/git-2.26.3.ebuild
+++ b/dev-vcs/git/git-2.26.3.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -578,7 +578,7 @@ src_install() {
 			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 }
 
 src_test() {
diff --git a/dev-vcs/git/git-2.28.1.ebuild b/dev-vcs/git/git-2.28.1.ebuild
index c714077451a6..a8257a24b4f4 100644
--- a/dev-vcs/git/git-2.28.1.ebuild
+++ b/dev-vcs/git/git-2.28.1.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -578,7 +578,7 @@ src_install() {
 			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 }
 
 src_test() {
diff --git a/dev-vcs/git/git-2.29.3.ebuild b/dev-vcs/git/git-2.29.3.ebuild
index 69b25f385240..0982653550bf 100644
--- a/dev-vcs/git/git-2.29.3.ebuild
+++ b/dev-vcs/git/git-2.29.3.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -543,7 +543,7 @@ src_install() {
 			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 }
 
 src_test() {
diff --git a/dev-vcs/git/git-2.30.2.ebuild b/dev-vcs/git/git-2.30.2.ebuild
index d522b628a61f..1e3d38d09940 100644
--- a/dev-vcs/git/git-2.30.2.ebuild
+++ b/dev-vcs/git/git-2.30.2.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -543,7 +543,7 @@ src_install() {
 			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 }
 
 src_test() {
diff --git a/dev-vcs/git/git-2.31.1.ebuild b/dev-vcs/git/git-2.31.1.ebuild
index d7a440dddaf6..decf7398d497 100644
--- a/dev-vcs/git/git-2.31.1.ebuild
+++ b/dev-vcs/git/git-2.31.1.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -531,7 +531,7 @@ src_install() {
 			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 }
 
 src_test() {
diff --git a/dev-vcs/git/git-2.32.0.ebuild b/dev-vcs/git/git-2.32.0.ebuild
index 25d24a32c1b6..cbb9b5aff2c3 100644
--- a/dev-vcs/git/git-2.32.0.ebuild
+++ b/dev-vcs/git/git-2.32.0.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{7..10} )
 
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -531,7 +531,7 @@ src_install() {
 			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 }
 
 src_test() {
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 033fc0bd04aa..4f8854e669b8 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{7..10} )
 
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -531,7 +531,7 @@ src_install() {
 			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 }
 
 src_test() {
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 033fc0bd04aa..4f8854e669b8 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{7..10} )
 
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -531,7 +531,7 @@ src_install() {
 			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 }
 
 src_test() {
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index dd8ccb8f0601..2648a8293fa2 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{7..10} )
 
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -531,7 +531,7 @@ src_install() {
 			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 }
 
 src_test() {
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index c65c13233ee7..dfebf26eef28 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no
 # bug #329479: git-remote-testgit is not multiple-version aware
 PYTHON_COMPAT=( python3_{7..10} )
 
-inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
 
 PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
 if [[ ${PV} == *9999 ]]; then
@@ -531,7 +531,7 @@ src_install() {
 			rm -r "${ED}/usr/share/locale/${1}" || die
 		fi
 	}
-	l10n_for_each_disabled_locale_do rm_loc
+	plocale_for_each_disabled_locale rm_loc
 }
 
 src_test() {