[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/

Jimi Huotari Fri, 13 Aug 2021 03:51:50 -0700

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


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

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

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

diff --git a/app-emulation/wine-staging/wine-staging-4.0.ebuild 
b/app-emulation/wine-staging/wine-staging-4.0.ebuild
index 39861c6..7ec961d 100644
--- a/app-emulation/wine-staging/wine-staging-4.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-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}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -530,7 +530,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.1.ebuild 
b/app-emulation/wine-staging/wine-staging-4.1.ebuild
index 8f90069..45cd779 100644
--- a/app-emulation/wine-staging/wine-staging-4.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-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 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}"
@@ -335,7 +335,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -386,7 +386,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
 
@@ -410,7 +410,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.10.ebuild 
b/app-emulation/wine-staging/wine-staging-4.10.ebuild
index 0929540..e15178e 100644
--- a/app-emulation/wine-staging/wine-staging-4.10.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -388,7 +388,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
 
@@ -412,7 +412,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.11.ebuild 
b/app-emulation/wine-staging/wine-staging-4.11.ebuild
index a7d6dc2..5603fe9 100644
--- a/app-emulation/wine-staging/wine-staging-4.11.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -388,7 +388,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
 
@@ -412,7 +412,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.12.1.ebuild 
b/app-emulation/wine-staging/wine-staging-4.12.1.ebuild
index a7d6dc2..5603fe9 100644
--- a/app-emulation/wine-staging/wine-staging-4.12.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -388,7 +388,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
 
@@ -412,7 +412,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.13.ebuild 
b/app-emulation/wine-staging/wine-staging-4.13.ebuild
index b963d19..ba1ddd3 100644
--- a/app-emulation/wine-staging/wine-staging-4.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -334,7 +334,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -385,7 +385,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
 
@@ -409,7 +409,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.14.ebuild 
b/app-emulation/wine-staging/wine-staging-4.14.ebuild
index ef38ac3..910bea0 100644
--- a/app-emulation/wine-staging/wine-staging-4.14.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -334,7 +334,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -385,7 +385,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
 
@@ -409,7 +409,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.15.ebuild 
b/app-emulation/wine-staging/wine-staging-4.15.ebuild
index ef38ac3..910bea0 100644
--- a/app-emulation/wine-staging/wine-staging-4.15.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -334,7 +334,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -385,7 +385,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
 
@@ -409,7 +409,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.16.ebuild 
b/app-emulation/wine-staging/wine-staging-4.16.ebuild
index ef38ac3..910bea0 100644
--- a/app-emulation/wine-staging/wine-staging-4.16.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -334,7 +334,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -385,7 +385,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
 
@@ -409,7 +409,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.17.ebuild 
b/app-emulation/wine-staging/wine-staging-4.17.ebuild
index 8719762..5ed4db2 100644
--- a/app-emulation/wine-staging/wine-staging-4.17.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -334,7 +334,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -385,7 +385,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
 
@@ -409,7 +409,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.18.ebuild 
b/app-emulation/wine-staging/wine-staging-4.18.ebuild
index 8719762..5ed4db2 100644
--- a/app-emulation/wine-staging/wine-staging-4.18.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -334,7 +334,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -385,7 +385,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
 
@@ -409,7 +409,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.19.ebuild 
b/app-emulation/wine-staging/wine-staging-4.19.ebuild
index 8719762..5ed4db2 100644
--- a/app-emulation/wine-staging/wine-staging-4.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -334,7 +334,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -385,7 +385,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
 
@@ -409,7 +409,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.2.ebuild 
b/app-emulation/wine-staging/wine-staging-4.2.ebuild
index dadbc96..a682b89 100644
--- a/app-emulation/wine-staging/wine-staging-4.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru 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}"
@@ -335,7 +335,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -386,7 +386,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
 
