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

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

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


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

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
index a74ca87..d808704 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -377,7 +377,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)
 }
 
@@ -485,7 +485,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild
index 6649f9e..0f57782 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -377,7 +377,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)
 }
 
@@ -485,7 +485,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild
index 451d914..5bc9324 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -314,7 +314,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -353,7 +353,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -378,7 +378,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)
 }
 
@@ -487,7 +487,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild
index 451d914..5bc9324 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -314,7 +314,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -353,7 +353,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -378,7 +378,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)
 }
 
@@ -487,7 +487,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild
index 451d914..5bc9324 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -314,7 +314,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -353,7 +353,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -378,7 +378,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)
 }
 
@@ -487,7 +487,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild
index 451d914..5bc9324 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -314,7 +314,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -353,7 +353,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -378,7 +378,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)
 }
 
@@ -487,7 +487,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild
index 2b5e71b..eb9b064 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -314,7 +314,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -353,7 +353,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -378,7 +378,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)
 }
 
@@ -487,7 +487,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild
index 2b5e71b..eb9b064 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -314,7 +314,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -353,7 +353,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -378,7 +378,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)
 }
 
@@ -487,7 +487,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild
index 2b5e71b..eb9b064 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -314,7 +314,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -353,7 +353,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -378,7 +378,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)
 }
 
@@ -487,7 +487,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild
index 2b5e71b..eb9b064 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -314,7 +314,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -353,7 +353,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -378,7 +378,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)
 }
 
@@ -487,7 +487,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

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

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

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild
index 6649f9e..0f57782 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -377,7 +377,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)
 }
 
@@ -485,7 +485,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
index d3f7ce7..eef217c 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -311,7 +311,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -350,7 +350,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -375,7 +375,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)
 }
 
@@ -485,7 +485,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
index d3f7ce7..eef217c 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -311,7 +311,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -350,7 +350,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -375,7 +375,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)
 }
 
@@ -485,7 +485,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild
index 6649f9e..0f57782 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -377,7 +377,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)
 }
 
@@ -485,7 +485,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild
index 65ba679..db12d98 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -377,7 +377,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)
 }
 
@@ -485,7 +485,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild
index 65ba679..db12d98 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -377,7 +377,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)
 }
 
@@ -485,7 +485,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild
index 65ba679..db12d98 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -377,7 +377,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)
 }
 
@@ -485,7 +485,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild
index 65ba679..db12d98 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -377,7 +377,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)
 }
 
@@ -485,7 +485,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild
index 65ba679..db12d98 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -377,7 +377,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)
 }
 
@@ -485,7 +485,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild
index 451d914..5bc9324 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -314,7 +314,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -353,7 +353,7 @@ src_prepare() {
        # hi-res default icon, #472990, 
https://bugs.winehq.org/show_bug.cgi?id=24652
        cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
 
-       l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect 
LINGUAS
+       plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't 
respect LINGUAS
 
        # Fix manpage generation for locales #469418 and abi_x86_64 #617864
        # Requires wine-2.0-rearrange-manpages.patch
@@ -378,7 +378,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)
 }
 
@@ -487,7 +487,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.10.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.10.ebuild
index 514ff98..066e538 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.10.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild
index 514ff98..066e538 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.12.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.12.ebuild
index 514ff98..066e538 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.12.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.13-r1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.13-r1.ebuild
index 81583de..e520a10 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.13-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.13.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.13.ebuild
index 81583de..e520a10 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.13.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.14.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.14.ebuild
index 81583de..e520a10 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.14.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.15.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.15.ebuild
index 81583de..e520a10 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.15.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild
index 81583de..e520a10 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild
index b7f926d..e520a10 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild
index b7f926d..e520a10 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.19.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.19.ebuild
index b7f926d..e520a10 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.19.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild
index b7f926d..e520a10 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.21.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.21.ebuild
index b7f926d..e520a10 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.21.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.3.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.3.ebuild
index 1d42e82..09e840d 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.3.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,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
 
@@ -376,7 +376,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild
index 1d42e82..09e840d 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,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
 
@@ -376,7 +376,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild
index 1d42e82..09e840d 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,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
 
@@ -376,7 +376,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.6.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.6.ebuild
index 1d42e82..09e840d 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.6.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,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
 
@@ -376,7 +376,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.7.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.7.ebuild
index 1d42e82..09e840d 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.7.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,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
 
@@ -376,7 +376,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.8.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.8.ebuild
index 1d42e82..09e840d 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.8.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -313,7 +313,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -352,7 +352,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
 
@@ -376,7 +376,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -489,7 +489,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild
index 514ff98..066e538 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt 
ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv 
te th tr uk wa zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n 
multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
+inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib 
multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
 
 MY_PN="${PN%%-*}"
 MY_P="${MY_PN}-${PV}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
index 03e8ff6..47381b6 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-4.0.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-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}"
@@ -316,7 +316,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -355,7 +355,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
 
@@ -379,7 +379,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)
 }
 
@@ -493,7 +493,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

diff --git a/app-emulation/wine-d3d9/wine-d3d9-4.1.ebuild 
b/app-emulation/wine-d3d9/wine-d3d9-4.1.ebuild
index 3a9f046..9bf370d 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-4.1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-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}"
@@ -315,7 +315,7 @@ src_unpack() {
 
        default
 
-       l10n_find_plocales_changes "${S}/po" "" ".po"
+       plocale_find_changes "${S}/po" "" ".po"
 }
 
 src_prepare() {
@@ -354,7 +354,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
 
@@ -378,7 +378,7 @@ src_prepare() {
        }
 
        while read f; do
-               l10n_for_each_disabled_locale_do rm_man_file "${f}"
+               plocale_for_each_disabled_locale rm_man_file "${f}"
        done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; 
-print)
 }
 
@@ -492,7 +492,7 @@ multilib_src_install_all() {
                local locale_doc="documentation/README.$1"
                [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
        }
-       l10n_for_each_locale_do add_locale_docs
+       plocale_for_each_locale add_locale_docs
 
        einstalldocs
        prune_libtool_files --all

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

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

Reply via email to