From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1299030-garchives=archives.gentoo.org@lists.gentoo.org>
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 C371213933E
for <garchives@archives.gentoo.org>; Sun, 4 Jul 2021 14:03:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6A9E2E083B;
Sun, 4 Jul 2021 14:03:11 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 5012BE0845
for <gentoo-commits@lists.gentoo.org>; Sun, 4 Jul 2021 14:03:11 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 E4D17342B08
for <gentoo-commits@lists.gentoo.org>; Sun, 4 Jul 2021 14:03:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 54F1A7D4
for <gentoo-commits@lists.gentoo.org>; Sun, 4 Jul 2021 14:03:06 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1625407326.5887570604af067e2f54aa70affc02e6ee7e949c.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-geosciences/merkaartor/merkaartor-0.18.4.ebuild sci-geosciences/merkaartor/merkaartor-0.18.4_p20210410-r1.ebuild sci-geosciences/merkaartor/merkaartor-9999.ebuild
X-VCS-Directories: sci-geosciences/merkaartor/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 5887570604af067e2f54aa70affc02e6ee7e949c
X-VCS-Branch: master
Date: Sun, 4 Jul 2021 14:03:06 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 26860724-5fd4-440a-9dd5-db84b78e123a
X-Archives-Hash: feffe9683ac074ed657ab8773f9553af
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