public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/aspell/
Date: Fri, 24 Jun 2016 21:21:16 +0000 (UTC)	[thread overview]
Message-ID: <1466803177.cbc56b7f2626caa093f9af9281b9c06ff66b602d.ulm@gentoo> (raw)

commit:     cbc56b7f2626caa093f9af9281b9c06ff66b602d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 08:19:28 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> 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-<LANG> 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=


             reply	other threads:[~2016-06-24 21:21 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-24 21:21 Ulrich Müller [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-30  9:05 [gentoo-commits] repo/gentoo:master commit in: app-text/aspell/ Arthur Zamarin
2024-08-26  6:28 Sam James
2024-08-26  6:28 Sam James
2024-08-26  6:28 Sam James
2024-08-26  6:28 Sam James
2024-08-26  6:28 Sam James
2024-08-26  6:28 Sam James
2024-02-22 20:33 Arthur Zamarin
2024-02-02  1:02 Sam James
2024-01-24  7:31 Sam James
2024-01-24  7:31 Sam James
2024-01-24  6:35 Sam James
2024-01-24  6:16 Sam James
2024-01-24  6:16 Sam James
2023-12-23 21:51 Conrad Kostecki
2023-08-05 22:41 Conrad Kostecki
2022-05-19  7:17 WANG Xuerui
2021-07-20 23:28 Conrad Kostecki
2021-04-22 20:19 Sam James
2021-04-12  1:32 Sam James
2021-04-12  1:27 Sam James
2021-03-12 22:31 Conrad Kostecki
2020-03-15 21:15 Thomas Deutschmann
2020-03-13  9:26 Mart Raudsepp
2020-03-08  9:58 Sergei Trofimovich
2020-03-04  8:07 Agostino Sarubbo
2020-03-03 15:14 Agostino Sarubbo
2020-03-03 13:41 Agostino Sarubbo
2020-03-03 12:40 Agostino Sarubbo
2020-03-03 12:39 Agostino Sarubbo
2020-03-03 12:36 Agostino Sarubbo
2020-03-03 11:46 Agostino Sarubbo
2020-03-03 11:08 Agostino Sarubbo
2019-10-13 18:43 Lars Wendler
2019-07-30  0:29 Lars Wendler
2019-07-20 19:34 Lars Wendler
2018-12-29 17:32 Anthony G. Basile
2018-06-07 13:48 Mikle Kolyada
2018-04-05  6:08 Sergei Trofimovich
2018-02-02 23:36 Michael Palimaka
2018-02-02 23:36 Michael Palimaka
2018-01-29  8:22 Tobias Klausmann
2018-01-22 18:24 Markus Meier
2018-01-05 16:36 Ulrich Müller
2017-12-19  5:16 Jason Zaman
2017-12-11 20:54 Sergei Trofimovich
2017-12-10 22:59 Sergei Trofimovich
2017-12-09 19:02 Sergei Trofimovich
2017-10-03  9:26 Fabian Groffen
2017-01-30 10:22 Lars Wendler
2017-01-30 10:22 Lars Wendler
2017-01-02  9:54 Agostino Sarubbo
2016-12-20 14:30 Tobias Klausmann
2016-10-29 13:38 David Seifert
2016-10-25 22:40 Kristian Fiskerstrand
2016-10-05 18:56 Markus Meier
2016-10-01 13:59 Jeroen Roovers
2016-09-26 15:22 Tobias Klausmann
2016-05-06  1:25 Ulrich Müller
2015-12-25 16:57 Michael Palimaka
2015-12-19 19:00 Patrice Clement
2015-08-20 12:23 Justin Lecher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1466803177.cbc56b7f2626caa093f9af9281b9c06ff66b602d.ulm@gentoo \
    --to=ulm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox