public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jimi Huotari" <chiitoo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/
Date: Fri, 13 Aug 2021 10:51:40 +0000 (UTC)	[thread overview]
Message-ID: <1628850853.c7320da6e7092defb6081dc72d98cbed8efa26dc.chiitoo@gentoo> (raw)

commit:     c7320da6e7092defb6081dc72d98cbed8efa26dc
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 13 10:34:13 2021 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Aug 13 10:34:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=c7320da6

app-emulation/wine-vanilla: use plocale instead of the l10n eclass

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild    | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild    | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.1.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.10.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.11.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild   | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.17.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.18.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.2.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.3.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.4.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.5.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.6-r1.ebuild   | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.6.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild   | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.7.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.8.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-4.9.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild    | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild    | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.0.3.ebuild    | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.10.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.11.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.12.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.13.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.14.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.15.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.16.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.17.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.18.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.19.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.20.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.22-r1.ebuild  | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild  | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.22.ebuild     | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.3.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.4.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.6.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.7.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-5.9.ebuild      | 12 ++++++------
 app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild    | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild      | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild      | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild     | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild     | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild      | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-6.3-r1.ebuild   | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-6.3.ebuild      | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild      | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild      | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild      | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild      | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-6.8.ebuild      | 10 +++++-----
 app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild      | 10 +++++-----
 69 files changed, 400 insertions(+), 400 deletions(-)

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
index 105d3c5..763e0b3 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -456,7 +456,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
index 105d3c5..763e0b3 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -456,7 +456,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
index 56d889d..1f4833f 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -456,7 +456,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.1.ebuild
index 31327f7..348b670 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -285,7 +285,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -319,7 +319,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -343,7 +343,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -455,7 +455,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.10.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.10.ebuild
index e5c02dd..111e262 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.10.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.11.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.11.ebuild
index db17ef6..984326f 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.11.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild
index db17ef6..984326f 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild
index db17ef6..984326f 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild
index 214dbde..4e08395 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild
index 214dbde..4e08395 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild
index 214dbde..4e08395 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.17.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.17.ebuild
index 6ea539d..59930e5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.17.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.18.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.18.ebuild
index 6ea539d..59930e5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.18.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
index 6ea539d..59930e5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.2.ebuild
index 31327f7..348b670 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -285,7 +285,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -319,7 +319,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -343,7 +343,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -455,7 +455,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
index 895ae57..91fc925 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
index 895ae57..91fc925 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.3.ebuild
index 93bc754..a71793a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -457,7 +457,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.4.ebuild
index effb1bc..b742cdd 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -457,7 +457,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.5.ebuild
index 5a7d1ce..41a58fe 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -457,7 +457,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.6-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.6-r1.ebuild
index a28fd8b..1b66d2c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.6-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -457,7 +457,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.6.ebuild
index 5a7d1ce..41a58fe 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.6.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -457,7 +457,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild
index 5dc3edf..bb2900b 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.7.ebuild
index 2aa3704..f2b1e35 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.7.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -457,7 +457,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.8.ebuild
index be2a77c..9b0b13a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.8.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.9.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.9.ebuild
index be2a77c..9b0b13a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.9.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild
index 81be52b..7f13dc5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
index 81be52b..7f13dc5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild
index 75b98d5..d53c7a3 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -460,7 +460,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.3.ebuild
index 81be52b..7f13dc5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
index 81be52b..7f13dc5 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild
index d6c7027..b55e3ae 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.10.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.10.ebuild
index b73bc92..211afaa 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.10.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.11.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.11.ebuild
index a52badd..7a896c2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.11.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.12.ebuild
index a52badd..7a896c2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.12.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.13.ebuild
index a52badd..7a896c2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.13.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.14.ebuild
index a52badd..7a896c2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.14.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.15.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.15.ebuild
index a52badd..7a896c2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.15.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.16.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.16.ebuild
index a52badd..7a896c2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.16.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.17.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.17.ebuild
index a52badd..7a896c2 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.17.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.18.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.18.ebuild
index 1eeadaa..76a6ab6 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.18.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.19.ebuild
index 3197946..2478cbf 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.19.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild
index d6c7027..b55e3ae 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.20.ebuild
index 3197946..2478cbf 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild
index 3197946..2478cbf 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.22-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.22-r1.ebuild
index 346a12a..2beedd0 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.22-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -349,7 +349,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -373,7 +373,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -488,7 +488,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
index 166ec36..1c3ae36 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.22-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -314,7 +314,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -348,7 +348,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -372,7 +372,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.22.ebuild
index 3197946..2478cbf 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.22.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.3.ebuild
index d6c7027..b55e3ae 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.4.ebuild
index d6c7027..b55e3ae 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -458,7 +458,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild
index 0bd2ccd..fb09d7e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -460,7 +460,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.6.ebuild
index 560e779..46d0799 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.6.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.7.ebuild
index 3751f9d..f15cb14 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.7.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild
index 3751f9d..f15cb14 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -286,7 +286,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -320,7 +320,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -344,7 +344,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -459,7 +459,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.9.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.9.ebuild
index d8b7b98..1f69be6 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.9.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -287,7 +287,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -321,7 +321,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -345,7 +345,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -460,7 +460,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild
index fc87e0f..e2d7608 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -314,7 +314,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -348,7 +348,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -372,7 +372,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -490,7 +490,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
index c4a82f7..3879efd 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -314,7 +314,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -348,7 +348,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -372,7 +372,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -490,7 +490,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild
index f138a53..073ea57 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -349,7 +349,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -373,7 +373,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -491,7 +491,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild
index 5175537..bb5fbdb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.10.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -347,7 +347,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -371,7 +371,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild
index 5175537..bb5fbdb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.11.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -347,7 +347,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -371,7 +371,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild
index e67b9eb..3b8a015 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -349,7 +349,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -373,7 +373,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -491,7 +491,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.3-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.3-r1.ebuild
index d45eec8..4f84eec 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.3-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -316,7 +316,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -350,7 +350,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -374,7 +374,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.3.ebuild
index 3aad8a8..51ea858 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -349,7 +349,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -373,7 +373,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -491,7 +491,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
index e5f6861..c3acc37 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -347,7 +347,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -371,7 +371,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild
index e5f6861..c3acc37 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -347,7 +347,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -371,7 +371,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild
index a3bba59..416a337 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -347,7 +347,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -371,7 +371,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild
index a3bba59..416a337 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -347,7 +347,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -371,7 +371,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.8.ebuild
index a3bba59..416a337 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.8.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.8.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -347,7 +347,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -371,7 +371,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild
index a3bba59..416a337 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
 	default
 
