Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/anthy/
Date: Sun, 29 Sep 2019 02:56:47
Message-Id: 1569725772.4df9624aac252b98996826438e0615e86686b80e.floppym@gentoo
1 commit: 4df9624aac252b98996826438e0615e86686b80e
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Sat Sep 28 01:54:59 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 29 02:56:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df9624a
7
8 app-i18n/anthy: Use EAPI="7".
9
10 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 app-i18n/anthy/anthy-9100h-r2.ebuild | 32 ++++++++++++++++++--------------
14 1 file changed, 18 insertions(+), 14 deletions(-)
15
16 diff --git a/app-i18n/anthy/anthy-9100h-r2.ebuild b/app-i18n/anthy/anthy-9100h-r2.ebuild
17 index 45d7ba0deb5..2ae79f831a7 100644
18 --- a/app-i18n/anthy/anthy-9100h-r2.ebuild
19 +++ b/app-i18n/anthy/anthy-9100h-r2.ebuild
20 @@ -1,9 +1,9 @@
21 -# Copyright 1999-2017 Gentoo Foundation
22 +# Copyright 2003-2019 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 -EAPI="6"
26 +EAPI="7"
27
28 -inherit elisp-common ltprune
29 +inherit elisp-common
30
31 DESCRIPTION="Anthy -- free and secure Japanese input system"
32 HOMEPAGE="http://anthy.osdn.jp/"
33 @@ -14,12 +14,16 @@ SLOT="0"
34 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
35 IUSE="canna-2ch emacs static-libs"
36
37 -RDEPEND="canna-2ch? ( app-dicts/canna-2ch )
38 +BDEPEND="canna-2ch? ( app-dicts/canna-2ch )
39 emacs? ( virtual/emacs )"
40 -DEPEND="${RDEPEND}"
41 +DEPEND=""
42 +RDEPEND="${BDEPEND}"
43
44 -PATCHES=( "${FILESDIR}"/${PN}-anthy_context_t.patch )
45 -DOCS=( AUTHORS ChangeLog DIARY NEWS README )
46 +PATCHES=(
47 + "${FILESDIR}/${PN}-anthy_context_t.patch"
48 +)
49 +
50 +DOCS=(AUTHORS ChangeLog DIARY NEWS README)
51
52 SITEFILE="50${PN}-gentoo.el"
53
54 @@ -27,27 +31,27 @@ src_prepare() {
55 default
56
57 if use canna-2ch; then
58 - einfo "Adding nichan.ctd to anthy.dic."
59 - sed -i "/set_input_encoding eucjp/aread ${EPREFIX}/var/lib/canna/dic/canna/nichan.ctd" mkworddic/dict.args.in
60 + einfo "Adding nichan.ctd to anthy.dic"
61 + sed -e "/set_input_encoding eucjp/aread ${EPREFIX}/var/lib/canna/dic/canna/nichan.ctd" -i mkworddic/dict.args.in || die
62 fi
63 }
64
65 src_configure() {
66 econf \
67 $(use_enable static-libs static) \
68 - EMACS=$(usex emacs "${EMACS}")
69 + EMACS="$(usex emacs "${EMACS}")"
70 }
71
72 src_install() {
73 default
74 - prune_libtool_files
75 + find "${D}" -name "*.la" -type f -delete || die
76 +
77 + rm doc/Makefile* || die
78 + dodoc -r doc
79
80 if use emacs; then
81 elisp-site-file-install "${FILESDIR}"/${SITEFILE}
82 fi
83 -
84 - rm -f doc/Makefile*
85 - dodoc -r doc
86 }
87
88 pkg_postinst() {