@@ -410,7 +410,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.20.ebuild 
b/app-emulation/wine-staging/wine-staging-4.20.ebuild
index 7cd204d..7f66f33 100644
--- a/app-emulation/wine-staging/wine-staging-4.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -334,7 +334,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -385,7 +385,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
 
@@ -409,7 +409,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.21.ebuild 
b/app-emulation/wine-staging/wine-staging-4.21.ebuild
index 7cd204d..7f66f33 100644
--- a/app-emulation/wine-staging/wine-staging-4.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -334,7 +334,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -385,7 +385,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
 
@@ -409,7 +409,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.3.ebuild 
b/app-emulation/wine-staging/wine-staging-4.3.ebuild
index 17ab0b4..369d18d 100644
--- a/app-emulation/wine-staging/wine-staging-4.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru 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}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -531,7 +531,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.4-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-4.4-r1.ebuild
index a769b10..cd2e0b1 100644
--- a/app-emulation/wine-staging/wine-staging-4.4-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru 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}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -388,7 +388,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
 
@@ -412,7 +412,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)
 }
 
@@ -532,7 +532,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.4.ebuild 
b/app-emulation/wine-staging/wine-staging-4.4.ebuild
index c220803..6d62670 100644
--- a/app-emulation/wine-staging/wine-staging-4.4.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru 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}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -531,7 +531,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.5.ebuild 
b/app-emulation/wine-staging/wine-staging-4.5.ebuild
index a769b10..cd2e0b1 100644
--- a/app-emulation/wine-staging/wine-staging-4.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru 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}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -388,7 +388,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
 
@@ -412,7 +412,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)
 }
 
@@ -532,7 +532,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.6-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-4.6-r1.ebuild
index cc5f8a0..6eed46b 100644
--- a/app-emulation/wine-staging/wine-staging-4.6-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru 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}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -388,7 +388,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
 
@@ -412,7 +412,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)
 }
 
@@ -532,7 +532,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.6.ebuild 
b/app-emulation/wine-staging/wine-staging-4.6.ebuild
index a769b10..cd2e0b1 100644
--- a/app-emulation/wine-staging/wine-staging-4.6.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru 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}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -388,7 +388,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
 
@@ -412,7 +412,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)
 }
 
@@ -532,7 +532,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.7-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-4.7-r1.ebuild
index 052c702..3f9e920 100644
--- a/app-emulation/wine-staging/wine-staging-4.7-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru 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}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -388,7 +388,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
 
@@ -412,7 +412,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.7.ebuild 
b/app-emulation/wine-staging/wine-staging-4.7.ebuild
index d50a590..cddd688 100644
--- a/app-emulation/wine-staging/wine-staging-4.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru 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}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -388,7 +388,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
 
@@ -412,7 +412,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)
 }
 
@@ -532,7 +532,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.8.ebuild 
b/app-emulation/wine-staging/wine-staging-4.8.ebuild
index 66e9c1c..074a09b 100644
--- a/app-emulation/wine-staging/wine-staging-4.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -388,7 +388,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
 
@@ -412,7 +412,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-4.9.ebuild 
b/app-emulation/wine-staging/wine-staging-4.9.ebuild
index 66e9c1c..074a09b 100644
--- a/app-emulation/wine-staging/wine-staging-4.9.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -388,7 +388,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
 
@@ -412,7 +412,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.0.ebuild 
b/app-emulation/wine-staging/wine-staging-5.0.ebuild
index 7d64cd2..5e18803 100644
--- a/app-emulation/wine-staging/wine-staging-5.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -334,7 +334,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -385,7 +385,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
 
@@ -409,7 +409,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.1.ebuild 
b/app-emulation/wine-staging/wine-staging-5.1.ebuild
index 1536102..074d035 100644
--- a/app-emulation/wine-staging/wine-staging-5.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -334,7 +334,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -385,7 +385,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
 
