Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/w3m/, www-client/w3m/files/
Date: Wed, 01 Dec 2021 21:15:32
Message-Id: 1638393314.ae57dc3bd78431deca548815c07dc6e231ee336a.sam@gentoo
1 commit: ae57dc3bd78431deca548815c07dc6e231ee336a
2 Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
3 AuthorDate: Sat Nov 20 22:30:54 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 1 21:15:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae57dc3b
7
8 www-client/w3m: drop older ebuilds
9
10 As latest one becomes stable I'm gonna drop olders.
11 This also remove the EAPI 6 warning for 2018 version.
12
13 Package-Manager: Portage-3.0.28, Repoman-3.0.3
14 Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
15 Closes: https://github.com/gentoo/gentoo/pull/23014
16 Signed-off-by: Sam James <sam <AT> gentoo.org>
17
18 www-client/w3m/Manifest | 2 -
19 www-client/w3m/files/w3m-img-fb.patch | 10 ---
20 www-client/w3m/w3m-0.5.3_p20180125.ebuild | 129 ------------------------------
21 www-client/w3m/w3m-0.5.3_p20190105.ebuild | 127 -----------------------------
22 4 files changed, 268 deletions(-)
23
24 diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
25 index 0f12153d81dd..5a4035f86651 100644
26 --- a/www-client/w3m/Manifest
27 +++ b/www-client/w3m/Manifest
28 @@ -1,3 +1 @@
29 -DIST w3m-0.5.3+git20180125.tar.gz 2181743 BLAKE2B d0766fa215be971ba280e4933ee9521ac4b7806f77ced5be4de58a5e28fa478e29a9102d101174f8d216cb982827b347c0fbcbfc494068d1cb8e443e73df7228 SHA512 61b8498b927569937c509460e291eeba6eb302d34ccd6e1bf4d1eb07ac73a3ac5a477161727d310324625be04b907f8c3e970382d08c9fa0846b371699f04e14
30 -DIST w3m-0.5.3+git20190105.tar.gz 2183651 BLAKE2B 624fe3b8c1daa2a6d4ce21e051ee363a29114bdb64e0e0d9864b8098f2a12bcb27e293fa3dfa4dc1dff691fa40046f4878b7d39c321f591d3689d00e3ed42bad SHA512 b63b15d0bea82f50bcaa9fc0826c2d3c265a3ad73069b4a020812f28b552cdf08618ab877280c9f3a43bd64f51b80b7a526098e6395ea121c0981a3fcd2562b4
31 DIST w3m-0.5.3+git20210102.tar.gz 2189272 BLAKE2B f82c13c26b1c83cda90655abdcf30422e257a5c2e48c32d5636a70f895078d11a95fc6ce623fa94624bb2a1125b71e7654d872dfb91fd86c4290278de3cf88f8 SHA512 357eeecf0f63bfd5174c9670533882323879657bdecefd0758d853ca645e368331bfdf91e99c0917f19829e184ce892ecdc99bd865851707d93baccfb4b97632
32
33 diff --git a/www-client/w3m/files/w3m-img-fb.patch b/www-client/w3m/files/w3m-img-fb.patch
34 deleted file mode 100644
35 index 677d89d3bcd1..000000000000
36 --- a/www-client/w3m/files/w3m-img-fb.patch
37 +++ /dev/null
38 @@ -1,10 +0,0 @@
39 ---- a/w3mimg/fb/fb_imlib2.c
40 -+++ b/w3mimg/fb/fb_imlib2.c
41 -@@ -3,7 +3,6 @@
42 - fb_imlib2.c 0.3 Copyright (C) 2002, hito
43 - **************************************************************************/
44 -
45 --#include <X11/Xlib.h>
46 - #include <Imlib2.h>
47 - #include "fb.h"
48 - #include "fb_img.h"
49
50 diff --git a/www-client/w3m/w3m-0.5.3_p20180125.ebuild b/www-client/w3m/w3m-0.5.3_p20180125.ebuild
51 deleted file mode 100644
52 index 8803120d72f6..000000000000
53 --- a/www-client/w3m/w3m-0.5.3_p20180125.ebuild
54 +++ /dev/null
55 @@ -1,129 +0,0 @@
56 -# Copyright 1999-2021 Gentoo Authors
57 -# Distributed under the terms of the GNU General Public License v2
58 -
59 -EAPI="6"
60 -
61 -inherit autotools prefix toolchain-funcs vcs-snapshot
62 -
63 -MY_P="${P/_p/+git}"
64 -MY_PV="${PV/_p/+git}"
65 -
66 -DESCRIPTION="Text based WWW browser, supports tables and frames"
67 -HOMEPAGE="https://github.com/tats/w3m"
68 -SRC_URI="https://github.com/tats/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
69 -
70 -LICENSE="w3m"
71 -SLOT="0"
72 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
73 -IUSE="X fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja lynxkeymap nls nntp ssl unicode xface"
74 -REQUIRED_USE="X? ( ?? ( gdk-pixbuf imlib ) )
75 - fbcon? ( ?? ( gdk-pixbuf imlib ) )"
76 -
77 -RDEPEND="dev-libs/boehm-gc:=
78 - sys-libs/ncurses:0=
79 - sys-libs/zlib
80 - X? (
81 - x11-libs/libXdmcp
82 - x11-libs/libXext
83 - )
84 - gdk-pixbuf? (
85 - x11-libs/gdk-pixbuf
86 - X? ( x11-libs/gdk-pixbuf-xlib )
87 - )
88 - !gdk-pixbuf? (
89 - imlib? ( media-libs/imlib2[X?] )
90 - )
91 - gpm? ( sys-libs/gpm )
92 - ssl? (
93 - dev-libs/openssl:0=
94 - )
95 - xface? ( media-libs/compface )"
96 -DEPEND="${RDEPEND}
97 - virtual/pkgconfig"
98 -S="${WORKDIR}/${MY_P}"
99 -
100 -PATCHES=( "${FILESDIR}/${PN}-img-fb.patch" )
101 -
102 -src_prepare() {
103 - default
104 - sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in
105 - hprefixify acinclude.m4
106 - eautoconf
107 -}
108 -
109 -src_configure() {
110 - local myconf=()
111 - local image imagelib
112 -
113 - if use gdk-pixbuf; then
114 - imagelib="gtk2"
115 - elif use imlib; then
116 - imagelib="imlib2"
117 - fi
118 - if [[ -n "${imagelib}" ]]; then
119 - use X && image="${image}${image:+,}x11"
120 - use fbcon && image="${image}${image:+,}fb"
121 - fi
122 - # emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
123 - # so we better enable or disable both. Default to enable
124 - # m17n and unicode, see bug #47046.
125 - if use l10n_ja; then
126 - myconf+=( --enable-japanese=$(usex unicode U E) )
127 - else
128 - myconf+=( --with-charset=$(usex unicode UTF-8 US-ASCII) )
129 - fi
130 - # lynxkeymap IUSE flag. bug #49397
131 - myconf+=( --enable-keymap=$(usex lynxkeymap lynx ${PN}) )
132 -
133 - econf \
134 - $(use_enable gpm mouse) \
135 - $(use_enable nls) \
136 - $(use_enable nntp) \
137 - $(use_enable ssl digest-auth) \
138 - $(use_enable xface) \
139 - $(use_with ssl) \
140 - --enable-image=${image:-no} \
141 - --enable-m17n \
142 - --enable-unicode \
143 - --with-browser="${EPREFIX}/usr/bin/xdg-open" \
144 - --with-editor="${EPREFIX}/usr/bin/vi" \
145 - --with-imagelib="${imagelib:-no}" \
146 - --with-mailer="${EPREFIX}/bin/mail" \
147 - --without-migemo \
148 - --with-termlib=yes \
149 - "${myconf[@]}"
150 -}
151 -
152 -src_install() {
153 - default
154 -
155 - # http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
156 - insinto /etc/${PN}
157 - newins "${FILESDIR}"/${PN}.mailcap mailcap
158 -
159 - insinto /usr/share/${PN}/Bonus
160 - doins Bonus/{*.{cgi,rb},html*,makeref}
161 -
162 - docinto en
163 - dodoc doc/{HISTORY,README,keymap,menu}*
164 - newdoc Bonus/README.eng README.Bonus
165 - docinto html/en
166 - dodoc doc/*.html
167 - if use l10n_de; then
168 - docinto de
169 - dodoc doc-de/README*
170 - docinto html/de
171 - dodoc doc-de/*.html
172 - else
173 - rm -rf "${ED}"/usr/share/man/de
174 - fi
175 - if use l10n_ja; then
176 - docinto ja
177 - dodoc doc-jp/{HISTORY,README,keymap,menu}*
178 - newdoc Bonus/README README.Bonus
179 - docinto html/ja
180 - dodoc doc-jp/*.html
181 - else
182 - rm -rf "${ED}"/usr/share/man/ja
183 - fi
184 -}
185
186 diff --git a/www-client/w3m/w3m-0.5.3_p20190105.ebuild b/www-client/w3m/w3m-0.5.3_p20190105.ebuild
187 deleted file mode 100644
188 index a77ac32f05e8..000000000000
189 --- a/www-client/w3m/w3m-0.5.3_p20190105.ebuild
190 +++ /dev/null
191 @@ -1,127 +0,0 @@
192 -# Copyright 1999-2021 Gentoo Authors
193 -# Distributed under the terms of the GNU General Public License v2
194 -
195 -EAPI="6"
196 -
197 -inherit autotools prefix toolchain-funcs vcs-snapshot
198 -
199 -MY_P="${P/_p/+git}"
200 -MY_PV="${PV/_p/+git}"
201 -
202 -DESCRIPTION="Text based WWW browser, supports tables and frames"
203 -HOMEPAGE="https://github.com/tats/w3m"
204 -SRC_URI="https://github.com/tats/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
205 -
206 -LICENSE="w3m"
207 -SLOT="0"
208 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
209 -IUSE="X fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja lynxkeymap nls nntp ssl unicode xface"
210 -REQUIRED_USE="X? ( ?? ( gdk-pixbuf imlib ) )
211 - fbcon? ( ?? ( gdk-pixbuf imlib ) )"
212 -
213 -RDEPEND="dev-libs/boehm-gc:=
214 - sys-libs/ncurses:0=
215 - sys-libs/zlib
216 - X? (
217 - x11-libs/libXdmcp
218 - x11-libs/libXext
219 - )
220 - gdk-pixbuf? (
221 - x11-libs/gdk-pixbuf
222 - X? ( x11-libs/gdk-pixbuf-xlib )
223 - )
224 - !gdk-pixbuf? (
225 - imlib? ( media-libs/imlib2[X?] )
226 - )
227 - gpm? ( sys-libs/gpm )
228 - ssl? (
229 - dev-libs/openssl:0=
230 - )
231 - xface? ( media-libs/compface )"
232 -DEPEND="${RDEPEND}
233 - virtual/pkgconfig"
234 -S="${WORKDIR}/${MY_P}"
235 -
236 -src_prepare() {
237 - default
238 - sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in
239 - hprefixify acinclude.m4
240 - eautoconf
241 -}
242 -
243 -src_configure() {
244 - local myconf=()
245 - local image imagelib
246 -
247 - if use gdk-pixbuf; then
248 - imagelib="gtk2"
249 - elif use imlib; then
250 - imagelib="imlib2"
251 - fi
252 - if [[ -n "${imagelib}" ]]; then
253 - use X && image="${image}${image:+,}x11"
254 - use fbcon && image="${image}${image:+,}fb"
255 - fi
256 - # emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
257 - # so we better enable or disable both. Default to enable
258 - # m17n and unicode, see bug #47046.
259 - if use l10n_ja; then
260 - myconf+=( --enable-japanese=$(usex unicode U E) )
261 - else
262 - myconf+=( --with-charset=$(usex unicode UTF-8 US-ASCII) )
263 - fi
264 - # lynxkeymap IUSE flag. bug #49397
265 - myconf+=( --enable-keymap=$(usex lynxkeymap lynx ${PN}) )
266 -
267 - econf \
268 - $(use_enable gpm mouse) \
269 - $(use_enable nls) \
270 - $(use_enable nntp) \
271 - $(use_enable ssl digest-auth) \
272 - $(use_enable xface) \
273 - $(use_with ssl) \
274 - --enable-image=${image:-no} \
275 - --enable-m17n \
276 - --enable-unicode \
277 - --with-browser="${EPREFIX}/usr/bin/xdg-open" \
278 - --with-editor="${EPREFIX}/usr/bin/vi" \
279 - --with-imagelib="${imagelib:-no}" \
280 - --with-mailer="${EPREFIX}/bin/mail" \
281 - --without-migemo \
282 - --with-termlib=yes \
283 - "${myconf[@]}"
284 -}
285 -
286 -src_install() {
287 - default
288 -
289 - # http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200307.month/3944.html
290 - insinto /etc/${PN}
291 - newins "${FILESDIR}"/${PN}.mailcap mailcap
292 -
293 - insinto /usr/share/${PN}/Bonus
294 - doins Bonus/{*.{cgi,rb},html*,makeref}
295 -
296 - docinto en
297 - dodoc doc/{HISTORY,README,keymap,menu}*
298 - newdoc Bonus/README.eng README.Bonus
299 - docinto html/en
300 - dodoc doc/*.html
301 - if use l10n_de; then
302 - docinto de
303 - dodoc doc-de/README*
304 - docinto html/de
305 - dodoc doc-de/*.html
306 - else
307 - rm -rf "${ED}"/usr/share/man/de
308 - fi
309 - if use l10n_ja; then
310 - docinto ja
311 - dodoc doc-jp/{HISTORY,README,keymap,menu}*
312 - newdoc Bonus/README README.Bonus
313 - docinto html/ja
314 - dodoc doc-jp/*.html
315 - else
316 - rm -rf "${ED}"/usr/share/man/ja
317 - fi
318 -}