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

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

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

 app-emulation/wine-any/wine-any-2.0-r1.ebuild  | 12 ++++++------
 app-emulation/wine-any/wine-any-2.1-r1.ebuild  | 12 ++++++------
 app-emulation/wine-any/wine-any-2.10-r1.ebuild | 12 ++++++------
 app-emulation/wine-any/wine-any-2.11-r1.ebuild | 12 ++++++------
 app-emulation/wine-any/wine-any-2.12-r1.ebuild | 12 ++++++------
 app-emulation/wine-any/wine-any-2.13-r1.ebuild | 12 ++++++------
 app-emulation/wine-any/wine-any-2.14-r1.ebuild | 12 ++++++------
 app-emulation/wine-any/wine-any-2.15-r1.ebuild | 12 ++++++------
 app-emulation/wine-any/wine-any-2.16-r1.ebuild | 12 ++++++------
 app-emulation/wine-any/wine-any-2.17-r1.ebuild | 12 ++++++------
 app-emulation/wine-any/wine-any-2.18.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-2.19.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-2.2-r1.ebuild  | 12 ++++++------
 app-emulation/wine-any/wine-any-2.20.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-2.21.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-2.3-r1.ebuild  | 12 ++++++------
 app-emulation/wine-any/wine-any-2.4-r1.ebuild  | 12 ++++++------
 app-emulation/wine-any/wine-any-2.5-r1.ebuild  | 12 ++++++------
 app-emulation/wine-any/wine-any-2.6-r1.ebuild  | 12 ++++++------
 app-emulation/wine-any/wine-any-2.7-r1.ebuild  | 12 ++++++------
 app-emulation/wine-any/wine-any-2.8-r1.ebuild  | 12 ++++++------
 app-emulation/wine-any/wine-any-2.9-r1.ebuild  | 12 ++++++------
 app-emulation/wine-any/wine-any-3.10.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-3.11.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-3.12.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-3.13-r1.ebuild | 12 ++++++------
 app-emulation/wine-any/wine-any-3.13.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-3.14.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-3.15.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-3.16.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-3.17.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-3.18.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-3.19.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-3.20.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-3.21.ebuild    | 12 ++++++------
 app-emulation/wine-any/wine-any-3.3.ebuild     | 12 ++++++------
 app-emulation/wine-any/wine-any-3.4.ebuild     | 12 ++++++------
 app-emulation/wine-any/wine-any-3.5.ebuild     | 12 ++++++------
 app-emulation/wine-any/wine-any-3.6.ebuild     | 12 ++++++------
 app-emulation/wine-any/wine-any-3.7.ebuild     | 12 ++++++------
 app-emulation/wine-any/wine-any-3.8.ebuild     | 12 ++++++------
 app-emulation/wine-any/wine-any-3.9.ebuild     | 12 ++++++------
 app-emulation/wine-any/wine-any-4.0.ebuild     | 12 ++++++------
 app-emulation/wine-any/wine-any-4.1.ebuild     | 12 ++++++------
 app-emulation/wine-any/wine-any-9999.ebuild    | 12 ++++++------
 45 files changed, 270 insertions(+), 270 deletions(-)

diff --git a/app-emulation/wine-any/wine-any-2.0-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.0-r1.ebuild
index 3af15de..f166717 100644
--- a/app-emulation/wine-any/wine-any-2.0-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -408,7 +408,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -433,7 +433,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)
 }
 
@@ -546,7 +546,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.1-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.1-r1.ebuild
index a7fa4b4..08b1f1a 100644
--- a/app-emulation/wine-any/wine-any-2.1-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -408,7 +408,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -433,7 +433,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)
 }
 
@@ -546,7 +546,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.10-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.10-r1.ebuild
index 41254e4..2e9dbe2 100644
--- a/app-emulation/wine-any/wine-any-2.10-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -349,7 +349,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -434,7 +434,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)
 }
 
@@ -548,7 +548,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.11-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.11-r1.ebuild
index 41254e4..2e9dbe2 100644
--- a/app-emulation/wine-any/wine-any-2.11-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -349,7 +349,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -434,7 +434,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)
 }
 
