Gentoo Archives: gentoo-commits

From: Eray Aslan <eras@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/, net-mail/mailutils/files/
Date: Thu, 19 May 2022 16:35:45
Message-Id: 1652978093.a25b0e4e4143608bc86450b5db990cf3c4254ae1.eras@gentoo
1 commit: a25b0e4e4143608bc86450b5db990cf3c4254ae1
2 Author: Eray Aslan <eras <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 19 16:34:53 2022 +0000
4 Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
5 CommitDate: Thu May 19 16:34:53 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a25b0e4e
7
8 net-mail/mailutils: drop 3.12-r4, 3.13-r1
9
10 Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
11
12 net-mail/mailutils/Manifest | 2 -
13 .../files/mailutils-3.12-disable_escapes.patch | 24 ----
14 .../files/mailutils-3.12-fix-big-endians.patch | 26 ----
15 .../files/mailutils-3.12-misssing-endif.patch | 23 ----
16 net-mail/mailutils/mailutils-3.12-r4.ebuild | 144 ---------------------
17 net-mail/mailutils/mailutils-3.13-r1.ebuild | 141 --------------------
18 6 files changed, 360 deletions(-)
19
20 diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
21 index 4d73c53e3cd2..3d9fb2486140 100644
22 --- a/net-mail/mailutils/Manifest
23 +++ b/net-mail/mailutils/Manifest
24 @@ -1,4 +1,2 @@
25 -DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2
26 -DIST mailutils-3.13.tar.xz 3152892 BLAKE2B cd7d9ce0391d85482581eeb52f60fcc175647d21e433a4dacee3547aa4dcd710331ad780b6706c242d1a7501ec7fc50ff0c25f9b5f4ceeed84893c637ca366c1 SHA512 fd0b23aa535c6446af1ae633d68d41d1aa243d489b2623d346f6a0d6b543c43ab6c2b9bb1449d664abacbcd3ec3a0a5e7a0a5d56d2762e8a961544c77ccc592a
27 DIST mailutils-3.14.tar.xz 3215944 BLAKE2B 64965c177065eacab9f5545fbeacd538492995f808dab731d02acbe7d63161f3bfb1528a0ca71e30c32ba12edc7e4f68642f2e5154b66d3bb48c479cae95c754 SHA512 9797deb8901d03a231c3503d75a758fbfb1220d1e064dd8be74735e6c88aa04c94533e802a60fdfbe12f1bd7daec4a39249cd957b103f09b89df364bd9a8869d
28 DIST mailutils-3.15.tar.xz 3112212 BLAKE2B 78101178c101897bc75897a1e134796150fafccd7e8f4b603c82698dd0cd27a98dd1ed7837a87be4760e8bdb39ec7275023a8e2847f832e683b8e97e5e95d75d SHA512 b6b90ad4f71c83e500a9b176694f5fb51a99baf26e52d567d222d6f037a23a0814ac84f88762cbfb4f22382c0e662191af89fb74a8a287134b8fffa58086bdd8
29
30 diff --git a/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch b/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch
31 deleted file mode 100644
32 index 073d1b671219..000000000000
33 --- a/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch
34 +++ /dev/null
35 @@ -1,24 +0,0 @@
36 -From 4befcfd015256c568121653038accbd84820198f Mon Sep 17 00:00:00 2001
37 -From: Sergey Poznyakoff <gray@×××.org>
38 -Date: Mon, 19 Jul 2021 11:27:40 +0300
39 -Subject: mail: disable compose escapes in non-interctive mode.
40 -
41 -diff --git a/mail/send.c b/mail/send.c
42 -index 1bdfe1134..098374dab 100644
43 ---- a/mail/send.c
44 -+++ b/mail/send.c
45 -@@ -1324,8 +1324,9 @@ mail_compose_send (compose_env_t *env, int save_to)
46 -
47 - if (strcmp (buf, ".") == 0 && mailvar_is_true (mailvar_name_dot))
48 - done = 1;
49 -- else if (mailvar_get (&escape, mailvar_name_escape,
50 -- mailvar_type_string, 0) == 0
51 -+ else if (interactive
52 -+ && mailvar_get (&escape, mailvar_name_escape,
53 -+ mailvar_type_string, 0) == 0
54 - && buf[0] == escape[0])
55 - {
56 - if (buf[1] == buf[0])
57 ---
58 -cgit v1.2.1
59 -
60
61 diff --git a/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch b/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch
62 deleted file mode 100644
63 index 5dd2f8f035d1..000000000000
64 --- a/net-mail/mailutils/files/mailutils-3.12-fix-big-endians.patch
65 +++ /dev/null
66 @@ -1,26 +0,0 @@
67 -From c0af3be2fcee73c1a61f58572ecef1ef3f385015 Mon Sep 17 00:00:00 2001
68 -From: Sergey Poznyakoff <gray@×××.org>
69 -Date: Thu, 15 Apr 2021 08:37:29 +0300
70 -Subject: Bugfix in mimeview testsuite
71 -
72 -* mimeview/tests/bf.c (write_byte): Fix type of the character buffer.
73 ----
74 - mimeview/tests/bf.c | 2 +-
75 - 1 file changed, 1 insertion(+), 1 deletion(-)
76 -
77 -diff --git a/mimeview/tests/bf.c b/mimeview/tests/bf.c
78 -index 6ccce848c..2e6b37e4a 100644
79 ---- a/mimeview/tests/bf.c
80 -+++ b/mimeview/tests/bf.c
81 -@@ -68,7 +68,7 @@ write_string (FILE *fp, char *arg)
82 - int
83 - write_byte (FILE *fp, char *arg)
84 - {
85 -- int c;
86 -+ char c;
87 - if (strlen (arg) == 3
88 - && (arg[0] == '\'' || arg[0] == '"'))
89 - c = arg[1];
90 ---
91 -cgit v1.2.1
92 -
93
94 diff --git a/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch b/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch
95 deleted file mode 100644
96 index 12d03af7b337..000000000000
97 --- a/net-mail/mailutils/files/mailutils-3.12-misssing-endif.patch
98 +++ /dev/null
99 @@ -1,23 +0,0 @@
100 -From 4cc284cfb38306989694a7828e880f0cf6d0c4e0 Mon Sep 17 00:00:00 2001
101 -From: Sergey Poznyakoff <gray@×××.org>
102 -Date: Thu, 15 Apr 2021 08:36:56 +0300
103 -Subject: Minor fix
104 -
105 -* include/mailutils/sys/streamtrans.h: Add missing #endif
106 ----
107 - include/mailutils/sys/streamtrans.h | 2 ++
108 - 1 file changed, 2 insertions(+)
109 -
110 -diff --git a/include/mailutils/sys/streamtrans.h b/include/mailutils/sys/streamtrans.h
111 -index 8a4727cee..c9c866013 100644
112 ---- a/include/mailutils/sys/streamtrans.h
113 -+++ b/include/mailutils/sys/streamtrans.h
114 -@@ -25,3 +25,5 @@ struct _mu_streamtrans
115 - struct _mu_stream base; /* Superclass */
116 - mu_stream_t transport; /* Transport stream */
117 - };
118 -+
119 -+#endif
120 ---
121 -cgit v1.2.1
122 -
123
124 diff --git a/net-mail/mailutils/mailutils-3.12-r4.ebuild b/net-mail/mailutils/mailutils-3.12-r4.ebuild
125 deleted file mode 100644
126 index c4e8479b9649..000000000000
127 --- a/net-mail/mailutils/mailutils-3.12-r4.ebuild
128 +++ /dev/null
129 @@ -1,144 +0,0 @@
130 -# Copyright 1999-2022 Gentoo Authors
131 -# Distributed under the terms of the GNU General Public License v2
132 -
133 -EAPI=7
134 -PYTHON_COMPAT=( python3_{7,8,9,10} )
135 -
136 -inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
137 -
138 -DESCRIPTION="A useful collection of mail servers, clients, and filters"
139 -HOMEPAGE="https://mailutils.org/"
140 -SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
141 -
142 -LICENSE="GPL-2 LGPL-2.1"
143 -SLOT="0"
144 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
145 -IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
146 - ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
147 - tokyocabinet"
148 -
149 -RDEPEND="
150 - !mail-filter/libsieve
151 - !mail-client/mailx
152 - sys-libs/ncurses:=
153 - sys-libs/readline:=
154 - dev-libs/libltdl:0
155 - virtual/libcrypt:=
156 - virtual/mta
157 - berkdb? ( sys-libs/db:= )
158 - bidi? ( dev-libs/fribidi )
159 - emacs? ( >=app-editors/emacs-23.1:* )
160 - gdbm? ( sys-libs/gdbm:= )
161 - guile? ( dev-scheme/guile:12/2.2-1 )
162 - kerberos? ( virtual/krb5 )
163 - kyotocabinet? ( dev-db/kyotocabinet )
164 - ldap? ( net-nds/openldap:= )
165 - mysql? ( dev-db/mysql-connector-c:= )
166 - nls? ( sys-devel/gettext )
167 - pam? ( sys-libs/pam:= )
168 - postgres? ( dev-db/postgresql:= )
169 - python? ( ${PYTHON_DEPS} )
170 - sasl? ( virtual/gsasl )
171 - servers? ( virtual/libiconv dev-libs/libunistring:= )
172 - ssl? ( net-libs/gnutls:= )
173 - tcpd? ( sys-apps/tcp-wrappers )
174 - tokyocabinet? ( dev-db/tokyocabinet )
175 - "
176 -
177 -DEPEND="${RDEPEND}"
178 -
179 -BDEPEND="virtual/pkgconfig"
180 -
181 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
182 - servers? ( tcpd ldap )"
183 -
184 -DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
185 -PATCHES=(
186 - "${FILESDIR}"/${PN}-3.5-add-include.patch
187 - "${FILESDIR}"/${P}-misssing-endif.patch
188 - "${FILESDIR}"/${P}-fix-big-endians.patch
189 - "${FILESDIR}"/${P}-disable_escapes.patch
190 -)
191 -
192 -pkg_setup() {
193 - use python && python-single-r1_pkg_setup
194 -}
195 -
196 -src_prepare() {
197 - default
198 - if use mysql; then
199 - sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
200 - sql/Makefile.am || die
201 - fi
202 - eautoreconf
203 -}
204 -
205 -src_configure() {
206 - append-flags -fno-strict-aliasing
207 -
208 - # maildir is the Gentoo default
209 - econf \
210 - MU_DEFAULT_SCHEME=maildir \
211 - CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
212 - $(use_with berkdb berkeley-db) \
213 - $(use_with bidi fribidi) \
214 - $(use_enable ipv6) \
215 - $(use_with gdbm) \
216 - $(use_with sasl gsasl) \
217 - $(use_with guile) \
218 - $(use_with kerberos gssapi) \
219 - $(use_with ldap) \
220 - $(use_with mysql) \
221 - $(use_enable nls) \
222 - $(use_enable pam) \
223 - $(use_with postgres) \
224 - $(use_enable python) \
225 - $(use_with ssl gnutls) \
226 - $(use_enable static-libs static) \
227 - $(use_enable threads pthread) \
228 - $(use_with tokyocabinet) \
229 - $(use_with kyotocabinet) \
230 - $(use_with tcpd tcp-wrappers) \
231 - $(use_enable servers build-servers) \
232 - $(use_with servers unistring ) \
233 - $(use_enable clients build-clients) \
234 - EMACS=$(usex emacs emacs no) \
235 - --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
236 - --with-mail-spool=/var/spool/mail \
237 - --with-readline \
238 - --enable-sendmail \
239 - --disable-debug
240 -}
241 -
242 -src_install() {
243 - default
244 -
245 - insinto /etc
246 - # bug 613112
247 - newins "${FILESDIR}/mailutils.rc" mailutils.conf
248 - keepdir /etc/mailutils.d/
249 - insinto /etc/mailutils.d
250 - doins "${FILESDIR}/mail"
251 -
252 - if use python; then
253 - python_optimize
254 - if use static-libs; then
255 - rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
256 - fi
257 - fi
258 -
259 - if use servers; then
260 - newinitd "${FILESDIR}"/imap4d.initd imap4d
261 - newinitd "${FILESDIR}"/pop3d.initd pop3d
262 - newinitd "${FILESDIR}"/comsatd.initd comsatd
263 - fi
264 -
265 - # compatibility link
266 - if use clients && use split-usr; then
267 - dosym ../usr/bin/mail /bin/mail
268 - fi
269 -
270 - if ! use static-libs; then
271 - find "${D}" -name "*.la" -delete || die
272 - fi
273 -}
274
275 diff --git a/net-mail/mailutils/mailutils-3.13-r1.ebuild b/net-mail/mailutils/mailutils-3.13-r1.ebuild
276 deleted file mode 100644
277 index d2d6db7cf078..000000000000
278 --- a/net-mail/mailutils/mailutils-3.13-r1.ebuild
279 +++ /dev/null
280 @@ -1,141 +0,0 @@
281 -# Copyright 1999-2022 Gentoo Authors
282 -# Distributed under the terms of the GNU General Public License v2
283 -
284 -EAPI=7
285 -PYTHON_COMPAT=( python3_{7,8,9,10} )
286 -
287 -inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
288 -
289 -DESCRIPTION="A useful collection of mail servers, clients, and filters"
290 -HOMEPAGE="https://mailutils.org/"
291 -SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
292 -
293 -LICENSE="GPL-2 LGPL-2.1"
294 -SLOT="0"
295 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos"
296 -IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
297 - ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
298 - tokyocabinet"
299 -
300 -RDEPEND="
301 - !mail-filter/libsieve
302 - !mail-client/mailx
303 - sys-libs/ncurses:=
304 - sys-libs/readline:=
305 - dev-libs/libltdl:0
306 - virtual/libcrypt:=
307 - virtual/mta
308 - berkdb? ( sys-libs/db:= )
309 - bidi? ( dev-libs/fribidi )
310 - emacs? ( >=app-editors/emacs-23.1:* )
311 - gdbm? ( sys-libs/gdbm:= )
312 - guile? ( dev-scheme/guile:12/2.2-1 )
313 - kerberos? ( virtual/krb5 )
314 - kyotocabinet? ( dev-db/kyotocabinet )
315 - ldap? ( net-nds/openldap:= )
316 - mysql? ( dev-db/mysql-connector-c:= )
317 - nls? ( sys-devel/gettext )
318 - pam? ( sys-libs/pam:= )
319 - postgres? ( dev-db/postgresql:= )
320 - python? ( ${PYTHON_DEPS} )
321 - sasl? ( virtual/gsasl )
322 - servers? ( virtual/libiconv dev-libs/libunistring:= )
323 - ssl? ( net-libs/gnutls:= )
324 - tcpd? ( sys-apps/tcp-wrappers )
325 - tokyocabinet? ( dev-db/tokyocabinet )
326 - "
327 -
328 -DEPEND="${RDEPEND}"
329 -
330 -BDEPEND="virtual/pkgconfig"
331 -
332 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
333 - servers? ( tcpd ldap )"
334 -
335 -DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
336 -PATCHES=(
337 - "${FILESDIR}"/${PN}-3.5-add-include.patch
338 -)
339 -
340 -pkg_setup() {
341 - use python && python-single-r1_pkg_setup
342 -}
343 -
344 -src_prepare() {
345 - default
346 - if use mysql; then
347 - sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
348 - sql/Makefile.am || die
349 - fi
350 - eautoreconf
351 -}
352 -
353 -src_configure() {
354 - append-flags -fno-strict-aliasing
355 -
356 - # maildir is the Gentoo default
357 - econf \
358 - MU_DEFAULT_SCHEME=maildir \
359 - CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
360 - $(use_with berkdb berkeley-db) \
361 - $(use_with bidi fribidi) \
362 - $(use_enable ipv6) \
363 - $(use_with gdbm) \
364 - $(use_with sasl gsasl) \
365 - $(use_with guile) \
366 - $(use_with kerberos gssapi) \
367 - $(use_with ldap) \
368 - $(use_with mysql) \
369 - $(use_enable nls) \
370 - $(use_enable pam) \
371 - $(use_with postgres) \
372 - $(use_enable python) \
373 - $(use_with ssl gnutls) \
374 - $(use_enable static-libs static) \
375 - $(use_enable threads pthread) \
376 - $(use_with tokyocabinet) \
377 - $(use_with kyotocabinet) \
378 - $(use_with tcpd tcp-wrappers) \
379 - $(use_enable servers build-servers) \
380 - $(use_with servers unistring ) \
381 - $(use_enable clients build-clients) \
382 - EMACS=$(usex emacs emacs no) \
383 - --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
384 - --with-mail-spool=/var/spool/mail \
385 - --with-readline \
386 - --enable-sendmail \
387 - --disable-debug
388 -}
389 -
390 -src_install() {
391 - default
392 -
393 - insinto /etc
394 - # bug 613112
395 - newins "${FILESDIR}/mailutils.rc" mailutils.conf
396 - keepdir /etc/mailutils.d/
397 - insinto /etc/mailutils.d
398 - doins "${FILESDIR}/mail"
399 -
400 - if use python; then
401 - python_optimize
402 - if use static-libs; then
403 - rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
404 - fi
405 - fi
406 -
407 - if use servers; then
408 - newinitd "${FILESDIR}"/imap4d.initd imap4d
409 - newinitd "${FILESDIR}"/pop3d.initd pop3d
410 - newinitd "${FILESDIR}"/comsatd.initd comsatd
411 - fi
412 -
413 - # compatibility link
414 - if use clients && use split-usr; then
415 - dosym ../usr/bin/mail /bin/mail
416 - fi
417 -
418 - if ! use static-libs; then
419 - find "${D}" -name "*.la" -delete || die
420 - fi
421 -}