Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
Date: Sun, 04 Jul 2021 14:03:16
Message-Id: 1625407326.5887570604af067e2f54aa70affc02e6ee7e949c.ulm@gentoo
1 commit: 5887570604af067e2f54aa70affc02e6ee7e949c
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 3 15:47:01 2021 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 4 14:02:06 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58875706
7
8 sci-geosciences/merkaartor: Update from l10n.eclass to plocale.eclass
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
12
13 sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild | 8 ++++----
14 sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild | 6 +++---
15 sci-geosciences/merkaartor/merkaartor-9999.ebuild | 6 +++---
16 3 files changed, 10 insertions(+), 10 deletions(-)
17
18 diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
19 index 360d580f309..6f1f3aaf2e6 100644
20 --- a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
21 +++ b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
22 @@ -1,10 +1,10 @@
23 -# Copyright 1999-2020 Gentoo Authors
24 +# Copyright 1999-2021 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=7
28
29 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
30 -inherit flag-o-matic l10n qmake-utils xdg-utils
31 +inherit flag-o-matic plocale qmake-utils xdg-utils
32
33 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
34 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
35 @@ -56,8 +56,8 @@ src_prepare() {
36 rm "translations/${PN}_${1}.ts" || die
37 }
38
39 - if [[ -n "$(l10n_get_locales)" ]]; then
40 - l10n_for_each_disabled_locale_do my_rm_loc
41 + if [[ -n "$(plocale_get_locales)" ]]; then
42 + plocale_for_each_disabled_locale my_rm_loc
43 $(qt5_get_bindir)/lrelease src/src.pro || die
44 fi
45
46
47 diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
48 index 49fce917fa1..4b22730517f 100644
49 --- a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
50 +++ b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
51 @@ -4,7 +4,7 @@
52 EAPI=7
53
54 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
55 -inherit flag-o-matic l10n qmake-utils xdg-utils
56 +inherit flag-o-matic plocale qmake-utils xdg-utils
57
58 if [[ ${PV} != *9999 ]] ; then
59 # Needed for new Proj API support
60 @@ -65,8 +65,8 @@ src_prepare() {
61 rm "translations/${PN}_${1}.ts" || die
62 }
63
64 - if [[ -n "$(l10n_get_locales)" ]]; then
65 - l10n_for_each_disabled_locale_do my_rm_loc
66 + if [[ -n "$(plocale_get_locales)" ]]; then
67 + plocale_for_each_disabled_locale my_rm_loc
68 $(qt5_get_bindir)/lrelease src/src.pro || die
69 fi
70
71
72 diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
73 index 4cdd436ca64..7ea1462d493 100644
74 --- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
75 +++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
76 @@ -4,7 +4,7 @@
77 EAPI=7
78
79 PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
80 -inherit flag-o-matic l10n qmake-utils xdg-utils
81 +inherit flag-o-matic plocale qmake-utils xdg-utils
82
83 if [[ ${PV} != *9999 ]] ; then
84 SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
85 @@ -59,8 +59,8 @@ src_prepare() {
86 rm "translations/${PN}_${1}.ts" || die
87 }
88
89 - if [[ -n "$(l10n_get_locales)" ]]; then
90 - l10n_for_each_disabled_locale_do my_rm_loc
91 + if [[ -n "$(plocale_get_locales)" ]]; then
92 + plocale_for_each_disabled_locale my_rm_loc
93 $(qt5_get_bindir)/lrelease src/src.pro || die
94 fi