Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/
Date: Sat, 08 Jul 2017 06:59:05
Message-Id: 1499497113.6a4f353f033ae652c443132d2296035d9cc2702f.hattya@gentoo
1 commit: 6a4f353f033ae652c443132d2296035d9cc2702f
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 8 06:58:33 2017 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 8 06:58:33 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a4f353f
7
8 app-i18n/canna: update pkg_postinst
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 app-i18n/canna/canna-3.7_p3-r1.ebuild | 12 ++++++++----
13 app-i18n/canna/canna-3.7_p3-r2.ebuild | 13 +++----------
14 2 files changed, 11 insertions(+), 14 deletions(-)
15
16 diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
17 index 51effafc6b7..2d56ee7ccd6 100644
18 --- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
19 +++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
20 @@ -112,8 +112,12 @@ src_install() {
21
22 pkg_postinst() {
23 update-cannadic-dir
24 - elog
25 - elog "Canna dictionary format has been changed."
26 - elog "You should rebuild app-dict/canna-* after emerge."
27 - elog
28 +
29 + if ! locale -a | grep -iq "ja_JP.eucjp"; then
30 + elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
31 + elog
32 + elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
33 + elog "# locale-gen"
34 + elog
35 + fi
36 }
37
38 diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
39 index 0f222e9dac2..0a609c5c94e 100644
40 --- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
41 +++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
42 @@ -124,16 +124,9 @@ src_install() {
43
44 pkg_postinst() {
45 update-cannadic-dir
46 - elog
47 - elog "Canna dictionary format has been changed."
48 - elog "You should rebuild app-dict/canna-* after emerge."
49 - elog
50 -
51 - local localearchive="${ROOT}usr/$(get_libdir)/locale/locale-archive"
52 - if [ -f "${localearchive}" -a -x /usr/bin/localedef ] && \
53 - ! /usr/bin/localedef --list-archive "${localearchive}" | grep -i 'ja_JP.eucjp' >/dev/null 2>&1 ; then
54 - elog "Some dictionary tools in this package require ja_JP.eucJP locale."
55 - elog "Please add ja_JP.eucJP locale to /etc/locale.gen:"
56 +
57 + if ! locale -a | grep -iq "ja_JP.eucjp"; then
58 + elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
59 elog
60 elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
61 elog "# locale-gen"