Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/
Date: Sun, 04 Jul 2021 17:47:10
Message-Id: 1625420812.c89e0149287133cf4d4aba4e12b4e26fd2aebb24.sarnex@gentoo
1 commit: c89e0149287133cf4d4aba4e12b4e26fd2aebb24
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 4 17:46:52 2021 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 4 17:46:52 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=c89e0149
7
8 app-emulation/wine-staging: Sync with ::gentoo
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
12
13 app-emulation/wine-staging/wine-staging-6.12.ebuild | 10 +++++-----
14 app-emulation/wine-staging/wine-staging-9999.ebuild | 10 +++++-----
15 2 files changed, 10 insertions(+), 10 deletions(-)
16
17 diff --git a/app-emulation/wine-staging/wine-staging-6.12.ebuild b/app-emulation/wine-staging/wine-staging-6.12.ebuild
18 index 674f7b0..9f66da3 100644
19 --- a/app-emulation/wine-staging/wine-staging-6.12.ebuild
20 +++ b/app-emulation/wine-staging/wine-staging-6.12.ebuild
21 @@ -6,7 +6,7 @@ EAPI=6
22 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
23 PLOCALE_BACKUP="en"
24
25 -inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
26 +inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
27 MY_PN="${PN%%-*}"
28 MY_PV="${PV/_/-}"
29 MY_P="${MY_PN}-${MY_PV}"
30 @@ -368,7 +368,7 @@ src_unpack() {
31
32 default
33
34 - l10n_find_plocales_changes "${S}/po" "" ".po"
35 + plocale_find_changes "${S}/po" "" ".po"
36 }
37
38 src_prepare() {
39 @@ -419,7 +419,7 @@ src_prepare() {
40 # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
41 cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
42
43 - l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
44 + plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
45
46 # Fix manpage generation for locales #469418 and abi_x86_64 #617864
47
48 @@ -443,7 +443,7 @@ src_prepare() {
49 }
50
51 while read f; do
52 - l10n_for_each_disabled_locale_do rm_man_file "${f}"
53 + plocale_for_each_disabled_locale rm_man_file "${f}"
54 done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
55 }
56
57 @@ -569,7 +569,7 @@ multilib_src_install_all() {
58 local locale_doc="documentation/README.$1"
59 [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
60 }
61 - l10n_for_each_locale_do add_locale_docs
62 + plocale_for_each_locale add_locale_docs
63
64 einstalldocs
65 prune_libtool_files --all
66
67 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
68 index ca97ca2..5fa9270 100644
69 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
70 +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
71 @@ -6,7 +6,7 @@ EAPI=6
72 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
73 PLOCALE_BACKUP="en"
74
75 -inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
76 +inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils
77 MY_PN="${PN%%-*}"
78 MY_PV="${PV/_/-}"
79 MY_P="${MY_PN}-${MY_PV}"
80 @@ -368,7 +368,7 @@ src_unpack() {
81
82 default
83
84 - l10n_find_plocales_changes "${S}/po" "" ".po"
85 + plocale_find_changes "${S}/po" "" ".po"
86 }
87
88 src_prepare() {
89 @@ -419,7 +419,7 @@ src_prepare() {
90 # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
91 cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
92
93 - l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
94 + plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
95
96 # Fix manpage generation for locales #469418 and abi_x86_64 #617864
97
98 @@ -443,7 +443,7 @@ src_prepare() {
99 }
100
101 while read f; do
102 - l10n_for_each_disabled_locale_do rm_man_file "${f}"
103 + plocale_for_each_disabled_locale rm_man_file "${f}"
104 done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
105 }
106
107 @@ -569,7 +569,7 @@ multilib_src_install_all() {
108 local locale_doc="documentation/README.$1"
109 [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
110 }
111 - l10n_for_each_locale_do add_locale_docs
112 + plocale_for_each_locale add_locale_docs
113
114 einstalldocs
115 prune_libtool_files --all