Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/, profiles/base/, app-i18n/anthy/
Date: Sat, 17 Jul 2021 11:26:46
Message-Id: 1626521107.e74a25b9076f92e07b2a80357bb6f2185751dbe2.soap@gentoo
1 commit: e74a25b9076f92e07b2a80357bb6f2185751dbe2
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 17 11:25:07 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 17 11:25:07 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e74a25b9
7
8 app-i18n/anthy: Remove references to app-dicts/canna-2ch
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 ...anthy-9100h-r2.ebuild => anthy-9100h-r3.ebuild} | 25 ++++++----------------
13 app-i18n/anthy/metadata.xml | 3 ---
14 profiles/arch/arm/package.use.mask | 1 -
15 profiles/base/use.mask | 1 -
16 4 files changed, 6 insertions(+), 24 deletions(-)
17
18 diff --git a/app-i18n/anthy/anthy-9100h-r2.ebuild b/app-i18n/anthy/anthy-9100h-r3.ebuild
19 similarity index 63%
20 rename from app-i18n/anthy/anthy-9100h-r2.ebuild
21 rename to app-i18n/anthy/anthy-9100h-r3.ebuild
22 index bfd867fdc12..0a4beeca472 100644
23 --- a/app-i18n/anthy/anthy-9100h-r2.ebuild
24 +++ b/app-i18n/anthy/anthy-9100h-r3.ebuild
25 @@ -1,7 +1,7 @@
26 -# Copyright 2003-2020 Gentoo Authors
27 +# Copyright 2003-2021 Gentoo Authors
28 # Distributed under the terms of the GNU General Public License v2
29
30 -EAPI="7"
31 +EAPI=7
32
33 inherit elisp-common
34
35 @@ -12,30 +12,17 @@ SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz"
36 LICENSE="GPL-2 LGPL-2.1"
37 SLOT="0"
38 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
39 -IUSE="canna-2ch emacs static-libs"
40 +IUSE="emacs static-libs"
41
42 -BDEPEND="canna-2ch? ( app-dicts/canna-2ch )
43 - emacs? ( >=app-editors/emacs-23.1:* )"
44 +BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
45 DEPEND=""
46 RDEPEND="${BDEPEND}"
47
48 -PATCHES=(
49 - "${FILESDIR}/${PN}-anthy_context_t.patch"
50 -)
51 -
52 -DOCS=(AUTHORS ChangeLog DIARY NEWS README)
53 +PATCHES=( "${FILESDIR}/${PN}-anthy_context_t.patch" )
54 +DOCS=( AUTHORS ChangeLog DIARY NEWS README )
55
56 SITEFILE="50${PN}-gentoo.el"
57
58 -src_prepare() {
59 - default
60 -
61 - if use canna-2ch; then
62 - einfo "Adding nichan.ctd to anthy.dic"
63 - sed -e "/set_input_encoding eucjp/aread ${EPREFIX}/var/lib/canna/dic/canna/nichan.ctd" -i mkworddic/dict.args.in || die
64 - fi
65 -}
66 -
67 src_configure() {
68 econf \
69 $(use_enable static-libs static) \
70
71 diff --git a/app-i18n/anthy/metadata.xml b/app-i18n/anthy/metadata.xml
72 index 7b0ba62c9e0..794feb3174c 100644
73 --- a/app-i18n/anthy/metadata.xml
74 +++ b/app-i18n/anthy/metadata.xml
75 @@ -15,9 +15,6 @@
76 and <pkg>app-editors/emacs</pkg> (to enable Anthy support for emacs, build
77 this package with emacs USE flag).
78 </longdescription>
79 - <use>
80 - <flag name="canna-2ch">Enable support for <pkg>app-dicts/canna-2ch</pkg></flag>
81 - </use>
82 <upstream>
83 <remote-id type="sourceforge-jp">anthy</remote-id>
84 </upstream>
85
86 diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
87 index 626aeb873c6..5646312f480 100644
88 --- a/profiles/arch/arm/package.use.mask
89 +++ b/profiles/arch/arm/package.use.mask
90 @@ -349,7 +349,6 @@ net-vpn/strongswan strongswan_plugins_unbound
91
92 # Benda Xu <heroxbd@g.o> (2015-01-03)
93 # not tested
94 -app-i18n/anthy canna-2ch
95 app-i18n/scim-anthy kasumi
96
97 # Markus Meier <maekke@g.o> (2014-11-29)
98
99 diff --git a/profiles/base/use.mask b/profiles/base/use.mask
100 index ac54fe933f1..b1101daaaaf 100644
101 --- a/profiles/base/use.mask
102 +++ b/profiles/base/use.mask
103 @@ -22,7 +22,6 @@ postgres_targets_postgres9_5
104 # Abandoned upstream, last release 17 years ago, unmaintained, tons of
105 # QA bugs, eclass is terrible. Bug #796878, removal in 30 days.
106 canna
107 -canna-2ch
108
109 # Brian Evans <grknight@g.o> (2021-01-07)
110 # PHP 7.2 is security vulnerable and end-of-life