1 |
commit: 8cef23d172c3714c629a31b8aff53ea016b20e55 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 1 13:08:57 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 1 13:08:57 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cef23d1 |
7 |
|
8 |
app-i18n/ibus-anthy: update to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
app-i18n/ibus-anthy/Manifest | 1 - |
13 |
app-i18n/ibus-anthy/ibus-anthy-1.5.4.ebuild | 45 ++++++++++++----------------- |
14 |
app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild | 28 ++++++++++-------- |
15 |
app-i18n/ibus-anthy/metadata.xml | 26 +++++++++-------- |
16 |
4 files changed, 49 insertions(+), 51 deletions(-) |
17 |
|
18 |
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest |
19 |
index 65bd6f14fda..c9314cd67bf 100644 |
20 |
--- a/app-i18n/ibus-anthy/Manifest |
21 |
+++ b/app-i18n/ibus-anthy/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST anthy.i 3170 SHA256 3615639f5cd9bf2adcbc2bac8d3ae968646df1d9d2ba987d80442d5ad99ecdf9 SHA512 400d67c2f0ffbdb3eab241646922d549ec4a42ae5b33714a91b864f4b5dfdf0d9a0d28cb6dcdffa55eb9633651ceae034bb547d7a5c41d9b8d352e955773e069 WHIRLPOOL 9be409df613530658c68bc7491e1dd258f5f1ef1d09895a3557a9e63c3ced5083c1ecd9e274536c9afbc98031c353c05c73304bb4354aaf8e21a1c15de39b8b6 |
24 |
DIST ibus-anthy-1.5.4.tar.gz 592595 SHA256 4c0a8b88a2c547e72173a7d682d82797f6c65fe712abe5f3b89495d4eec7b031 SHA512 8478e9ea14472d0153cc7a35feae4edea791476dc98cfc266b598f915376d267bd5db48ea0a676209d7a6fa680628116a30fec59afaf696477cfaa14082aad8d WHIRLPOOL f4aec300dc5cff62f81a3ae64ac2d46768e3fbaa579e14abac8bd87e0801155e8258f6f3d66d7015122e929cd2e0f48183aeb37245b3046afa3d80b8ce42d58c |
25 |
DIST ibus-anthy-1.5.9.tar.gz 765672 SHA256 ddf0c52ef769c79cf04ceea8860b4bec54d681b7537db39730e6d67c06721af9 SHA512 2f57db784ddbd4ea57afba245dc532fe4ee8c9fea5fc7df9b3ca26600816ef4c0626b4ebdbbd976826c391890216af587863707caa26c3926a6278cc6b720ef6 WHIRLPOOL 990b15bad9ed2089f7ee6a4b807dabf9001f184a935aeec40ce12f2fa0b9449c55b087444873684b7be2c41ef13f0faa5035913e458707c716df89a7762f2075 |
26 |
|
27 |
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.4.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.4.ebuild |
28 |
index 2676374983b..6d49cad2552 100644 |
29 |
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.4.ebuild |
30 |
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.4.ebuild |
31 |
@@ -1,14 +1,14 @@ |
32 |
# Copyright 1999-2017 Gentoo Foundation |
33 |
# Distributed under the terms of the GNU General Public License v2 |
34 |
|
35 |
-EAPI=5 |
36 |
+EAPI="6" |
37 |
PYTHON_COMPAT=( python2_7 ) |
38 |
-inherit eutils python-single-r1 autotools gnome2-utils |
39 |
|
40 |
-DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework" |
41 |
+inherit gnome2-utils ltprune python-single-r1 |
42 |
+ |
43 |
+DESCRIPTION="Japanese Anthy engine for IBus" |
44 |
HOMEPAGE="https://github.com/ibus/ibus/wiki" |
45 |
-SRC_URI="https://ibus.googlecode.com/files/${P}.tar.gz |
46 |
- https://raw.github.com/ibus/ibus-anthy/${PV}/engine/anthy.i" |
47 |
+SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz" |
48 |
|
49 |
LICENSE="GPL-2" |
50 |
SLOT="0" |
51 |
@@ -17,34 +17,27 @@ IUSE="deprecated nls" |
52 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
53 |
|
54 |
RDEPEND="${PYTHON_DEPS} |
55 |
- >=app-i18n/ibus-1.5.0 |
56 |
app-i18n/anthy |
57 |
- deprecated? ( >=dev-python/pygtk-2.15.2 ) |
58 |
+ app-i18n/ibus[python(+),${PYTHON_USEDEP}] |
59 |
+ deprecated? ( dev-python/pygtk ) |
60 |
nls? ( virtual/libintl )" |
61 |
DEPEND="${RDEPEND} |
62 |
- dev-libs/gobject-introspection |
63 |
dev-util/intltool |
64 |
virtual/pkgconfig |
65 |
deprecated? ( dev-lang/swig ) |
66 |
- nls? ( >=sys-devel/gettext-0.16.1 )" |
67 |
- |
68 |
-src_prepare() { |
69 |
- >py-compile #397497 |
70 |
- cp "${DISTDIR}"/anthy.i "${S}"/engine # deal with packaging bug |
71 |
-} |
72 |
+ nls? ( sys-devel/gettext )" |
73 |
|
74 |
src_configure() { |
75 |
- econf --enable-private-png \ |
76 |
+ econf \ |
77 |
$(use_enable deprecated pygtk2-anthy) \ |
78 |
- $(use_enable nls) |
79 |
+ $(use_enable nls) \ |
80 |
+ --enable-private-png \ |
81 |
+ --with-layout=default |
82 |
} |
83 |
|
84 |
src_install() { |
85 |
- emake DESTDIR="${D}" install |
86 |
- |
87 |
- dodoc AUTHORS ChangeLog NEWS README |
88 |
- |
89 |
- find "${ED}" -name '*.la' -type f -delete || die |
90 |
+ default |
91 |
+ prune_libtool_files --modules |
92 |
|
93 |
python_optimize |
94 |
} |
95 |
@@ -54,11 +47,11 @@ pkg_preinst() { |
96 |
} |
97 |
|
98 |
pkg_postinst() { |
99 |
- elog |
100 |
- elog "app-dicts/kasumi is not required but probably useful for you." |
101 |
- elog |
102 |
- elog "# emerge app-dicts/kasumi" |
103 |
- elog |
104 |
+ gnome2_icon_cache_update |
105 |
+ |
106 |
+ if ! has_version app-dicts/kasumi; then |
107 |
+ elog "app-dicts/kasumi is not required but probably useful for you." |
108 |
+ fi |
109 |
} |
110 |
|
111 |
pkg_postrm() { |
112 |
|
113 |
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild |
114 |
index 8eedc823baf..b9ed07ae1ce 100644 |
115 |
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild |
116 |
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild |
117 |
@@ -1,15 +1,14 @@ |
118 |
# Copyright 1999-2017 Gentoo Foundation |
119 |
# Distributed under the terms of the GNU General Public License v2 |
120 |
|
121 |
-EAPI=6 |
122 |
- |
123 |
+EAPI="6" |
124 |
PYTHON_COMPAT=( python2_7 ) |
125 |
|
126 |
-inherit gnome2-utils python-single-r1 |
127 |
+inherit gnome2-utils ltprune python-single-r1 |
128 |
|
129 |
-DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework" |
130 |
+DESCRIPTION="Japanese Anthy engine for IBus" |
131 |
HOMEPAGE="https://github.com/ibus/ibus/wiki" |
132 |
-SRC_URI="https://github.com/ibus/ibus-anthy/releases/download/${PV}/${P}.tar.gz" |
133 |
+SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz" |
134 |
|
135 |
LICENSE="GPL-2" |
136 |
SLOT="0" |
137 |
@@ -19,24 +18,26 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
138 |
|
139 |
RDEPEND="${PYTHON_DEPS} |
140 |
app-i18n/anthy |
141 |
- app-i18n/ibus[introspection] |
142 |
- nls? ( virtual/libintl:0= )" |
143 |
- |
144 |
+ app-i18n/ibus[python(+),${PYTHON_USEDEP}] |
145 |
+ nls? ( virtual/libintl )" |
146 |
DEPEND="${RDEPEND} |
147 |
- dev-libs/gobject-introspection |
148 |
dev-util/intltool |
149 |
virtual/pkgconfig |
150 |
nls? ( sys-devel/gettext )" |
151 |
|
152 |
src_configure() { |
153 |
econf \ |
154 |
+ $(use_enable nls) \ |
155 |
--enable-private-png \ |
156 |
- $(use_enable nls) |
157 |
+ --with-layout=default \ |
158 |
+ --with-python=${EPYTHON} |
159 |
} |
160 |
|
161 |
src_install() { |
162 |
default |
163 |
- find "${ED}" -name '*.la' -type f -delete || die |
164 |
+ prune_libtool_files --modules |
165 |
+ |
166 |
+ python_optimize |
167 |
} |
168 |
|
169 |
pkg_preinst() { |
170 |
@@ -44,8 +45,11 @@ pkg_preinst() { |
171 |
} |
172 |
|
173 |
pkg_postinst() { |
174 |
- elog "app-dicts/kasumi is not required but probably useful for you." |
175 |
gnome2_icon_cache_update |
176 |
+ |
177 |
+ if ! has_version app-dicts/kasumi; then |
178 |
+ elog "app-dicts/kasumi is not required but probably useful for you." |
179 |
+ fi |
180 |
} |
181 |
|
182 |
pkg_postrm() { |
183 |
|
184 |
diff --git a/app-i18n/ibus-anthy/metadata.xml b/app-i18n/ibus-anthy/metadata.xml |
185 |
index 0ae1c4a28ec..9cf1079f1ff 100644 |
186 |
--- a/app-i18n/ibus-anthy/metadata.xml |
187 |
+++ b/app-i18n/ibus-anthy/metadata.xml |
188 |
@@ -1,16 +1,18 @@ |
189 |
<?xml version="1.0" encoding="UTF-8"?> |
190 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
191 |
<pkgmetadata> |
192 |
- <maintainer type="project"> |
193 |
- <email>cjk@g.o</email> |
194 |
- <name>Cjk</name> |
195 |
- </maintainer> |
196 |
- <longdescription lang="en">The Anthy engine for IBus platform. It provides Japanese input method from |
197 |
-libanthy.</longdescription> |
198 |
- <upstream> |
199 |
- <remote-id type="github">ibus/ibus</remote-id> |
200 |
- </upstream> |
201 |
- <use> |
202 |
- <flag name="deprecated">Install deprecated pygtk2 library</flag> |
203 |
- </use> |
204 |
+ <maintainer type="project"> |
205 |
+ <email>cjk@g.o</email> |
206 |
+ <name>Cjk</name> |
207 |
+ </maintainer> |
208 |
+ <longdescription lang="en"> |
209 |
+ The Anthy engine for IBus. It provides Japanese input method from |
210 |
+ <pkg>app-i18n/anthy</pkg>. |
211 |
+ </longdescription> |
212 |
+ <upstream> |
213 |
+ <remote-id type="github">ibus/ibus-anthy</remote-id> |
214 |
+ </upstream> |
215 |
+ <use> |
216 |
+ <flag name="deprecated">Install deprecated pygtk2 library</flag> |
217 |
+ </use> |
218 |
</pkgmetadata> |