[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     5887570604af067e2f54aa70affc02e6ee7e949c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  3 15:47:01 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jul  4 14:02:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58875706

sci-geosciences/merkaartor: Update from l10n.eclass to plocale.eclass

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild              | 8 ++++----
 sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild | 6 +++---
 sci-geosciences/merkaartor/merkaartor-9999.ebuild                | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
index 360d580f309..6f1f3aaf2e6 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 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"
-inherit flag-o-matic l10n qmake-utils xdg-utils
+inherit flag-o-matic plocale qmake-utils xdg-utils
 
 DESCRIPTION="Qt based map editor for the openstreetmap.org project"
 HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
@@ -56,8 +56,8 @@ src_prepare() {
 		rm "translations/${PN}_${1}.ts" || die
 	}
 
-	if [[ -n "$(l10n_get_locales)" ]]; then
-		l10n_for_each_disabled_locale_do my_rm_loc
+	if [[ -n "$(plocale_get_locales)" ]]; then
+		plocale_for_each_disabled_locale my_rm_loc
 		$(qt5_get_bindir)/lrelease src/src.pro || die
 	fi
 

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
index 49fce917fa1..4b22730517f 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 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"
-inherit flag-o-matic l10n qmake-utils xdg-utils
+inherit flag-o-matic plocale qmake-utils xdg-utils
 
 if [[ ${PV} != *9999 ]] ; then
 	# Needed for new Proj API support
@@ -65,8 +65,8 @@ src_prepare() {
 		rm "translations/${PN}_${1}.ts" || die
 	}
 
-	if [[ -n "$(l10n_get_locales)" ]]; then
-		l10n_for_each_disabled_locale_do my_rm_loc
+	if [[ -n "$(plocale_get_locales)" ]]; then
+		plocale_for_each_disabled_locale my_rm_loc
 		$(qt5_get_bindir)/lrelease src/src.pro || die
 	fi
 

diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
index 4cdd436ca64..7ea1462d493 100644
--- a/sci-geosciences/merkaartor/merkaartor-9999.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 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"
-inherit flag-o-matic l10n qmake-utils xdg-utils
+inherit flag-o-matic plocale qmake-utils xdg-utils
 
 if [[ ${PV} != *9999 ]] ; then
 	SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -59,8 +59,8 @@ src_prepare() {
 		rm "translations/${PN}_${1}.ts" || die
 	}
 
-	if [[ -n "$(l10n_get_locales)" ]]; then
-		l10n_for_each_disabled_locale_do my_rm_loc
+	if [[ -n "$(plocale_get_locales)" ]]; then
+		plocale_for_each_disabled_locale my_rm_loc
 		$(qt5_get_bindir)/lrelease src/src.pro || die
 	fi