1 |
commit: 9ea8f97ee8e8f3f42e95e1e526c312096b52cdf6 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 8 07:56:05 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 8 07:56:05 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea8f97e |
7 |
|
8 |
app-i18n/canna: update to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
app-i18n/canna/canna-3.7_p3-r1.ebuild | 99 +++++++++++----------------- |
13 |
app-i18n/canna/canna-3.7_p3-r2.ebuild | 121 +++++++++++++++++----------------- |
14 |
app-i18n/canna/metadata.xml | 14 ++-- |
15 |
3 files changed, 107 insertions(+), 127 deletions(-) |
16 |
|
17 |
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild |
18 |
index 2dac49233f0..d6727b9c284 100644 |
19 |
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild |
20 |
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild |
21 |
@@ -1,10 +1,11 @@ |
22 |
# Copyright 1999-2017 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
-inherit cannadic eutils multilib |
26 |
+EAPI="6" |
27 |
|
28 |
-MY_P="Canna${PV//./}" |
29 |
-MY_P="${MY_P/_/}" |
30 |
+inherit cannadic toolchain-funcs |
31 |
+ |
32 |
+MY_P="Canna${PV//[._]/}" |
33 |
|
34 |
DESCRIPTION="A client-server based Kana-Kanji conversion system" |
35 |
HOMEPAGE="http://canna.osdn.jp/" |
36 |
@@ -15,90 +16,70 @@ SLOT="0" |
37 |
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" |
38 |
IUSE="" |
39 |
|
40 |
-DEPEND=">=sys-apps/sed-4 |
41 |
- x11-misc/gccmakedep |
42 |
+DEPEND="x11-misc/gccmakedep |
43 |
x11-misc/imake" |
44 |
RDEPEND="" |
45 |
S="${WORKDIR}/${MY_P}" |
46 |
|
47 |
-src_unpack() { |
48 |
- unpack ${A} |
49 |
- cd "${S}" |
50 |
+PATCHES=( |
51 |
+ "${FILESDIR}"/${PN}-gentoo.patch |
52 |
+ "${FILESDIR}"/${PN}-kpdef.patch |
53 |
+ "${FILESDIR}"/${PN}-posix-sort.patch |
54 |
+) |
55 |
+DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*" |
56 |
|
57 |
- epatch "${FILESDIR}"/${PN}-gentoo.patch \ |
58 |
- "${FILESDIR}"/${PN}-kpdef.patch \ |
59 |
- "${FILESDIR}"/${PN}-posix-sort.patch |
60 |
+src_prepare() { |
61 |
+ default |
62 |
|
63 |
find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die |
64 |
|
65 |
# Multilib-strict fix for amd64 |
66 |
- sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die |
67 |
+ sed -i "/DefLibCannaDir/s:/lib$:/$(get_libdir):" Canna.conf |
68 |
} |
69 |
|
70 |
-src_compile() { |
71 |
- xmkmf || die |
72 |
+src_configure() { |
73 |
+ xmkmf -a || die |
74 |
+} |
75 |
|
76 |
- #make libCannaDir=../lib/canna canna || die |
77 |
+src_compile() { |
78 |
# bug #279706 |
79 |
- emake -j1 CDEBUGFLAGS="${CFLAGS}" canna || die |
80 |
- |
81 |
- #if use doc ; then |
82 |
- # einfo "Compiling DVI, PS (and PDF) document" |
83 |
- # cd doc/man/guide/tex |
84 |
- # xmkmf || die |
85 |
- # emake -j1 JLATEXCMD=platex \ |
86 |
- # DVI2PSCMD="dvips -f" \ |
87 |
- # canna.dvi canna.ps || die |
88 |
- # if has_version 'app-text/dvipdfmx' && \ |
89 |
- # ( has_version 'app-text/acroread' \ |
90 |
- # || has_version 'app-text/xpdf-japanese' ); then |
91 |
- # emake -j1 JLATEXCMD=platex \ |
92 |
- # DVI2PSCMD="dvips -f" \ |
93 |
- # canna.pdf || die |
94 |
- # fi |
95 |
- #fi |
96 |
+ emake -j1 \ |
97 |
+ CC="$(tc-getCC)" \ |
98 |
+ CDEBUGFLAGS="${CFLAGS}" \ |
99 |
+ LOCAL_LDFLAGS="${LDFLAGS}" \ |
100 |
+ SHLIBGLOBALSFLAGS="${LDFLAGS}" \ |
101 |
+ ${PN} |
102 |
} |
103 |
|
104 |
src_install() { |
105 |
- emake DESTDIR="${D}" install || die |
106 |
- emake DESTDIR="${D}" install.man || die |
107 |
- |
108 |
- # install default.canna (removed from Canna36p4) |
109 |
- insinto /usr/share/canna |
110 |
- newins misc/initfiles/verbose.canna default.canna |
111 |
+ emake DESTDIR="${D}" install install.man |
112 |
+ einstalldocs |
113 |
|
114 |
- # cannakill should link to /usr/bin/catdic |
115 |
- dosym ../bin/catdic /usr/sbin/cannakill |
116 |
- |
117 |
- dodir /usr/share/man/man8 /usr/share/man/ja/man8 |
118 |
+ dodir /usr/share/man{,/ja}/man8 |
119 |
+ local man mandir |
120 |
for man in cannaserver cannakill ; do |
121 |
for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do |
122 |
mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8 |
123 |
done |
124 |
done |
125 |
|
126 |
- dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS* |
127 |
+ # for backward compatibility |
128 |
+ dosbin "${FILESDIR}"/update-canna-dics_dir |
129 |
|
130 |
- #if use doc ; then |
131 |
- # insinto /usr/share/doc/${PF} |
132 |
- # doins doc/man/guide/tex/canna.{dvi,ps,pdf} |
133 |
- #fi |
134 |
+ keepdir /var/lib/${PN}/dic/{user,group} |
135 |
+ fowners bin:bin /var/lib/${PN}/dic/{user,group} |
136 |
+ fperms 0775 /var/lib/${PN}/dic/{user,group} |
137 |
|
138 |
- newinitd "${FILESDIR}"/${PN}.initd canna || die |
139 |
- newconfd "${FILESDIR}"/${PN}.confd canna || die |
140 |
- insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die |
141 |
- keepdir /var/log/canna/ || die |
142 |
+ insinto /var/lib/${PN}/dic/dics.d |
143 |
+ newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir |
144 |
|
145 |
- # for backward compatibility |
146 |
- dosbin "${FILESDIR}"/update-canna-dics_dir |
147 |
+ keepdir /var/log/${PN} |
148 |
|
149 |
- insinto /var/lib/canna/dic/dics.d/ |
150 |
- newins "${D}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir |
151 |
+ newconfd "${FILESDIR}"/${PN}.confd ${PN} |
152 |
+ newinitd "${FILESDIR}"/${PN}.initd ${PN} |
153 |
|
154 |
- # fix permission for user dictionary |
155 |
- keepdir /var/lib/canna/dic/{user,group} |
156 |
- fowners root:bin /var/lib/canna/dic/{user,group} |
157 |
- fperms 775 /var/lib/canna/dic/{user,group} |
158 |
+ insinto /etc |
159 |
+ newins "${FILESDIR}"/${PN}.hosts hosts.${PN} |
160 |
} |
161 |
|
162 |
pkg_postinst() { |
163 |
|
164 |
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild |
165 |
index 6511e2168c8..2a51c4b0815 100644 |
166 |
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild |
167 |
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild |
168 |
@@ -1,10 +1,11 @@ |
169 |
# Copyright 1999-2017 Gentoo Foundation |
170 |
# Distributed under the terms of the GNU General Public License v2 |
171 |
|
172 |
-inherit cannadic eutils multilib |
173 |
+EAPI="6" |
174 |
|
175 |
-MY_P="Canna${PV//./}" |
176 |
-MY_P="${MY_P/_/}" |
177 |
+inherit cannadic toolchain-funcs |
178 |
+ |
179 |
+MY_P="Canna${PV//[._]/}" |
180 |
|
181 |
DESCRIPTION="A client-server based Kana-Kanji conversion system" |
182 |
HOMEPAGE="http://canna.osdn.jp/" |
183 |
@@ -15,8 +16,7 @@ SLOT="0" |
184 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
185 |
IUSE="doc" |
186 |
|
187 |
-DEPEND=">=sys-apps/sed-4 |
188 |
- x11-misc/gccmakedep |
189 |
+DEPEND="x11-misc/gccmakedep |
190 |
x11-misc/imake |
191 |
doc? ( |
192 |
app-text/ghostscript-gpl |
193 |
@@ -28,89 +28,88 @@ DEPEND=">=sys-apps/sed-4 |
194 |
RDEPEND="" |
195 |
S="${WORKDIR}/${MY_P}" |
196 |
|
197 |
-src_unpack() { |
198 |
- unpack ${A} |
199 |
- cd "${S}" |
200 |
+PATCHES=( |
201 |
+ "${FILESDIR}"/${PN}-gentoo.patch |
202 |
+ "${FILESDIR}"/${PN}-kpdef.patch |
203 |
+ "${FILESDIR}"/${PN}-posix-sort.patch |
204 |
+) |
205 |
+DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*" |
206 |
|
207 |
- epatch "${FILESDIR}"/${PN}-gentoo.patch \ |
208 |
- "${FILESDIR}"/${PN}-kpdef.patch \ |
209 |
- "${FILESDIR}"/${PN}-posix-sort.patch |
210 |
+src_prepare() { |
211 |
+ default |
212 |
|
213 |
find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die |
214 |
|
215 |
# Multilib-strict fix for amd64 |
216 |
- sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die |
217 |
+ sed -i "/DefLibCannaDir/s:/lib$:/$(get_libdir):" Canna.conf |
218 |
} |
219 |
|
220 |
-src_compile() { |
221 |
- xmkmf || die |
222 |
- |
223 |
- #make libCannaDir=../lib/canna canna || die |
224 |
- # bug #279706 |
225 |
- emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \ |
226 |
- LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" canna || die |
227 |
+src_configure() { |
228 |
+ xmkmf -a || die |
229 |
|
230 |
- if use doc ; then |
231 |
- einfo "Compiling DVI, PS (and PDF) document" |
232 |
+ if use doc; then |
233 |
cd doc/man/guide/tex |
234 |
- xmkmf || die |
235 |
- emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \ |
236 |
- LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \ |
237 |
- JLATEXCMD=platex \ |
238 |
- DVI2PSCMD="dvips -f" VARTEXFONTS="${T}"/fonts \ |
239 |
- canna.dvi canna.ps || die |
240 |
- if has_version 'app-text/dvipdfmx' && \ |
241 |
- ( has_version 'app-text/acroread' \ |
242 |
- || has_version 'app-text/xpdf-japanese' ); then |
243 |
- emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \ |
244 |
- LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \ |
245 |
- JLATEXCMD=platex \ |
246 |
- DVI2PSCMD="dvips -f" VARTEXFONTS="${T}"/fonts \ |
247 |
- canna.pdf || die |
248 |
- fi |
249 |
+ xmkmf -a || die |
250 |
+ cd - > /dev/null |
251 |
fi |
252 |
} |
253 |
|
254 |
-src_install() { |
255 |
- emake DESTDIR="${D}" install || die |
256 |
- emake DESTDIR="${D}" install.man || die |
257 |
- |
258 |
- # install default.canna (removed from Canna36p4) |
259 |
- insinto /usr/share/canna |
260 |
- newins misc/initfiles/verbose.canna default.canna |
261 |
+src_compile() { |
262 |
+ # bug #279706 |
263 |
+ emake -j1 \ |
264 |
+ CC="$(tc-getCC)" \ |
265 |
+ CDEBUGFLAGS="${CFLAGS}" \ |
266 |
+ LOCAL_LDFLAGS="${LDFLAGS}" \ |
267 |
+ SHLIBGLOBALSFLAGS="${LDFLAGS}" \ |
268 |
+ ${PN} |
269 |
+ |
270 |
+ if use doc; then |
271 |
+ # NOTE: build fails if infinality enabled in fontconfig |
272 |
+ einfo "Compiling DVI, PS, and PDF documents" |
273 |
+ # bug #223077 |
274 |
+ emake -C doc/man/guide/tex -j1 \ |
275 |
+ JLATEXCMD="platex -kanji=euc" \ |
276 |
+ DVI2PSCMD="dvips" \ |
277 |
+ VARTEXFONTS="${T}"/fonts \ |
278 |
+ ${PN}.ps \ |
279 |
+ ${PN}.pdf |
280 |
+ fi |
281 |
+} |
282 |
|
283 |
- # cannakill should link to /usr/bin/catdic |
284 |
- dosym ../bin/catdic /usr/sbin/cannakill |
285 |
+src_install() { |
286 |
+ emake DESTDIR="${D}" install install.man |
287 |
+ einstalldocs |
288 |
|
289 |
- dodir /usr/share/man/man8 /usr/share/man/ja/man8 |
290 |
+ dodir /usr/share/man{,/ja}/man8 |
291 |
+ local man mandir |
292 |
for man in cannaserver cannakill ; do |
293 |
for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do |
294 |
mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8 |
295 |
done |
296 |
done |
297 |
|
298 |
- dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS* |
299 |
- |
300 |
- if use doc ; then |
301 |
+ if use doc; then |
302 |
insinto /usr/share/doc/${PF} |
303 |
- doins doc/man/guide/tex/canna.{dvi,ps,pdf} |
304 |
+ doins doc/man/guide/tex/${PN}.{dvi,ps,pdf} |
305 |
fi |
306 |
|
307 |
- newinitd "${FILESDIR}"/${PN}.initd canna || die |
308 |
- newconfd "${FILESDIR}"/${PN}.confd canna || die |
309 |
- insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die |
310 |
- keepdir /var/log/canna/ || die |
311 |
- |
312 |
# for backward compatibility |
313 |
dosbin "${FILESDIR}"/update-canna-dics_dir |
314 |
|
315 |
- insinto /var/lib/canna/dic/dics.d/ |
316 |
- newins "${D}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir |
317 |
+ keepdir /var/lib/${PN}/dic/{user,group} |
318 |
+ fowners bin:bin /var/lib/${PN}/dic/{user,group} |
319 |
+ fperms 0775 /var/lib/${PN}/dic/{user,group} |
320 |
+ |
321 |
+ insinto /var/lib/${PN}/dic/dics.d |
322 |
+ newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir |
323 |
+ |
324 |
+ keepdir /var/log/${PN} |
325 |
+ |
326 |
+ newconfd "${FILESDIR}"/${PN}.confd ${PN} |
327 |
+ newinitd "${FILESDIR}"/${PN}.initd ${PN} |
328 |
|
329 |
- # fix permission for user dictionary |
330 |
- keepdir /var/lib/canna/dic/{user,group} |
331 |
- fowners root:bin /var/lib/canna/dic/{user,group} |
332 |
- fperms 775 /var/lib/canna/dic/{user,group} |
333 |
+ insinto /etc |
334 |
+ newins "${FILESDIR}"/${PN}.hosts hosts.${PN} |
335 |
} |
336 |
|
337 |
pkg_postinst() { |
338 |
|
339 |
diff --git a/app-i18n/canna/metadata.xml b/app-i18n/canna/metadata.xml |
340 |
index 87548929aea..68869af5812 100644 |
341 |
--- a/app-i18n/canna/metadata.xml |
342 |
+++ b/app-i18n/canna/metadata.xml |
343 |
@@ -1,11 +1,11 @@ |
344 |
<?xml version="1.0" encoding="UTF-8"?> |
345 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
346 |
<pkgmetadata> |
347 |
- <maintainer type="project"> |
348 |
- <email>cjk@g.o</email> |
349 |
- <name>Cjk</name> |
350 |
- </maintainer> |
351 |
- <upstream> |
352 |
- <remote-id type="sourceforge-jp">canna</remote-id> |
353 |
- </upstream> |
354 |
+ <maintainer type="project"> |
355 |
+ <email>cjk@g.o</email> |
356 |
+ <name>Cjk</name> |
357 |
+ </maintainer> |
358 |
+ <upstream> |
359 |
+ <remote-id type="sourceforge-jp">canna</remote-id> |
360 |
+ </upstream> |
361 |
</pkgmetadata> |