[gentoo-commits] repo/gentoo:master commit in: app-i18n/anthy/files/, app-i18n/anthy/

[gentoo-commits] repo/gentoo:master commit in: app-i18n/anthy/files/, app-i18n/anthy/

[Akinori Hattori]

commit:     3f9f1b3a0745bab3887e86c8a8dae2b6c7b70d91
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 14:46:37 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 14:50:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f9f1b3a

app-i18n/anthy: inherit ltprune

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/anthy/anthy-9100h-r2.ebuild   | 24 ++++++++++--------------
 app-i18n/anthy/files/50anthy-gentoo.el |  3 ---
 app-i18n/anthy/metadata.xml            | 12 ++++++------
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/app-i18n/anthy/anthy-9100h-r2.ebuild b/app-i18n/anthy/anthy-9100h-r2.ebuild
index c3788f57ab5..1d96fbfc15c 100644
--- a/app-i18n/anthy/anthy-9100h-r2.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit elisp-common
+inherit elisp-common ltprune
 
 DESCRIPTION="Anthy -- free and secure Japanese input system"
 HOMEPAGE="http://anthy.osdn.jp/"
@@ -18,40 +18,36 @@ RDEPEND="canna-2ch? ( app-dicts/canna-2ch )
 	emacs? ( virtual/emacs )"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-anthy_context_t.patch" )
-DOCS=( AUTHORS DIARY NEWS README ChangeLog )
+PATCHES=( "${FILESDIR}"/${P}-anthy_context_t.patch )
+DOCS=( AUTHORS ChangeLog DIARY NEWS README )
+
+SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
 	default
 
 	if use canna-2ch; then
 		einfo "Adding nichan.ctd to anthy.dic."
-		sed -i \
-			-e "/set_input_encoding eucjp/aread ${EPREFIX}/var/lib/canna/dic/canna/nichan.ctd" \
-			mkworddic/dict.args.in || die
+		sed -i "/set_input_encoding eucjp/aread ${EPREFIX}/var/lib/canna/dic/canna/nichan.ctd" mkworddic/dict.args.in
 	fi
 }
 
 src_configure() {
-	local myconf
-
-	use emacs || myconf="EMACS=no"
-
 	econf \
 		$(use_enable static-libs static) \
-		${myconf}
+		EMACS=$(usex emacs "${EMACS}")
 }
 
 src_install() {
 	default
+	prune_libtool_files
 
 	if use emacs; then
-		elisp-site-file-install "${FILESDIR}"/50anthy-gentoo.el || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
 	rm -f doc/Makefile*
-	docinto doc
-	dodoc doc/*
+	dodoc -r doc
 }
 
 pkg_postinst() {

diff --git a/app-i18n/anthy/files/50anthy-gentoo.el b/app-i18n/anthy/files/50anthy-gentoo.el
index a166df14653..ab154f8d4ef 100644
--- a/app-i18n/anthy/files/50anthy-gentoo.el
+++ b/app-i18n/anthy/files/50anthy-gentoo.el
@@ -1,5 +1,2 @@
-
-;;; anthy site-lisp configuration
-
 (set-language-info "Japanese" 'input-method "japanese-anthy")
 

diff --git a/app-i18n/anthy/metadata.xml b/app-i18n/anthy/metadata.xml
index 4d598476e9e..0b8350b78af 100644
--- a/app-i18n/anthy/metadata.xml
+++ b/app-i18n/anthy/metadata.xml
@@ -9,12 +9,12 @@
     <name>Cjk</name>
   </maintainer>
   <longdescription>
-  Anthy is a free and secure Japanese kana-kanji server.  This ebuild includes
-  cannadic as a server-side dictionary, so you don't need any extra package to
-  run it.  You can use anthy with <pkg>app-i18n/uim</pkg> (XIM, GTK+ immodule)
-  and <pkg>virtual/emacs</pkg> (to enable Anthy support for emacs, build this
-  package with emacs USE flag).
-</longdescription>
+    Anthy is a free and secure Japanese kana-kanji server.  This ebuild includes
+    cannadic as a server-side dictionary, so you don't need any extra package to
+    run it.  You can use anthy with <pkg>app-i18n/uim</pkg> (XIM, GTK+ immodule)
+    and <pkg>virtual/emacs</pkg> (to enable Anthy support for emacs, build this
+    package with emacs USE flag).
+  </longdescription>
   <use>
     <flag name="canna-2ch">Enable support for <pkg>app-dicts/canna-2ch</pkg></flag>
   </use>