@@ -409,7 +409,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.10-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-5.10-r1.ebuild
index a499bd2..fb53360 100644
--- a/app-emulation/wine-staging/wine-staging-5.10-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -532,7 +532,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.11.ebuild 
b/app-emulation/wine-staging/wine-staging-5.11.ebuild
index 21f19f4..e9a7797 100644
--- a/app-emulation/wine-staging/wine-staging-5.11.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.12.ebuild 
b/app-emulation/wine-staging/wine-staging-5.12.ebuild
index 7d83e7a..af7da34 100644
--- a/app-emulation/wine-staging/wine-staging-5.12.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.13.ebuild 
b/app-emulation/wine-staging/wine-staging-5.13.ebuild
index 21f19f4..e9a7797 100644
--- a/app-emulation/wine-staging/wine-staging-5.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.14.ebuild 
b/app-emulation/wine-staging/wine-staging-5.14.ebuild
index 21f19f4..e9a7797 100644
--- a/app-emulation/wine-staging/wine-staging-5.14.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.15.ebuild 
b/app-emulation/wine-staging/wine-staging-5.15.ebuild
index 7e08e25..0c80536 100644
--- a/app-emulation/wine-staging/wine-staging-5.15.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.16.ebuild 
b/app-emulation/wine-staging/wine-staging-5.16.ebuild
index 21f19f4..e9a7797 100644
--- a/app-emulation/wine-staging/wine-staging-5.16.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.17.ebuild 
b/app-emulation/wine-staging/wine-staging-5.17.ebuild
index 21f19f4..e9a7797 100644
--- a/app-emulation/wine-staging/wine-staging-5.17.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.18.ebuild 
b/app-emulation/wine-staging/wine-staging-5.18.ebuild
index b8a22e8..984575f 100644
--- a/app-emulation/wine-staging/wine-staging-5.18.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.19.ebuild 
b/app-emulation/wine-staging/wine-staging-5.19.ebuild
index 77f7546..112ea46 100644
--- a/app-emulation/wine-staging/wine-staging-5.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.2.ebuild 
b/app-emulation/wine-staging/wine-staging-5.2.ebuild
index 1536102..074d035 100644
--- a/app-emulation/wine-staging/wine-staging-5.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -334,7 +334,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -385,7 +385,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
 
@@ -409,7 +409,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.20.ebuild 
b/app-emulation/wine-staging/wine-staging-5.20.ebuild
index 77f7546..112ea46 100644
--- a/app-emulation/wine-staging/wine-staging-5.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.21.ebuild 
b/app-emulation/wine-staging/wine-staging-5.21.ebuild
index 77f7546..112ea46 100644
--- a/app-emulation/wine-staging/wine-staging-5.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.22-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-5.22-r1.ebuild
index d2569b1..835386d 100644
--- a/app-emulation/wine-staging/wine-staging-5.22-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -364,7 +364,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -415,7 +415,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
 
@@ -439,7 +439,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
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild 
b/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
index df1a6ab..61cc2a0 100644
--- a/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.22-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -363,7 +363,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -414,7 +414,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
 
@@ -438,7 +438,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)
 }
 
@@ -563,7 +563,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.22.ebuild 
b/app-emulation/wine-staging/wine-staging-5.22.ebuild
index 77f7546..112ea46 100644
--- a/app-emulation/wine-staging/wine-staging-5.22.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.3-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-5.3-r1.ebuild
index 9ec7ab0..16bf9e9 100644
--- a/app-emulation/wine-staging/wine-staging-5.3-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -335,7 +335,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -386,7 +386,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
 
@@ -410,7 +410,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)
 }
 
@@ -531,7 +531,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.3.ebuild 
b/app-emulation/wine-staging/wine-staging-5.3.ebuild
index 1536102..074d035 100644
--- a/app-emulation/wine-staging/wine-staging-5.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -334,7 +334,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -385,7 +385,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
 
@@ -409,7 +409,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)
 }
 
