From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D87F71382BD for ; Fri, 24 Jun 2016 21:21:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35271941CF; Fri, 24 Jun 2016 21:21:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45AF21421B for ; Fri, 24 Jun 2016 21:21:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 553A4340BCB for ; Fri, 24 Jun 2016 21:21:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 00D46241C for ; Fri, 24 Jun 2016 21:21:16 +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: <1466803177.cbc56b7f2626caa093f9af9281b9c06ff66b602d.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/aspell/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/aspell/aspell-0.60.6.1-r1.ebuild app-text/aspell/aspell-0.60.6.1-r3.ebuild X-VCS-Directories: app-text/aspell/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: cbc56b7f2626caa093f9af9281b9c06ff66b602d X-VCS-Branch: master Date: Fri, 24 Jun 2016 21:21:16 +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: b2ffc98b-bec2-4015-80fc-54336ba63e48 X-Archives-Hash: 300f52f4f8b8959eeee24222b5817bf1 commit: cbc56b7f2626caa093f9af9281b9c06ff66b602d Author: Ulrich Müller gentoo org> AuthorDate: Thu Jun 23 08:19:28 2016 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Jun 24 21:19:37 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc56b7f app-text/aspell: Migrate from LINGUAS to L10N. Bug: 586780 Package-Manager: portage-2.3.0_rc1 app-text/aspell/aspell-0.60.6.1-r1.ebuild | 32 +++++++++++++++---------------- app-text/aspell/aspell-0.60.6.1-r3.ebuild | 18 +++++++++-------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app-text/aspell/aspell-0.60.6.1-r1.ebuild b/app-text/aspell/aspell-0.60.6.1-r1.ebuild index f99d940..41dbd69 100644 --- a/app-text/aspell/aspell-0.60.6.1-r1.ebuild +++ b/app-text/aspell/aspell-0.60.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -16,22 +16,20 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~a IUSE="nls" PDEPEND="app-dicts/aspell-en" -LANGS="af be bg br ca cs cy da de el en eo es et fi fo fr ga gl he hr is it la -lt nl no pl pt pt_BR ro ru sk sl sr sv uk vi" +LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr +is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi" for lang in ${LANGS}; do - dep="linguas_${lang}? ( app-dicts/aspell-${lang/pt_BR/pt-br} )" - if [[ ${lang} == de ]] ; then - dep="linguas_${lang}? ( - || ( - app-dicts/aspell-${lang} - app-dicts/aspell-${lang}-alt - ) - )" - fi - PDEPEND+=" ${dep}" - IUSE+=" linguas_${lang}" + IUSE+=" l10n_${lang}" + # Need to keep linguas_* for now, since aspell uses gettext + IUSE+=" linguas_${lang/-/_}" + case ${lang} in + de-1901) dict="de-alt" ;; + pt-BR) dict="pt-br" ;; + *) dict="${lang}" ;; + esac + PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )" done -unset dep +unset dict lang LANGS COMMON_DEPEND=" >=sys-libs/ncurses-5.2:0= @@ -99,9 +97,9 @@ src_install() { } pkg_postinst() { - elog "In case LINGUAS was not set correctly you may need to install" + elog "In case L10N was not set correctly you may need to install" elog "dictionaries now. Please choose an aspell- dictionary or" - elog "set LINGUAS correctly and let aspell pull in required packages." + elog "set L10N correctly and let aspell pull in required packages." elog "After installing an aspell dictionary for your language(s)," elog "You may use the aspell-import utility to import your personal" elog "dictionaries from ispell, pspell and the older aspell" diff --git a/app-text/aspell/aspell-0.60.6.1-r3.ebuild b/app-text/aspell/aspell-0.60.6.1-r3.ebuild index f9548f1..afa7fce 100644 --- a/app-text/aspell/aspell-0.60.6.1-r3.ebuild +++ b/app-text/aspell/aspell-0.60.6.1-r3.ebuild @@ -16,18 +16,20 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar IUSE="nls" PDEPEND="app-dicts/aspell-en" -LANGS="af be bg br ca cs cy da de de_1901 el en eo es et fi fo fr ga gl he hr -hu hy is it la lt nl no pl pt pt_BR ro ru sk sl sr sv uk vi" +LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr +hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi" for lang in ${LANGS}; do + IUSE+=" l10n_${lang}" + # Need to keep linguas_* for now, since aspell uses gettext + IUSE+=" linguas_${lang/-/_}" case ${lang} in - de_1901) dep="app-dicts/aspell-de-alt" ;; - pt_BR) dep="app-dicts/aspell-pt-br" ;; - *) dep="app-dicts/aspell-${lang}" ;; + de-1901) dict="de-alt" ;; + pt-BR) dict="pt-br" ;; + *) dict="${lang}" ;; esac - PDEPEND+=" linguas_${lang}? ( ${dep} )" - IUSE+=" linguas_${lang}" + PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )" done -unset dep +unset dict lang LANGS COMMON_DEPEND=" >=sys-libs/ncurses-5.2:0=