-	l10n_find_plocales_changes "${S}/po" "" ".po"
+	plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -347,7 +347,7 @@ src_prepare() {
 	# hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
 	cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-	l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+	plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
 
 	# Fix manpage generation for locales #469418 and abi_x86_64 #617864
 
@@ -371,7 +371,7 @@ src_prepare() {
 	}
 
 	while read f; do
-		l10n_for_each_disabled_locale_do rm_man_file "${f}"
+		plocale_for_each_disabled_locale rm_man_file "${f}"
 	done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
 		local locale_doc="documentation/README.$1"
 		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
 	}
-	l10n_for_each_locale_do add_locale_docs
+	plocale_for_each_locale add_locale_docs
 
 	einstalldocs
 	find "${ED}" -name *.la -delete || die


             reply	other threads:[~2021-08-13 10:51 UTC|newest]

Thread overview: 196+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-13 10:51 Jimi Huotari [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-05-20  1:13 [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/ Sam James
2022-05-17  4:28 Sam James
2022-05-14 15:06 Nick Sarnie
2022-05-09 22:08 Nick Sarnie
2022-05-08 21:47 Nick Sarnie
2022-05-07 19:59 Nick Sarnie
2022-05-07 19:59 Nick Sarnie
2022-04-23 23:36 Nick Sarnie
2022-04-23 14:47 Nick Sarnie
2022-04-18 19:12 Nick Sarnie
2022-04-11  3:52 Nick Sarnie
2022-04-10 20:39 Nick Sarnie
2022-04-10 20:05 Nick Sarnie
2022-04-10 19:54 Nick Sarnie
2022-04-09 14:57 Nick Sarnie
2022-03-27 14:53 Nick Sarnie
2022-03-26  0:26 Nick Sarnie
2022-03-12  2:32 Nick Sarnie
2022-03-02  3:56 Sam James
2022-03-02  3:56 Sam James
2022-02-27  1:30 Nick Sarnie
2022-02-27  1:23 Nick Sarnie
2022-02-13 15:08 Nick Sarnie
2022-02-13 15:02 Nick Sarnie
2022-01-29  1:24 Nick Sarnie
2022-01-18 23:44 Nick Sarnie
2022-01-18 23:40 Nick Sarnie
2021-12-04 21:49 Nick Sarnie
2021-11-23  2:47 Nick Sarnie
2021-11-23  2:43 Nick Sarnie
2021-11-14 21:55 Jimi Huotari
2021-11-06 21:47 Nick Sarnie
2021-11-06 21:47 Nick Sarnie
2021-11-06 19:02 Nick Sarnie
2021-10-26 22:23 Nick Sarnie
2021-10-23 21:05 Nick Sarnie
2021-10-09 21:22 Nick Sarnie
2021-09-26  0:49 Nick Sarnie
2021-09-26  0:31 Nick Sarnie
2021-09-11  1:38 Nick Sarnie
2021-09-03 11:33 Jimi Huotari
2021-09-03 11:10 Jimi Huotari
2021-08-29  0:54 Nick Sarnie
2021-08-15 14:44 Nick Sarnie
2021-08-01  2:10 Nick Sarnie
2021-08-01  0:17 Nick Sarnie
2021-07-26 21:54 Conrad Kostecki
2021-07-22  2:26 Nick Sarnie
2021-07-04 17:47 Nick Sarnie
2021-07-04 17:38 Nick Sarnie
2021-06-20  1:08 Nick Sarnie
2021-06-09  3:04 Nick Sarnie
2021-06-05 15:52 Nick Sarnie
2021-05-23 14:56 Nick Sarnie
2021-05-08 14:42 Nick Sarnie
2021-04-24 20:58 Nick Sarnie
2021-04-11 17:14 Nick Sarnie
2021-04-04 19:22 Nick Sarnie
2021-03-28 18:27 Nick Sarnie
2021-03-23 21:16 Nick Sarnie
2021-03-23 21:16 Nick Sarnie
2021-03-14 22:32 Nick Sarnie
2021-03-02  5:09 Nick Sarnie
2021-02-27 20:10 Nick Sarnie
2021-02-13 20:00 Nick Sarnie
2021-01-31 18:49 Nick Sarnie
2021-01-15 16:24 Nick Sarnie
2021-01-14 23:47 Nick Sarnie
2021-01-14 23:42 Nick Sarnie
2020-12-04  2:40 Jimi Huotari
2020-12-04  2:40 Jimi Huotari
2020-12-04  2:40 Jimi Huotari
2020-12-01 14:52 Nick Sarnie
2020-11-24  3:19 Jimi Huotari
2020-11-21 18:59 Nick Sarnie
2020-11-11  1:26 Nick Sarnie
2020-11-07  6:00 Nick Sarnie
2020-10-24  3:09 Nick Sarnie
2020-10-11 20:18 Nick Sarnie
2020-09-28  2:41 Nick Sarnie
2020-09-12 22:50 Nick Sarnie
2020-08-30 14:47 Nick Sarnie
2020-08-16  2:46 Nick Sarnie
2020-08-07 23:17 Nick Sarnie
2020-08-02 17:21 Nick Sarnie
2020-07-20  1:47 Nick Sarnie
2020-07-04  3:14 Nick Sarnie
2020-06-20  3:30 Nick Sarnie
2020-06-06 15:42 Nick Sarnie
2020-06-06 15:36 Nick Sarnie
2020-06-03 22:11 Nick Sarnie
2020-05-23 22:39 Nick Sarnie
2020-05-10  0:12 Nick Sarnie
2020-04-25 21:26 Nick Sarnie
2020-04-11 16:26 Nick Sarnie
2020-04-11  3:02 Nick Sarnie
2020-03-31  0:42 Nick Sarnie
2020-03-31  0:42 Nick Sarnie
2020-03-15 21:29 Nick Sarnie
2020-03-01  3:16 Nick Sarnie
2020-02-17 17:32 Nick Sarnie
2020-02-04  0:25 Nick Sarnie
2020-01-24  0:12 Nick Sarnie
2020-01-22  0:09 Nick Sarnie
2019-12-22 18:57 Nick Sarnie
2019-11-30 19:50 Nick Sarnie
2019-11-16 17:07 Nick Sarnie
2019-11-02 18:26 Nick Sarnie
2019-10-19 18:08 Nick Sarnie
2019-09-28 17:22 Nick Sarnie
2019-09-15  2:11 Nick Sarnie
2019-09-02 14:33 Nick Sarnie
2019-08-28  2:42 Nick Sarnie
2019-08-19 22:45 Nick Sarnie
2019-08-17 17:13 Nick Sarnie
2019-08-03 14:02 Nick Sarnie
2019-07-09  0:47 Nick Sarnie
2019-06-22 21:49 Nick Sarnie
2019-06-22 21:49 Nick Sarnie
2019-06-20 23:48 Nick Sarnie
2019-06-17 22:37 Nick Sarnie
2019-06-14  2:58 Nick Sarnie
2019-05-26  0:46 Nick Sarnie
2019-05-15 22:34 Nick Sarnie
2019-05-12 14:07 Nick Sarnie
2019-05-11 16:53 Nick Sarnie
2019-05-11 15:21 Jimi Huotari
2019-05-11 15:21 Jimi Huotari
2019-05-11 15:21 Jimi Huotari
2019-05-02 22:18 Nick Sarnie
2019-05-01  1:09 Nick Sarnie
2019-04-16  1:39 Nick Sarnie
2019-04-14 14:47 Nick Sarnie
2019-03-31 16:25 Nick Sarnie
2019-03-20 22:20 Nick Sarnie
2019-03-16 20:29 Nick Sarnie
2019-03-16 16:53 Nick Sarnie
2019-03-03 16:55 Nick Sarnie
2019-02-18 15:36 Nick Sarnie
2019-01-27 17:01 Nick Sarnie
2019-01-24  2:38 Nick Sarnie
2019-01-09  4:16 Nick Sarnie
2018-12-29 21:14 Nick Sarnie
2018-11-30  2:09 Nick Sarnie
2018-11-25 16:52 Nick Sarnie
2018-11-11 17:32 Nick Sarnie
2018-11-04 20:58 Nick Sarnie
2018-10-21 19:58 Nick Sarnie
2018-10-21 19:58 Nick Sarnie
2018-10-21 19:58 Nick Sarnie
2018-10-13 15:51 Nick Sarnie
2018-09-30 19:43 Nick Sarnie
2018-09-17  1:09 Nick Sarnie
2018-09-17  1:09 Nick Sarnie
2018-09-02 14:35 Nick Sarnie
2018-09-01 16:39 Nick Sarnie
2018-09-01 16:26 Nick Sarnie
2018-09-01 16:19 Nick Sarnie
2018-08-02  2:36 Nick Sarnie
2018-08-02  2:36 Nick Sarnie
2018-08-02  2:36 Nick Sarnie
2018-07-21 16:59 Nick Sarnie
2018-07-14  2:41 Nick Sarnie
2018-07-09  0:49 Nick Sarnie
2018-06-30 17:30 Nick Sarnie
2018-06-24 18:06 Nick Sarnie
2018-06-17 19:05 Nick Sarnie
2018-05-28 15:51 Nick Sarnie
2018-05-27 16:46 Nick Sarnie
2018-05-27 16:46 Nick Sarnie
2018-05-13 14:36 Nick Sarnie
2018-04-30  1:33 Nick Sarnie
2018-04-30  1:33 Nick Sarnie
2018-04-30  1:33 Nick Sarnie
2018-04-30  1:33 Nick Sarnie
2018-04-30  1:33 Nick Sarnie
2018-04-30  1:33 Nick Sarnie
2018-04-30  1:33 Nick Sarnie
2018-03-02  2:02 NP Hardass
2018-03-02  2:02 NP Hardass
2018-03-02  2:02 NP Hardass
2018-03-02  2:02 NP Hardass
2018-03-02  2:02 NP Hardass
2018-01-22 22:51 NP Hardass
2018-01-22 22:51 NP Hardass
2018-01-22 22:51 NP Hardass
2018-01-20  6:53 NP Hardass
2018-01-20  4:03 NP Hardass
2018-01-20  4:03 NP Hardass
2018-01-20  4:03 NP Hardass
2018-01-20  4:03 NP Hardass
2018-01-13 23:22 Jimi Huotari
2017-12-04  6:57 NP Hardass
2017-12-04  6:57 NP Hardass
2017-12-04  6:32 NP Hardass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1628850853.c7320da6e7092defb6081dc72d98cbed8efa26dc.chiitoo@gentoo \
    --to=chiitoo@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox