From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51825139083 for ; Sat, 8 Jul 2017 06:59:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 694CF274037; Sat, 8 Jul 2017 06:59:03 +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 4AB45274037 for ; Sat, 8 Jul 2017 06:59:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F8253419EB for ; Sat, 8 Jul 2017 06:59:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D084A7490 for ; Sat, 8 Jul 2017 06:59:00 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1499497113.6a4f353f033ae652c443132d2296035d9cc2702f.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/canna/canna-3.7_p3-r1.ebuild app-i18n/canna/canna-3.7_p3-r2.ebuild X-VCS-Directories: app-i18n/canna/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 6a4f353f033ae652c443132d2296035d9cc2702f X-VCS-Branch: master Date: Sat, 8 Jul 2017 06:59:00 +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: 887533e7-c187-42fc-9496-770cd168e240 X-Archives-Hash: 1ab15bd7f889e9e0deeb54c432612611 commit: 6a4f353f033ae652c443132d2296035d9cc2702f Author: Akinori Hattori gentoo org> AuthorDate: Sat Jul 8 06:58:33 2017 +0000 Commit: Akinori Hattori gentoo 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"