@@ -529,7 +529,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.4.ebuild 
b/app-emulation/wine-staging/wine-staging-5.4.ebuild
index 9ec7ab0..16bf9e9 100644
--- a/app-emulation/wine-staging/wine-staging-5.4.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -335,7 +335,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -386,7 +386,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
 
@@ -410,7 +410,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)
 }
 
@@ -531,7 +531,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.5-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-5.5-r1.ebuild
index 7004475..8fa1f8c 100644
--- a/app-emulation/wine-staging/wine-staging-5.5-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.5.ebuild 
b/app-emulation/wine-staging/wine-staging-5.5.ebuild
index f5f0e0f..408c0cd 100644
--- a/app-emulation/wine-staging/wine-staging-5.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.6.ebuild 
b/app-emulation/wine-staging/wine-staging-5.6.ebuild
index 4759837..612b6c8 100644
--- a/app-emulation/wine-staging/wine-staging-5.6.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -335,7 +335,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -386,7 +386,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
 
@@ -410,7 +410,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)
 }
 
@@ -532,7 +532,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.7.ebuild 
b/app-emulation/wine-staging/wine-staging-5.7.ebuild
index b4e2edb..413fd86 100644
--- a/app-emulation/wine-staging/wine-staging-5.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -335,7 +335,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -386,7 +386,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
 
@@ -410,7 +410,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)
 }
 
@@ -532,7 +532,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.8.ebuild 
b/app-emulation/wine-staging/wine-staging-5.8.ebuild
index b4e2edb..413fd86 100644
--- a/app-emulation/wine-staging/wine-staging-5.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -335,7 +335,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -386,7 +386,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
 
@@ -410,7 +410,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)
 }
 
@@ -532,7 +532,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-5.9.ebuild 
b/app-emulation/wine-staging/wine-staging-5.9.ebuild
index 1f04764..9fc6af2 100644
--- a/app-emulation/wine-staging/wine-staging-5.9.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -336,7 +336,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -387,7 +387,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
 
@@ -411,7 +411,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)
 }
 
@@ -533,7 +533,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-6.0.ebuild 
b/app-emulation/wine-staging/wine-staging-6.0.ebuild
index a7d2322..7ffc9e4 100644
--- a/app-emulation/wine-staging/wine-staging-6.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 MY_PN="${PN%%-*}"
 MY_PV="${PV/_/-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -370,7 +370,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -421,7 +421,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
 
@@ -445,7 +445,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)
 }
 
@@ -571,7 +571,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-6.1.ebuild 
b/app-emulation/wine-staging/wine-staging-6.1.ebuild
index a7d2322..7ffc9e4 100644
--- a/app-emulation/wine-staging/wine-staging-6.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 MY_PN="${PN%%-*}"
 MY_PV="${PV/_/-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -370,7 +370,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -421,7 +421,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
 
@@ -445,7 +445,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)
 }
 
@@ -571,7 +571,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-6.10.ebuild 
b/app-emulation/wine-staging/wine-staging-6.10.ebuild
index 9e39a60..a1637bb 100644
--- a/app-emulation/wine-staging/wine-staging-6.10.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.10.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 MY_PN="${PN%%-*}"
 MY_PV="${PV/_/-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -368,7 +368,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -419,7 +419,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
 
@@ -443,7 +443,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)
 }
 
@@ -569,7 +569,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-6.11.ebuild 
b/app-emulation/wine-staging/wine-staging-6.11.ebuild
index 9e39a60..a1637bb 100644
--- a/app-emulation/wine-staging/wine-staging-6.11.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.11.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 MY_PN="${PN%%-*}"
 MY_PV="${PV/_/-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -368,7 +368,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -419,7 +419,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
 
@@ -443,7 +443,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)
 }
 
@@ -569,7 +569,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-6.2.ebuild 
b/app-emulation/wine-staging/wine-staging-6.2.ebuild
index cb79630..dc0d348 100644
--- a/app-emulation/wine-staging/wine-staging-6.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 MY_PN="${PN%%-*}"
 MY_PV="${PV/_/-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -369,7 +369,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -420,7 +420,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
 