@@ -548,7 +548,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.12-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.12-r1.ebuild
index 41254e4..2e9dbe2 100644
--- a/app-emulation/wine-any/wine-any-2.12-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -349,7 +349,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -434,7 +434,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)
 }
 
@@ -548,7 +548,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.13-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.13-r1.ebuild
index 41254e4..2e9dbe2 100644
--- a/app-emulation/wine-any/wine-any-2.13-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -349,7 +349,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -434,7 +434,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)
 }
 
@@ -548,7 +548,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.14-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.14-r1.ebuild
index 9a9be8e..cec7efa 100644
--- a/app-emulation/wine-any/wine-any-2.14-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -349,7 +349,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -434,7 +434,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)
 }
 
@@ -548,7 +548,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.15-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.15-r1.ebuild
index 9a9be8e..cec7efa 100644
--- a/app-emulation/wine-any/wine-any-2.15-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -349,7 +349,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -434,7 +434,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)
 }
 
@@ -548,7 +548,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.16-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.16-r1.ebuild
index 9a9be8e..cec7efa 100644
--- a/app-emulation/wine-any/wine-any-2.16-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -349,7 +349,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -434,7 +434,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)
 }
 
@@ -548,7 +548,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.17-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.17-r1.ebuild
index 9a9be8e..cec7efa 100644
--- a/app-emulation/wine-any/wine-any-2.17-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -349,7 +349,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -434,7 +434,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)
 }
 
@@ -548,7 +548,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.18.ebuild 
b/app-emulation/wine-any/wine-any-2.18.ebuild
index 4797ce3..9f6314f 100644
--- a/app-emulation/wine-any/wine-any-2.18.ebuild
+++ b/app-emulation/wine-any/wine-any-2.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -345,7 +345,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -405,7 +405,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -430,7 +430,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)
 }
 
@@ -544,7 +544,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.19.ebuild 
b/app-emulation/wine-any/wine-any-2.19.ebuild
index 4797ce3..9f6314f 100644
--- a/app-emulation/wine-any/wine-any-2.19.ebuild
+++ b/app-emulation/wine-any/wine-any-2.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -345,7 +345,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -405,7 +405,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -430,7 +430,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)
 }
 
@@ -544,7 +544,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.2-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.2-r1.ebuild
index 8300f36..75619e9 100644
--- a/app-emulation/wine-any/wine-any-2.2-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -364,7 +364,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -424,7 +424,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -449,7 +449,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)
 }
 
@@ -562,7 +562,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.20.ebuild 
b/app-emulation/wine-any/wine-any-2.20.ebuild
index 9c8666d..69e5305 100644
--- a/app-emulation/wine-any/wine-any-2.20.ebuild
+++ b/app-emulation/wine-any/wine-any-2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -346,7 +346,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -406,7 +406,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -431,7 +431,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)
 }
 
@@ -546,7 +546,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.21.ebuild 
b/app-emulation/wine-any/wine-any-2.21.ebuild
index 9c8666d..69e5305 100644
--- a/app-emulation/wine-any/wine-any-2.21.ebuild
+++ b/app-emulation/wine-any/wine-any-2.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -346,7 +346,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -406,7 +406,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -431,7 +431,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)
 }
 
@@ -546,7 +546,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.3-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.3-r1.ebuild
index a7fa4b4..08b1f1a 100644
--- a/app-emulation/wine-any/wine-any-2.3-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -408,7 +408,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -433,7 +433,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)
 }
 
@@ -546,7 +546,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.4-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.4-r1.ebuild
index b44dd0a..8a8cce1 100644
--- a/app-emulation/wine-any/wine-any-2.4-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -408,7 +408,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -433,7 +433,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)
 }
 
@@ -546,7 +546,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.5-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.5-r1.ebuild
index b44dd0a..8a8cce1 100644
--- a/app-emulation/wine-any/wine-any-2.5-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -408,7 +408,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -433,7 +433,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)
 }
 
@@ -546,7 +546,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.6-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.6-r1.ebuild
index b44dd0a..8a8cce1 100644
--- a/app-emulation/wine-any/wine-any-2.6-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -408,7 +408,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -433,7 +433,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)
 }
 
@@ -546,7 +546,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.7-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.7-r1.ebuild
index b44dd0a..8a8cce1 100644
--- a/app-emulation/wine-any/wine-any-2.7-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -408,7 +408,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -433,7 +433,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)
 }
 
@@ -546,7 +546,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.8-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.8-r1.ebuild
index b44dd0a..8a8cce1 100644
--- a/app-emulation/wine-any/wine-any-2.8-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -408,7 +408,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -433,7 +433,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)
 }
 
@@ -546,7 +546,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-2.9-r1.ebuild 
b/app-emulation/wine-any/wine-any-2.9-r1.ebuild
index 41254e4..2e9dbe2 100644
--- a/app-emulation/wine-any/wine-any-2.9-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -349,7 +349,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
        # Requires wine-2.0-rearrange-manpages.patch
@@ -434,7 +434,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)
 }
 
@@ -548,7 +548,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.10.ebuild 
b/app-emulation/wine-any/wine-any-3.10.ebuild
index 5ca3bdd..3f8b283 100644
--- a/app-emulation/wine-any/wine-any-3.10.ebuild
+++ b/app-emulation/wine-any/wine-any-3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -552,7 +552,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.11.ebuild 
b/app-emulation/wine-any/wine-any-3.11.ebuild
index fada637..69e2fd7 100644
--- a/app-emulation/wine-any/wine-any-3.11.ebuild
+++ b/app-emulation/wine-any/wine-any-3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -407,7 +407,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
 
@@ -431,7 +431,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)
 }
 
@@ -550,7 +550,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.12.ebuild 
b/app-emulation/wine-any/wine-any-3.12.ebuild
index 53a9715..305e0bf 100644
--- a/app-emulation/wine-any/wine-any-3.12.ebuild
+++ b/app-emulation/wine-any/wine-any-3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -553,7 +553,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.13-r1.ebuild 
b/app-emulation/wine-any/wine-any-3.13-r1.ebuild
index 1e8cd53..0721d6b 100644
--- a/app-emulation/wine-any/wine-any-3.13-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-3.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -553,7 +553,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.13.ebuild 
b/app-emulation/wine-any/wine-any-3.13.ebuild
index 1e8cd53..0721d6b 100644
--- a/app-emulation/wine-any/wine-any-3.13.ebuild
+++ b/app-emulation/wine-any/wine-any-3.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -553,7 +553,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.14.ebuild 
b/app-emulation/wine-any/wine-any-3.14.ebuild
index 1e8cd53..0721d6b 100644
--- a/app-emulation/wine-any/wine-any-3.14.ebuild
+++ b/app-emulation/wine-any/wine-any-3.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -553,7 +553,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.15.ebuild 
b/app-emulation/wine-any/wine-any-3.15.ebuild
index 1e8cd53..0721d6b 100644
--- a/app-emulation/wine-any/wine-any-3.15.ebuild
+++ b/app-emulation/wine-any/wine-any-3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -553,7 +553,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.16.ebuild 
b/app-emulation/wine-any/wine-any-3.16.ebuild
index 1e8cd53..0721d6b 100644
--- a/app-emulation/wine-any/wine-any-3.16.ebuild
+++ b/app-emulation/wine-any/wine-any-3.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -553,7 +553,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.17.ebuild 
b/app-emulation/wine-any/wine-any-3.17.ebuild
index 23b93ce..0721d6b 100644
--- a/app-emulation/wine-any/wine-any-3.17.ebuild
+++ b/app-emulation/wine-any/wine-any-3.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 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 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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -553,7 +553,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.18.ebuild 
b/app-emulation/wine-any/wine-any-3.18.ebuild
index 23b93ce..0721d6b 100644
--- a/app-emulation/wine-any/wine-any-3.18.ebuild
+++ b/app-emulation/wine-any/wine-any-3.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 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 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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -553,7 +553,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.19.ebuild 
b/app-emulation/wine-any/wine-any-3.19.ebuild
index 23b93ce..0721d6b 100644
--- a/app-emulation/wine-any/wine-any-3.19.ebuild
+++ b/app-emulation/wine-any/wine-any-3.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 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 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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -553,7 +553,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.20.ebuild 
b/app-emulation/wine-any/wine-any-3.20.ebuild
index 23b93ce..0721d6b 100644
--- a/app-emulation/wine-any/wine-any-3.20.ebuild
+++ b/app-emulation/wine-any/wine-any-3.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 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 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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -553,7 +553,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.21.ebuild 
b/app-emulation/wine-any/wine-any-3.21.ebuild
index 23b93ce..0721d6b 100644
--- a/app-emulation/wine-any/wine-any-3.21.ebuild
+++ b/app-emulation/wine-any/wine-any-3.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 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 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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -553,7 +553,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.3.ebuild 
b/app-emulation/wine-any/wine-any-3.3.ebuild
index 362bf22..ef900e1 100644
--- a/app-emulation/wine-any/wine-any-3.3.ebuild
+++ b/app-emulation/wine-any/wine-any-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -407,7 +407,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
 
