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 EEA4B138330 for ; Mon, 8 Jan 2018 07:25:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 171F1E07C9; Mon, 8 Jan 2018 07:25:55 +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 EB731E0B33 for ; Mon, 8 Jan 2018 07:25:54 +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 6A1A3340F94 for ; Mon, 8 Jan 2018 07:25:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 06FE21AB for ; Mon, 8 Jan 2018 07:25:52 +0000 (UTC) From: "Ulrich Müller" 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" Message-ID: <1515396338.29111e77caf81c872c298d33bafddb86c09900cf.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/tagainijisho/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild X-VCS-Directories: app-i18n/tagainijisho/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 29111e77caf81c872c298d33bafddb86c09900cf X-VCS-Branch: master Date: Mon, 8 Jan 2018 07:25:52 +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-Archives-Salt: b4971cc2-1d9e-48b5-9f74-0c9232fbb02c X-Archives-Hash: 5a0361d3400cb2384f416add3c91533d commit: 29111e77caf81c872c298d33bafddb86c09900cf Author: Ulrich Müller gentoo org> AuthorDate: Mon Jan 8 07:25:11 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Jan 8 07:25:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29111e77 app-i18n/tagainijisho: Migrate from LINGUAS to L10N. Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild | 27 ++++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild b/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild index 66e285c37c3..6b4b8db7eed 100644 --- a/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild +++ b/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild @@ -18,8 +18,8 @@ DEPEND="dev-qt/qtcore:4 >=dev-db/sqlite-3.11:3" RDEPEND="${DEPEND}" -pkg_linguas=( ar cs de es fa_IR fi_FI fr hu id it nb nl pl pt ru sv th tr vi ) -IUSE+=" ${pkg_linguas[@]/#/linguas_}" +pkg_langs=( ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr vi ) +IUSE+=" ${pkg_langs[@]/#/l10n_}" PATCHES=( "${FILESDIR}"/${P}-sqlite.patch ) @@ -27,22 +27,29 @@ src_configure() { # GUI linguae # en is not optional, and build fails if none other then en is set, so adding ja as non-optional too # linguae undeclared in IUSE will trigger an error, which is a handy check - for lingua in $(ls -1 i18n/*.ts | sed -e 's/.*tagainijisho_\(.*\)\.ts/\1/' | grep -v en | grep -v ja); do - if ! use linguas_${lingua}; then - rm i18n/tagainijisho_${lingua}.ts || die + local lang use_lang + for lang in i18n/*.ts; do + lang=${lang#i18n/tagainijisho_} + lang=${lang%.ts} + case ${lang} in + fa_IR|fi_FI) use_lang=${lang%%_*} ;; # use generic tags instead + *) use_lang=${lang} ;; + esac + if [[ ${lang} != en && ${lang} != ja ]] && ! use l10n_${use_lang}; then + rm i18n/tagainijisho_${lang}.ts || die fi done # Dictionary linguae # en is not optional here either, but nothing special needs to be done # here too, linguae undeclared in IUSE will trigger an error - local cmake_linguas - for lingua in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do - if use linguas_${lingua}; then - cmake_linguas+=";${lingua}" + local cmake_langs + for lang in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do + if use l10n_${lang}; then + cmake_langs+=";${lang}" fi done - mycmakeargs=( -DDICT_LANG="${cmake_linguas};" ) + mycmakeargs=( -DDICT_LANG="${cmake_langs};" ) cmake-utils_src_configure }