@@ -444,7 +444,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)
 }
 
@@ -570,7 +570,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-6.3-r1.ebuild 
b/app-emulation/wine-staging/wine-staging-6.3-r1.ebuild
index d137eb6..31371ff 100644
--- a/app-emulation/wine-staging/wine-staging-6.3-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 MY_PN="${PN%%-*}"
 MY_PV="${PV/_/-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -371,7 +371,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -422,7 +422,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
 
@@ -446,7 +446,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)
 }
 
@@ -572,7 +572,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-6.3.ebuild 
b/app-emulation/wine-staging/wine-staging-6.3.ebuild
index 611e3bf..f5d23ab 100644
--- a/app-emulation/wine-staging/wine-staging-6.3.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 MY_PN="${PN%%-*}"
 MY_PV="${PV/_/-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -370,7 +370,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -421,7 +421,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
 
@@ -445,7 +445,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)
 }
 
@@ -571,7 +571,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-6.4.ebuild 
b/app-emulation/wine-staging/wine-staging-6.4.ebuild
index b5394a7..d24f36c 100644
--- a/app-emulation/wine-staging/wine-staging-6.4.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 MY_PN="${PN%%-*}"
 MY_PV="${PV/_/-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -368,7 +368,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -419,7 +419,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
 
@@ -443,7 +443,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)
 }
 
@@ -569,7 +569,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-6.5.ebuild 
b/app-emulation/wine-staging/wine-staging-6.5.ebuild
index b5394a7..d24f36c 100644
--- a/app-emulation/wine-staging/wine-staging-6.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.5.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 MY_PN="${PN%%-*}"
 MY_PV="${PV/_/-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -368,7 +368,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -419,7 +419,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
 
@@ -443,7 +443,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)
 }
 
@@ -569,7 +569,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-6.6.ebuild 
b/app-emulation/wine-staging/wine-staging-6.6.ebuild
index e3dd54a..cd11ef5 100644
--- a/app-emulation/wine-staging/wine-staging-6.6.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.6.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 MY_PN="${PN%%-*}"
 MY_PV="${PV/_/-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -368,7 +368,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -419,7 +419,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
 
@@ -443,7 +443,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)
 }
 
@@ -569,7 +569,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-6.7.ebuild 
b/app-emulation/wine-staging/wine-staging-6.7.ebuild
index e3dd54a..cd11ef5 100644
--- a/app-emulation/wine-staging/wine-staging-6.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.7.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 MY_PN="${PN%%-*}"
 MY_PV="${PV/_/-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -368,7 +368,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -419,7 +419,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
 
@@ -443,7 +443,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)
 }
 
@@ -569,7 +569,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-6.8.ebuild 
b/app-emulation/wine-staging/wine-staging-6.8.ebuild
index e3dd54a..cd11ef5 100644
--- a/app-emulation/wine-staging/wine-staging-6.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.8.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 MY_PN="${PN%%-*}"
 MY_PV="${PV/_/-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -368,7 +368,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -419,7 +419,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
 
@@ -443,7 +443,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)
 }
 
@@ -569,7 +569,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

diff --git a/app-emulation/wine-staging/wine-staging-6.9.ebuild 
b/app-emulation/wine-staging/wine-staging-6.9.ebuild
index e3dd54a..cd11ef5 100644
--- a/app-emulation/wine-staging/wine-staging-6.9.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.9.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja 
ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic 
sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 MY_PN="${PN%%-*}"
 MY_PV="${PV/_/-}"
 MY_P="${MY_PN}-${MY_PV}"
@@ -368,7 +368,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -419,7 +419,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
 
@@ -443,7 +443,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)
 }
 
@@ -569,7 +569,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        find "${ED}" -name *.la -delete || die

[gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/

Reply via email to