@@ -431,7 +431,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)
 }
 
@@ -549,7 +549,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.4.ebuild 
b/app-emulation/wine-any/wine-any-3.4.ebuild
index 362bf22..ef900e1 100644
--- a/app-emulation/wine-any/wine-any-3.4.ebuild
+++ b/app-emulation/wine-any/wine-any-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -407,7 +407,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
 
@@ -431,7 +431,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)
 }
 
@@ -549,7 +549,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.5.ebuild 
b/app-emulation/wine-any/wine-any-3.5.ebuild
index 362bf22..ef900e1 100644
--- a/app-emulation/wine-any/wine-any-3.5.ebuild
+++ b/app-emulation/wine-any/wine-any-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -407,7 +407,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
 
@@ -431,7 +431,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)
 }
 
@@ -549,7 +549,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.6.ebuild 
b/app-emulation/wine-any/wine-any-3.6.ebuild
index 362bf22..ef900e1 100644
--- a/app-emulation/wine-any/wine-any-3.6.ebuild
+++ b/app-emulation/wine-any/wine-any-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -407,7 +407,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
 
@@ -431,7 +431,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)
 }
 
@@ -549,7 +549,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.7.ebuild 
b/app-emulation/wine-any/wine-any-3.7.ebuild
index 362bf22..ef900e1 100644
--- a/app-emulation/wine-any/wine-any-3.7.ebuild
+++ b/app-emulation/wine-any/wine-any-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -407,7 +407,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
 
@@ -431,7 +431,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)
 }
 
@@ -549,7 +549,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.8.ebuild 
b/app-emulation/wine-any/wine-any-3.8.ebuild
index 362bf22..ef900e1 100644
--- a/app-emulation/wine-any/wine-any-3.8.ebuild
+++ b/app-emulation/wine-any/wine-any-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -348,7 +348,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -407,7 +407,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
 
@@ -431,7 +431,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)
 }
 
@@ -549,7 +549,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-3.9.ebuild 
b/app-emulation/wine-any/wine-any-3.9.ebuild
index 5ca3bdd..3f8b283 100644
--- a/app-emulation/wine-any/wine-any-3.9.ebuild
+++ b/app-emulation/wine-any/wine-any-3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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 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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -552,7 +552,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-4.0.ebuild 
b/app-emulation/wine-any/wine-any-4.0.ebuild
index c36f7fe..7389487 100644
--- a/app-emulation/wine-any/wine-any-4.0.ebuild
+++ b/app-emulation/wine-any/wine-any-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 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}"
@@ -351,7 +351,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -410,7 +410,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
 
@@ -434,7 +434,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)
 }
 
@@ -554,7 +554,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-4.1.ebuild 
b/app-emulation/wine-any/wine-any-4.1.ebuild
index 0a8c064..70b6bdc 100644
--- a/app-emulation/wine-any/wine-any-4.1.ebuild
+++ b/app-emulation/wine-any/wine-any-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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -553,7 +553,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
        prune_libtool_files --all

diff --git a/app-emulation/wine-any/wine-any-9999.ebuild 
b/app-emulation/wine-any/wine-any-9999.ebuild
index af955b3..e2dc7fd 100644
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.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}"
@@ -350,7 +350,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -409,7 +409,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
 
@@ -433,7 +433,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)
 }
 
@@ -554,7 +554,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
        prune_libtool_files --all

Reply via email to