| 1 |
commit: cbc56b7f2626caa093f9af9281b9c06ff66b602d |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 23 08:19:28 2016 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 24 21:19:37 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc56b7f |
| 7 |
|
| 8 |
app-text/aspell: Migrate from LINGUAS to L10N. |
| 9 |
|
| 10 |
Bug: 586780 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0_rc1 |
| 13 |
|
| 14 |
app-text/aspell/aspell-0.60.6.1-r1.ebuild | 32 +++++++++++++++---------------- |
| 15 |
app-text/aspell/aspell-0.60.6.1-r3.ebuild | 18 +++++++++-------- |
| 16 |
2 files changed, 25 insertions(+), 25 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-text/aspell/aspell-0.60.6.1-r1.ebuild b/app-text/aspell/aspell-0.60.6.1-r1.ebuild |
| 19 |
index f99d940..41dbd69 100644 |
| 20 |
--- a/app-text/aspell/aspell-0.60.6.1-r1.ebuild |
| 21 |
+++ b/app-text/aspell/aspell-0.60.6.1-r1.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2015 Gentoo Foundation |
| 24 |
+# Copyright 1999-2016 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
# $Id$ |
| 27 |
|
| 28 |
@@ -16,22 +16,20 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~a |
| 29 |
IUSE="nls" |
| 30 |
|
| 31 |
PDEPEND="app-dicts/aspell-en" |
| 32 |
-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 |
| 33 |
-lt nl no pl pt pt_BR ro ru sk sl sr sv uk vi" |
| 34 |
+LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr |
| 35 |
+is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi" |
| 36 |
for lang in ${LANGS}; do |
| 37 |
- dep="linguas_${lang}? ( app-dicts/aspell-${lang/pt_BR/pt-br} )" |
| 38 |
- if [[ ${lang} == de ]] ; then |
| 39 |
- dep="linguas_${lang}? ( |
| 40 |
- || ( |
| 41 |
- app-dicts/aspell-${lang} |
| 42 |
- app-dicts/aspell-${lang}-alt |
| 43 |
- ) |
| 44 |
- )" |
| 45 |
- fi |
| 46 |
- PDEPEND+=" ${dep}" |
| 47 |
- IUSE+=" linguas_${lang}" |
| 48 |
+ IUSE+=" l10n_${lang}" |
| 49 |
+ # Need to keep linguas_* for now, since aspell uses gettext |
| 50 |
+ IUSE+=" linguas_${lang/-/_}" |
| 51 |
+ case ${lang} in |
| 52 |
+ de-1901) dict="de-alt" ;; |
| 53 |
+ pt-BR) dict="pt-br" ;; |
| 54 |
+ *) dict="${lang}" ;; |
| 55 |
+ esac |
| 56 |
+ PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )" |
| 57 |
done |
| 58 |
-unset dep |
| 59 |
+unset dict lang LANGS |
| 60 |
|
| 61 |
COMMON_DEPEND=" |
| 62 |
>=sys-libs/ncurses-5.2:0= |
| 63 |
@@ -99,9 +97,9 @@ src_install() { |
| 64 |
} |
| 65 |
|
| 66 |
pkg_postinst() { |
| 67 |
- elog "In case LINGUAS was not set correctly you may need to install" |
| 68 |
+ elog "In case L10N was not set correctly you may need to install" |
| 69 |
elog "dictionaries now. Please choose an aspell-<LANG> dictionary or" |
| 70 |
- elog "set LINGUAS correctly and let aspell pull in required packages." |
| 71 |
+ elog "set L10N correctly and let aspell pull in required packages." |
| 72 |
elog "After installing an aspell dictionary for your language(s)," |
| 73 |
elog "You may use the aspell-import utility to import your personal" |
| 74 |
elog "dictionaries from ispell, pspell and the older aspell" |
| 75 |
|
| 76 |
diff --git a/app-text/aspell/aspell-0.60.6.1-r3.ebuild b/app-text/aspell/aspell-0.60.6.1-r3.ebuild |
| 77 |
index f9548f1..afa7fce 100644 |
| 78 |
--- a/app-text/aspell/aspell-0.60.6.1-r3.ebuild |
| 79 |
+++ b/app-text/aspell/aspell-0.60.6.1-r3.ebuild |
| 80 |
@@ -16,18 +16,20 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar |
| 81 |
IUSE="nls" |
| 82 |
|
| 83 |
PDEPEND="app-dicts/aspell-en" |
| 84 |
-LANGS="af be bg br ca cs cy da de de_1901 el en eo es et fi fo fr ga gl he hr |
| 85 |
-hu hy is it la lt nl no pl pt pt_BR ro ru sk sl sr sv uk vi" |
| 86 |
+LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr |
| 87 |
+hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi" |
| 88 |
for lang in ${LANGS}; do |
| 89 |
+ IUSE+=" l10n_${lang}" |
| 90 |
+ # Need to keep linguas_* for now, since aspell uses gettext |
| 91 |
+ IUSE+=" linguas_${lang/-/_}" |
| 92 |
case ${lang} in |
| 93 |
- de_1901) dep="app-dicts/aspell-de-alt" ;; |
| 94 |
- pt_BR) dep="app-dicts/aspell-pt-br" ;; |
| 95 |
- *) dep="app-dicts/aspell-${lang}" ;; |
| 96 |
+ de-1901) dict="de-alt" ;; |
| 97 |
+ pt-BR) dict="pt-br" ;; |
| 98 |
+ *) dict="${lang}" ;; |
| 99 |
esac |
| 100 |
- PDEPEND+=" linguas_${lang}? ( ${dep} )" |
| 101 |
- IUSE+=" linguas_${lang}" |
| 102 |
+ PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )" |
| 103 |
done |
| 104 |
-unset dep |
| 105 |
+unset dict lang LANGS |
| 106 |
|
| 107 |
COMMON_DEPEND=" |
| 108 |
>=sys-libs/ncurses-5.2:0= |
Archives