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/mozc/
Date: Sat, 20 Apr 2019 23:25:23
Message-Id: 1555691946.f255bdc22ea3380091702991bd3cf58eb87c5186.floppym@gentoo
1 commit: f255bdc22ea3380091702991bd3cf58eb87c5186
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Thu Apr 18 17:29:33 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 19 16:39:06 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f255bdc2
7
8 app-i18n/mozc: 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/mozc/mozc-2.23.2815.102.ebuild | 24 ++++++++++++++++--------
14 app-i18n/mozc/mozc-9999.ebuild | 24 ++++++++++++++++--------
15 2 files changed, 32 insertions(+), 16 deletions(-)
16
17 diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
18 index 73baeb4cc28..21a1291f1ea 100644
19 --- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
20 +++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
21 @@ -1,7 +1,7 @@
22 -# Copyright 1999-2018 Gentoo Foundation
23 +# Copyright 2010-2019 Arfrever Frehtes Taifersar Arahesis and others
24 # Distributed under the terms of the GNU General Public License v2
25
26 -EAPI="6"
27 +EAPI="7"
28 PYTHON_COMPAT=(python2_7)
29
30 inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
31 @@ -38,9 +38,19 @@ KEYWORDS="amd64 ~ppc64 x86"
32 IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
33 REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
34
35 +BDEPEND="${PYTHON_DEPS}
36 + >=dev-libs/protobuf-3.0.0
37 + dev-util/gyp
38 + dev-util/ninja
39 + virtual/pkgconfig
40 + emacs? ( virtual/emacs )
41 + fcitx4? ( sys-devel/gettext )"
42 RDEPEND=">=dev-libs/protobuf-3.0.0:=
43 emacs? ( virtual/emacs )
44 - fcitx4? ( app-i18n/fcitx:4 )
45 + fcitx4? (
46 + app-i18n/fcitx:4
47 + virtual/libintl
48 + )
49 gui? (
50 app-i18n/zinnia
51 dev-qt/qtcore:5
52 @@ -61,10 +71,6 @@ RDEPEND=">=dev-libs/protobuf-3.0.0:=
53 x11-libs/pango
54 )"
55 DEPEND="${RDEPEND}
56 - ${PYTHON_DEPS}
57 - dev-util/gyp
58 - dev-util/ninja
59 - virtual/pkgconfig
60 test? (
61 >=dev-cpp/gtest-1.8.0
62 dev-libs/jsoncpp
63 @@ -319,5 +325,7 @@ pkg_postinst() {
64 }
65
66 pkg_postrm() {
67 - use emacs && elisp-site-regen
68 + if use emacs; then
69 + elisp-site-regen
70 + fi
71 }
72
73 diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
74 index b51359f01fb..7876d9ed378 100644
75 --- a/app-i18n/mozc/mozc-9999.ebuild
76 +++ b/app-i18n/mozc/mozc-9999.ebuild
77 @@ -1,7 +1,7 @@
78 -# Copyright 1999-2018 Gentoo Foundation
79 +# Copyright 2010-2019 Arfrever Frehtes Taifersar Arahesis and others
80 # Distributed under the terms of the GNU General Public License v2
81
82 -EAPI="6"
83 +EAPI="7"
84 PYTHON_COMPAT=(python2_7)
85
86 inherit elisp-common multiprocessing python-any-r1 toolchain-funcs
87 @@ -38,9 +38,19 @@ KEYWORDS=""
88 IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
89 REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
90
91 +BDEPEND="${PYTHON_DEPS}
92 + >=dev-libs/protobuf-3.0.0
93 + dev-util/gyp
94 + dev-util/ninja
95 + virtual/pkgconfig
96 + emacs? ( virtual/emacs )
97 + fcitx4? ( sys-devel/gettext )"
98 RDEPEND=">=dev-libs/protobuf-3.0.0:=
99 emacs? ( virtual/emacs )
100 - fcitx4? ( app-i18n/fcitx:4 )
101 + fcitx4? (
102 + app-i18n/fcitx:4
103 + virtual/libintl
104 + )
105 gui? (
106 app-i18n/zinnia
107 dev-qt/qtcore:5
108 @@ -61,10 +71,6 @@ RDEPEND=">=dev-libs/protobuf-3.0.0:=
109 x11-libs/pango
110 )"
111 DEPEND="${RDEPEND}
112 - ${PYTHON_DEPS}
113 - dev-util/gyp
114 - dev-util/ninja
115 - virtual/pkgconfig
116 test? (
117 >=dev-cpp/gtest-1.8.0
118 dev-libs/jsoncpp
119 @@ -318,5 +324,7 @@ pkg_postinst() {
120 }
121
122 pkg_postrm() {
123 - use emacs && elisp-site-regen
124 + if use emacs; then
125 + elisp-site-regen
126 + fi
127 }