From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BC89B13933E for ; Sun, 4 Jul 2021 17:47:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2098AE0817; Sun, 4 Jul 2021 17:47:09 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBB9BE0817 for ; Sun, 4 Jul 2021 17:47:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D57433BE39 for ; Sun, 4 Jul 2021 17:47:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C0D3A7B2 for ; Sun, 4 Jul 2021 17:47:05 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1625420572.196861f890b752e19dcae4ea9e79da689bcb59ed.sarnex@gentoo> Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/ X-VCS-Repository: repo/proj/wine X-VCS-Files: app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild app-emulation/wine-vanilla/wine-vanilla-9999.ebuild X-VCS-Directories: app-emulation/wine-vanilla/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 196861f890b752e19dcae4ea9e79da689bcb59ed X-VCS-Branch: master Date: Sun, 4 Jul 2021 17:47:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0cb33858-3d77-453d-84f2-8e7599b40a9d X-Archives-Hash: 137d8d5d79f1ac3a47de8f9b1ee61db1 commit: 196861f890b752e19dcae4ea9e79da689bcb59ed Author: Nick Sarnie gentoo org> AuthorDate: Sun Jul 4 17:42:52 2021 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sun Jul 4 17:42:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=196861f8 app-emulation/wine-vanilla: Sync with ::gentoo Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Nick Sarnie gentoo.org> app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild | 10 +++++----- app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild index 497755a..b16b517 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.12.ebuild @@ -6,7 +6,7 @@ EAPI=6 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils +inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" @@ -313,7 +313,7 @@ src_unpack() { default - l10n_find_plocales_changes "${S}/po" "" ".po" + plocale_find_changes "${S}/po" "" ".po" } src_prepare() { @@ -347,7 +347,7 @@ src_prepare() { # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die - l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS # Fix manpage generation for locales #469418 and abi_x86_64 #617864 @@ -371,7 +371,7 @@ src_prepare() { } while read f; do - l10n_for_each_disabled_locale_do rm_man_file "${f}" + plocale_for_each_disabled_locale rm_man_file "${f}" done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print) } @@ -489,7 +489,7 @@ multilib_src_install_all() { local locale_doc="documentation/README.$1" [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) } - l10n_for_each_locale_do add_locale_docs + plocale_for_each_locale add_locale_docs einstalldocs prune_libtool_files --all diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 497755a..b16b517 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -6,7 +6,7 @@ EAPI=6 PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils +inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils multilib multilib-minimal pax-utils plocale toolchain-funcs virtualx xdg-utils MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" @@ -313,7 +313,7 @@ src_unpack() { default - l10n_find_plocales_changes "${S}/po" "" ".po" + plocale_find_changes "${S}/po" "" ".po" } src_prepare() { @@ -347,7 +347,7 @@ src_prepare() { # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die - l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + plocale_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS # Fix manpage generation for locales #469418 and abi_x86_64 #617864 @@ -371,7 +371,7 @@ src_prepare() { } while read f; do - l10n_for_each_disabled_locale_do rm_man_file "${f}" + plocale_for_each_disabled_locale rm_man_file "${f}" done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print) } @@ -489,7 +489,7 @@ multilib_src_install_all() { local locale_doc="documentation/README.$1" [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) } - l10n_for_each_locale_do add_locale_docs + plocale_for_each_locale add_locale_docs einstalldocs prune_libtool_files --all