commit: 6a4f353f033ae652c443132d2296035d9cc2702f
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 8 06:58:33 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul 8 06:58:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a4f353f
app-i18n/canna: update pkg_postinst
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r1.ebuild | 12 ++++++++----
app-i18n/canna/canna-3.7_p3-r2.ebuild | 13 +++----------
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild
b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 51effafc6b7..2d56ee7ccd6 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -112,8 +112,12 @@ src_install() {
pkg_postinst() {
update-cannadic-dir
- elog
- elog "Canna dictionary format has been changed."
- elog "You should rebuild app-dict/canna-* after emerge."
- elog
+
+ if ! locale -a | grep -iq "ja_JP.eucjp"; then
+ elog "Some dictionary tools in this package require
ja_JP.EUC-JP locale."
+ elog
+ elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
+ elog "# locale-gen"
+ elog
+ fi
}
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild
b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 0f222e9dac2..0a609c5c94e 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -124,16 +124,9 @@ src_install() {
pkg_postinst() {
update-cannadic-dir
- elog
- elog "Canna dictionary format has been changed."
- elog "You should rebuild app-dict/canna-* after emerge."
- elog
-
- local localearchive="${ROOT}usr/$(get_libdir)/locale/locale-archive"
- if [ -f "${localearchive}" -a -x /usr/bin/localedef ] && \
- ! /usr/bin/localedef --list-archive "${localearchive}" | grep
-i 'ja_JP.eucjp' >/dev/null 2>&1 ; then
- elog "Some dictionary tools in this package require ja_JP.eucJP
locale."
- elog "Please add ja_JP.eucJP locale to /etc/locale.gen:"
+
+ if ! locale -a | grep -iq "ja_JP.eucjp"; then
+ elog "Some dictionary tools in this package require
ja_JP.EUC-JP locale."
elog
elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
elog "# locale-gen"
