1 |
commit: 564494be253c18be8838fa5f52a05a390793fdb3 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 31 13:58:39 2018 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 31 13:58:39 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564494be |
7 |
|
8 |
www-client/w3mmee: update to EAPI 6 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/601130 |
11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
12 |
|
13 |
www-client/w3mmee/metadata.xml | 8 +- |
14 |
www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild | 165 ++++++++++++++++++++++++++ |
15 |
www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild | 158 ------------------------ |
16 |
3 files changed, 169 insertions(+), 162 deletions(-) |
17 |
|
18 |
diff --git a/www-client/w3mmee/metadata.xml b/www-client/w3mmee/metadata.xml |
19 |
index c921b96adf6..6f2ca22da23 100644 |
20 |
--- a/www-client/w3mmee/metadata.xml |
21 |
+++ b/www-client/w3mmee/metadata.xml |
22 |
@@ -1,8 +1,8 @@ |
23 |
<?xml version="1.0" encoding="UTF-8"?> |
24 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
25 |
<pkgmetadata> |
26 |
-<maintainer type="project"> |
27 |
- <email>cjk@g.o</email> |
28 |
- <name>Cjk</name> |
29 |
-</maintainer> |
30 |
+ <maintainer type="project"> |
31 |
+ <email>cjk@g.o</email> |
32 |
+ <name>Cjk</name> |
33 |
+ </maintainer> |
34 |
</pkgmetadata> |
35 |
|
36 |
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild |
37 |
new file mode 100644 |
38 |
index 00000000000..f96eff96014 |
39 |
--- /dev/null |
40 |
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild |
41 |
@@ -0,0 +1,165 @@ |
42 |
+# Copyright 1999-2018 Gentoo Foundation |
43 |
+# Distributed under the terms of the GNU General Public License v2 |
44 |
+ |
45 |
+EAPI="6" |
46 |
+ |
47 |
+inherit alternatives multilib toolchain-funcs |
48 |
+ |
49 |
+MY_PV="${PV##*_}-22" |
50 |
+MY_P="${PN}-${MY_PV}" |
51 |
+ |
52 |
+DESCRIPTION="A variant of w3m with support for multiple character encodings" |
53 |
+HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/" |
54 |
+SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz" |
55 |
+ |
56 |
+SLOT="0" |
57 |
+LICENSE="public-domain" |
58 |
+KEYWORDS="~amd64 ~ppc ~x86" |
59 |
+IUSE="gpm imlib libressl nls ssl xface" |
60 |
+ |
61 |
+DEPEND=">=dev-libs/boehm-gc-7.2 |
62 |
+ dev-libs/libmoe |
63 |
+ dev-lang/perl |
64 |
+ sys-libs/ncurses:0= |
65 |
+ sys-libs/zlib |
66 |
+ imlib? ( |
67 |
+ media-libs/imlib |
68 |
+ xface? ( media-libs/compface ) |
69 |
+ ) |
70 |
+ gpm? ( sys-libs/gpm ) |
71 |
+ nls? ( sys-devel/gettext ) |
72 |
+ ssl? ( |
73 |
+ !libressl? ( dev-libs/openssl:0= ) |
74 |
+ libressl? ( dev-libs/libressl:0= ) |
75 |
+ )" |
76 |
+RDEPEND="${DEPEND}" |
77 |
+S="${WORKDIR}/${MY_P}" |
78 |
+ |
79 |
+PATCHES=( |
80 |
+ "${FILESDIR}"/${PN}-boehm-gc.patch |
81 |
+ "${FILESDIR}"/${PN}-gcc-4.4.patch |
82 |
+ "${FILESDIR}"/${PN}-gcc-4.5.patch |
83 |
+ "${FILESDIR}"/${PN}-glibc-2.14.patch |
84 |
+ "${FILESDIR}"/${PN}-tinfo.patch |
85 |
+ "${FILESDIR}"/${PN}-w3mman-gentoo.patch |
86 |
+) |
87 |
+DOCS=( ChangeLog NEWS{,.mee} README ) |
88 |
+HTML_DOCS=( 00INCOMPATIBLE.html ) |
89 |
+ |
90 |
+src_prepare() { |
91 |
+ default |
92 |
+ |
93 |
+ sed -i "/^AR=/s:ar:$(tc-getAR):" XMakefile |
94 |
+} |
95 |
+ |
96 |
+src_configure() { |
97 |
+ local myconf=( |
98 |
+ -locale_dir=$(usex nls "${EPREFIX}/usr/share/locale" '(NONE)' ) |
99 |
+ ) |
100 |
+ local myuse=( |
101 |
+ display_code=E |
102 |
+ system_code=E |
103 |
+ use_ansi_color=y |
104 |
+ use_cookie=y |
105 |
+ use_history=y |
106 |
+ use_mouse=$(usex gpm y n) |
107 |
+ ) |
108 |
+ |
109 |
+ if use ssl; then |
110 |
+ myconf+=( |
111 |
+ --ssl-includedir="${EPREFIX}/usr/include/openssl" |
112 |
+ --ssl-libdir="${EPREFIX}/usr/$(get_libdir)" |
113 |
+ ) |
114 |
+ myuse+=( |
115 |
+ use_digest_auth=y |
116 |
+ use_ssl=y |
117 |
+ use_ssl_verify=y |
118 |
+ ) |
119 |
+ else |
120 |
+ myuse+=( use_ssl=n ) |
121 |
+ fi |
122 |
+ if use imlib; then |
123 |
+ myuse+=( |
124 |
+ use_image=y |
125 |
+ use_w3mimg_fb=n |
126 |
+ use_w3mimg_x11=y |
127 |
+ use_xface=$(usex xface y n) |
128 |
+ w3mimgdisplay_setuid=n |
129 |
+ ) |
130 |
+ else |
131 |
+ myuse+=( use_image=n ) |
132 |
+ fi |
133 |
+ |
134 |
+ cat <<-EOF >> config.param |
135 |
+ lang=MANY |
136 |
+ accept_lang=en |
137 |
+ EOF |
138 |
+ |
139 |
+ env CC=$(tc-getCC) "${myuse[@]}" ./configure \ |
140 |
+ -nonstop \ |
141 |
+ -prefix="${EPREFIX}/usr" \ |
142 |
+ -suffix=mee \ |
143 |
+ -auxbindir="${EPREFIX}/usr/$(get_libdir)/${PN}" \ |
144 |
+ -libdir="${EPREFIX}/usr/$(get_libdir)/${PN}/cgi-bin" \ |
145 |
+ -helpdir="${EPREFIX}/usr/share/${PN}" \ |
146 |
+ -mandir="${EPREFIX}/usr/share/man" \ |
147 |
+ -sysconfdir="${EPREFIX}/etc/${PN}" \ |
148 |
+ -model=custom \ |
149 |
+ -libmoe="${EPREFIX}/usr/$(get_libdir)" \ |
150 |
+ -mb_h="${EPREFIX}/usr/include/moe" \ |
151 |
+ -mk_btri="${EPREFIX}/usr/libexec/moe" \ |
152 |
+ -cflags="${CFLAGS}" \ |
153 |
+ -ldflags="${LDFLAGS}" \ |
154 |
+ "${myconf[@]}" \ |
155 |
+ || die |
156 |
+} |
157 |
+ |
158 |
+src_install() { |
159 |
+ emake DESTDIR="${D}" install |
160 |
+ einstalldocs |
161 |
+ |
162 |
+ # w3mman and manpages conflict with those from w3m |
163 |
+ mv "${ED}"/usr/share/man/man1/w3m{,mee}.1 || die |
164 |
+ mv "${ED}"/usr/share/man/ja/man1/w3m{,mee}.1 || die |
165 |
+ |
166 |
+ docinto html/en |
167 |
+ dodoc doc/*.html |
168 |
+ rm -f doc/*.html |
169 |
+ docinto en |
170 |
+ dodoc doc/{HISTORY,README,keymap,menu}* |
171 |
+ |
172 |
+ docinto html/ja |
173 |
+ dodoc doc-jp/*.html |
174 |
+ rm -f doc-jp/*.html |
175 |
+ docinto ja |
176 |
+ dodoc doc-jp/{HISTORY,README,keymap,menu}* |
177 |
+} |
178 |
+ |
179 |
+pkg_postinst() { |
180 |
+ w3m_alternatives |
181 |
+ einfo |
182 |
+ einfo "If you want to render multilingual text, please refer to" |
183 |
+ einfo "/usr/share/doc/${PF}/en/README.mee or" |
184 |
+ einfo "/usr/share/doc/${PF}/jp/README.mee" |
185 |
+ einfo "and set W3MLANG variable respectively." |
186 |
+ einfo |
187 |
+} |
188 |
+ |
189 |
+pkg_postrm() { |
190 |
+ w3m_alternatives |
191 |
+} |
192 |
+ |
193 |
+w3m_alternatives() { |
194 |
+ if [[ ! -f /usr/bin/w3m ]]; then |
195 |
+ alternatives_makesym /usr/bin/w3m \ |
196 |
+ /usr/bin/w3m{m17n,mee} |
197 |
+ alternatives_makesym /usr/bin/w3mman \ |
198 |
+ /usr/bin/w3m{man-m17n,meeman} |
199 |
+ alternatives_makesym /usr/share/man/ja/man1/w3m.1.gz \ |
200 |
+ /usr/share/man/ja/man1/w3m{m17n,mee}.1.gz |
201 |
+ alternatives_makesym /usr/share/man/man1/w3m.1.gz \ |
202 |
+ /usr/share/man/man1/w3m{m17n,mee}.1.gz |
203 |
+ alternatives_makesym /usr/share/man/man1/w3mman.1.gz \ |
204 |
+ /usr/share/man/man1/w3m{man-m17n,meeman}.1.gz |
205 |
+ fi |
206 |
+} |
207 |
|
208 |
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild |
209 |
deleted file mode 100644 |
210 |
index 9aec0de8636..00000000000 |
211 |
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild |
212 |
+++ /dev/null |
213 |
@@ -1,158 +0,0 @@ |
214 |
-# Copyright 1999-2018 Gentoo Foundation |
215 |
-# Distributed under the terms of the GNU General Public License v2 |
216 |
- |
217 |
-EAPI="5" |
218 |
- |
219 |
-inherit alternatives eutils toolchain-funcs multilib |
220 |
- |
221 |
-IUSE="gpm imlib libressl nls ssl xface" |
222 |
- |
223 |
-MY_PV=${PV##*_}-22 |
224 |
-MY_P=${PN}-${MY_PV} |
225 |
- |
226 |
-DESCRIPTION="A variant of w3m with support for multiple character encodings" |
227 |
-SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz" |
228 |
-HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/" |
229 |
- |
230 |
-SLOT="0" |
231 |
-LICENSE="public-domain" |
232 |
-KEYWORDS="~amd64 ~ppc ~x86" |
233 |
- |
234 |
-DEPEND="sys-libs/ncurses:0= |
235 |
- >=sys-libs/zlib-1.1.3-r2 |
236 |
- >=dev-libs/boehm-gc-7.2 |
237 |
- dev-lang/perl |
238 |
- >=dev-libs/libmoe-1.5.3 |
239 |
- imlib? ( >=media-libs/imlib-1.9.8 |
240 |
- xface? ( media-libs/compface ) ) |
241 |
- gpm? ( >=sys-libs/gpm-1.19.3-r5 ) |
242 |
- nls? ( sys-devel/gettext ) |
243 |
- ssl? ( |
244 |
- !libressl? ( dev-libs/openssl:0= ) |
245 |
- libressl? ( dev-libs/libressl:0= ) |
246 |
- )" |
247 |
-RDEPEND="${DEPEND}" |
248 |
- |
249 |
-S=${WORKDIR}/${MY_P} |
250 |
- |
251 |
-src_prepare() { |
252 |
- epatch "${FILESDIR}"/${PN}-boehm-gc.patch |
253 |
- epatch "${FILESDIR}"/${PN}-gcc-4.4.patch |
254 |
- epatch "${FILESDIR}"/${PN}-gcc-4.5.patch |
255 |
- epatch "${FILESDIR}"/${PN}-glibc-2.14.patch |
256 |
- epatch "${FILESDIR}"/${PN}-tinfo.patch |
257 |
- epatch "${FILESDIR}"/${PN}-w3mman-gentoo.patch |
258 |
- sed -i "/^AR=/s:ar:$(tc-getAR):" XMakefile |
259 |
-} |
260 |
- |
261 |
-src_compile() { |
262 |
- |
263 |
- local myconf myuse |
264 |
- myuse="use_cookie=y use_ansi_color=y use_history=y |
265 |
- display_code=E system_code=E" |
266 |
- |
267 |
- if use ssl ; then |
268 |
- myconf="${myconf} --ssl-includedir=/usr/include/openssl |
269 |
- --ssl-libdir=/usr/$(get_libdir)" |
270 |
- myuse="${myuse} use_ssl=y use_ssl_verify=y use_digest_auth=y" |
271 |
- else |
272 |
- myuse="${myuse} use_ssl=n" |
273 |
- fi |
274 |
- |
275 |
- if use gpm ; then |
276 |
- myuse="${myuse} use_mouse=y" |
277 |
- else |
278 |
- myuse="${myuse} use_mouse=n" |
279 |
- fi |
280 |
- |
281 |
- if use nls ; then |
282 |
- myconf="${myconf} -locale_dir=/usr/share/locale" |
283 |
- else |
284 |
- myconf="${myconf} -locale_dir='(NONE)'" |
285 |
- fi |
286 |
- |
287 |
- if use imlib ; then |
288 |
- myuse="${myuse} use_image=y use_w3mimg_x11=y |
289 |
- use_w3mimg_fb=n w3mimgdisplay_setuid=n" |
290 |
- if use xface ; then |
291 |
- myuse="${myuse} use_xface=y" |
292 |
- else |
293 |
- myuse="${myuse} use_xface=n" |
294 |
- fi |
295 |
- else |
296 |
- myuse="${myuse} use_image=n" |
297 |
- fi |
298 |
- |
299 |
- cat >>config.param<<-EOF |
300 |
- lang=MANY |
301 |
- accept_lang=en |
302 |
- EOF |
303 |
- |
304 |
- env CC=$(tc-getCC) ${myuse} ./configure -nonstop \ |
305 |
- -prefix=/usr \ |
306 |
- -suffix=mee \ |
307 |
- -auxbindir=/usr/$(get_libdir)/w3mmee \ |
308 |
- -libdir=/usr/$(get_libdir)/w3mmee/cgi-bin \ |
309 |
- -helpdir=/usr/share/w3mmee \ |
310 |
- -mandir=/usr/share/man \ |
311 |
- -sysconfdir=/etc/w3mmee \ |
312 |
- -model=custom \ |
313 |
- -libmoe=/usr/$(get_libdir) \ |
314 |
- -mb_h=/usr/include/moe \ |
315 |
- -mk_btri=/usr/libexec/moe \ |
316 |
- -cflags="${CFLAGS}" -ldflags="${LDFLAGS}" \ |
317 |
- ${myconf} || die |
318 |
- |
319 |
- emake || die "emake failed" |
320 |
-} |
321 |
- |
322 |
-src_install() { |
323 |
- make DESTDIR="${D}" install || die |
324 |
- |
325 |
- # w3mman and manpages conflict with those from w3m |
326 |
- mv "${D}"/usr/share/man/ja/man1/w3m{,mee}.1 || die |
327 |
- mv "${D}"/usr/share/man/man1/w3m{,mee}.1 || die |
328 |
- |
329 |
- dodoc ChangeLog NEWS* README |
330 |
- dohtml 00INCOMPATIBLE.html |
331 |
- |
332 |
- docinto en |
333 |
- dodoc doc/HISTORY doc/README* doc/keymap.* doc/menu.* |
334 |
- dohtml doc/* |
335 |
- |
336 |
- docinto jp |
337 |
- dodoc doc-jp/HISTORY doc-jp/README* doc-jp/keymap* doc-jp/menu.* |
338 |
- dohtml doc-jp/* |
339 |
-} |
340 |
- |
341 |
-pkg_postinst() { |
342 |
- |
343 |
- w3m_alternatives |
344 |
- einfo |
345 |
- einfo "If you want to render multilingual text, please refer to" |
346 |
- einfo "/usr/share/doc/${PF}/en/README.mee or" |
347 |
- einfo "/usr/share/doc/${PF}/jp/README.mee" |
348 |
- einfo "and set W3MLANG variable respectively." |
349 |
- einfo |
350 |
-} |
351 |
- |
352 |
-pkg_postrm() { |
353 |
- |
354 |
- w3m_alternatives |
355 |
-} |
356 |
- |
357 |
-w3m_alternatives() { |
358 |
- |
359 |
- if [ ! -f /usr/bin/w3m ] ; then |
360 |
- alternatives_makesym /usr/bin/w3m \ |
361 |
- /usr/bin/w3m{m17n,mee} |
362 |
- alternatives_makesym /usr/bin/w3mman \ |
363 |
- /usr/bin/w3m{man-m17n,meeman} |
364 |
- alternatives_makesym /usr/share/man/ja/man1/w3m.1.gz \ |
365 |
- /usr/share/man/ja/man1/w3m{m17n,mee}.1.gz |
366 |
- alternatives_makesym /usr/share/man/man1/w3m.1.gz \ |
367 |
- /usr/share/man/man1/w3m{m17n,mee}.1.gz |
368 |
- alternatives_makesym /usr/share/man/man1/w3mman.1.gz \ |
369 |
- /usr/share/man/man1/w3m{man-m17n,meeman}.1.gz |
370 |
- fi |
371 |
-} |