Gentoo Archives: gentoo-commits

From: Jason Donenfeld <zx2c4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/opensmtpd/files/, net-libs/libasr/, mail-mta/opensmtpd/
Date: Tue, 30 Oct 2018 18:55:42
Message-Id: 1540925690.7bbc2084f926426b4a69e810c01f5b1f90d1970e.zx2c4@gentoo
1 commit: 7bbc2084f926426b4a69e810c01f5b1f90d1970e
2 Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 30 17:54:16 2018 +0000
4 Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 30 18:54:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bbc2084
7
8 mail-mta/opensmtpd: bump ebuilds
9
10 Package-Manager: Portage-2.3.51, Repoman-2.3.11
11 Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
12
13 mail-mta/opensmtpd/Manifest | 3 +-
14 .../files/opensmtpd-6.0.2_p1-autoconf.patch | 46 ----------
15 .../files/opensmtpd-6.0.2_p1-libressl.patch | 101 ---------------------
16 .../opensmtpd/files/opensmtpd-6.0.2_p1-musl.patch | 51 -----------
17 mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r2.ebuild | 98 --------------------
18 ....0.2_p1-r1.ebuild => opensmtpd-6.0.3_p1.ebuild} | 24 ++---
19 ...d-6.0.2_p1.ebuild => opensmtpd-6.4.0_p1.ebuild} | 26 ++----
20 net-libs/libasr/Manifest | 2 -
21 net-libs/libasr/libasr-1.0.1.201505061057.ebuild | 20 ----
22 net-libs/libasr/libasr-1.0.1.ebuild | 16 ----
23 10 files changed, 17 insertions(+), 370 deletions(-)
24
25 diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
26 index 44fdee8bd41..7ade143bda4 100644
27 --- a/mail-mta/opensmtpd/Manifest
28 +++ b/mail-mta/opensmtpd/Manifest
29 @@ -1 +1,2 @@
30 -DIST opensmtpd-6.0.2p1.tar.gz 695513 BLAKE2B ad048364943c3abd3e0f40b06bc77831c91b8d1bfe8bc95753a0c5e5add4eacf6288aa7c7613a07979b04c0d34fad4f26e65cba8cbe3a060c9d8dbca734b75e7 SHA512 1e4275795dd2c43174ffa268398a0d9864ce4cb7d370330f7b8c55a9b40e757616bbd280919a409ebde403769e3dea62047857dc2ff98d7ecce660b459c7ff1c
31 +DIST opensmtpd-6.0.3p1.tar.gz 699702 BLAKE2B 49f08e8329adc049a562b6ef7efa4c0a39cbcfe8a158cb905cfc726a7302ffe9833ccfb52041340767d55d0f2ae2087e8eac92b7359016c6c76b4d963a334558 SHA512 e579818a0ddbe637deb5a4e40f43eaf797783903ceac18fd89a57581b135b9e407d424e1a70ff7b4b06a0ee50bafb6e8ab2451371917887904b06ff1b55d320f
32 +DIST opensmtpd-6.4.0p1.tar.gz 718638 BLAKE2B 23c1c286a865efcbd16461ec8930f5325a6e164a58ceb7bbe0feb9088bcf615b7fd7e2eb6820bcde161864c476087b39c289c75ea5ca0b18c46710f9723b3dd7 SHA512 c60dbac857925041769104adae33393f526a328767e19bc78d06e45a13b7dd50f3eefdaa3811b8da330c24a670e98da74e18af5ac486266dade6255a6f3b5135
33
34 diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-autoconf.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-autoconf.patch
35 deleted file mode 100644
36 index d490a902919..00000000000
37 --- a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-autoconf.patch
38 +++ /dev/null
39 @@ -1,46 +0,0 @@
40 -From 9370e962bfa1032ab16c48c79977536eae665d75 Mon Sep 17 00:00:00 2001
41 -From: Freddy DISSAUX <dsx@×××××××××××.fr>
42 -Date: Sat, 17 Sep 2016 08:50:14 +0200
43 -Subject: [PATCH] Fix expression, as explain in
44 -
45 -https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Generic-Declarations.html#Generic-Declarations
46 -
47 -"Unlike the other `AC_CHECK_*S' macros, when a symbol is not
48 -declared, HAVE_DECL_symbol is defined to `0' instead of
49 -leaving HAVE_DECL_symbol undeclared."
50 ----
51 - openbsd-compat/defines.h | 2 +-
52 - openbsd-compat/openbsd-compat.h | 4 ++--
53 - 2 files changed, 3 insertions(+), 3 deletions(-)
54 -
55 -diff --git a/openbsd-compat/defines.h b/openbsd-compat/defines.h
56 -index 0a94d76..bda39e9 100644
57 ---- a/openbsd-compat/defines.h
58 -+++ b/openbsd-compat/defines.h
59 -@@ -85,7 +85,7 @@
60 - # define STDERR_FILENO 2
61 - #endif
62 -
63 --#if defined(HAVE_DECL_O_NONBLOCK) && HAVE_DECL_O_NONBLOCK == 0
64 -+#if !HAVE_DECL_O_NONBLOCK
65 - # define O_NONBLOCK 00004 /* Non Blocking Open */
66 - #endif
67 -
68 -diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
69 -index fd931d0..1ef2925 100644
70 ---- a/openbsd-compat/openbsd-compat.h
71 -+++ b/openbsd-compat/openbsd-compat.h
72 -@@ -212,11 +212,11 @@ void errc(int, int, const char *, ...);
73 - #define pledge(promises, paths) 0
74 - #endif
75 -
76 --#ifndef HAVE_DECL_AF_LOCAL
77 -+#if !HAVE_DECL_AF_LOCAL
78 - #define AF_LOCAL AF_UNIX
79 - #endif
80 -
81 --#ifndef HAVE_DECL_WAIT_MYPGRP
82 -+#if !HAVE_DECL_WAIT_MYPGRP
83 - #define WAIT_MYPGRP 0
84 - #endif
85 -
86
87 diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-libressl.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-libressl.patch
88 deleted file mode 100644
89 index e1656b94040..00000000000
90 --- a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-libressl.patch
91 +++ /dev/null
92 @@ -1,101 +0,0 @@
93 -From f948b923873a93472dea9b786cf60a3472b0ddc8 Mon Sep 17 00:00:00 2001
94 -From: Samuel Holland <samuel@××××××××.org>
95 -Date: Wed, 11 Jan 2017 17:35:29 -0600
96 -Subject: [PATCH] fix compatibility with libressl
97 -
98 -These functions are exported by libcrypto from libressl, due to its
99 -similar OpenBSD compatibility layer, but they are not present in any
100 -header files. Thus, while we can use the existing compiled function,
101 -and do not need to provide our own, we do need to provide the prototype
102 -for it.
103 -
104 -This avoids implicit function declarations and the resulting crashes due
105 -to pointer truncation.
106 -
107 -The patch is based on an equivalent patch for OpenSSH from
108 -https://bugzilla.mindrot.org/show_bug.cgi?id=2465
109 -Also see
110 -https://github.com/libressl-portable/portable/issues/109
111 -
112 -Fixes #691
113 ----
114 - openbsd-compat/defines.h | 9 ---------
115 - openbsd-compat/openbsd-compat.h | 25 +++++++++++++++----------
116 - 2 files changed, 15 insertions(+), 19 deletions(-)
117 -
118 -diff --git a/openbsd-compat/defines.h b/openbsd-compat/defines.h
119 -index 2cbfbca..3ffcc81 100644
120 ---- a/openbsd-compat/defines.h
121 -+++ b/openbsd-compat/defines.h
122 -@@ -422,15 +422,6 @@ typedef uint16_t in_port_t;
123 - #define INET6_ADDRSTRLEN 46
124 - #endif
125 -
126 --/*
127 -- * Platforms that have arc4random_uniform() and not arc4random_stir()
128 -- * shouldn't need the latter.
129 -- */
130 --#if defined(HAVE_ARC4RANDOM) && defined(HAVE_ARC4RANDOM_UNIFORM) && \
131 -- !defined(HAVE_ARC4RANDOM_STIR)
132 --# define arc4random_stir()
133 --#endif
134 --
135 - #ifndef HAVE_VA_COPY
136 - # ifdef HAVE___VA_COPY
137 - # define va_copy(dest, src) __va_copy(dest, src)
138 -diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
139 -index a51385b..51f33bb 100644
140 ---- a/openbsd-compat/openbsd-compat.h
141 -+++ b/openbsd-compat/openbsd-compat.h
142 -@@ -119,20 +119,25 @@ int BSDoptind; /* index into parent argv vector */
143 - int getpeereid(int , uid_t *, gid_t *);
144 - #endif
145 -
146 --#ifdef HAVE_ARC4RANDOM
147 --# ifndef HAVE_ARC4RANDOM_STIR
148 --# define arc4random_stir()
149 --# endif
150 --#else
151 -+#if !defined(HAVE_ARC4RANDOM) || defined(LIBRESSL_VERSION_NUMBER)
152 - unsigned int arc4random(void);
153 -+#endif
154 -+
155 -+#if defined(HAVE_ARC4RANDOM_STIR)
156 - void arc4random_stir(void);
157 --#endif /* !HAVE_ARC4RANDOM */
158 -+#elif defined(HAVE_ARC4RANDOM) || defined(LIBRESSL_VERSION_NUMBER)
159 -+/* Recent system/libressl implementation; no need for explicit stir */
160 -+# define arc4random_stir()
161 -+#else
162 -+/* openbsd-compat/arc4random.c provides arc4random_stir() */
163 -+void arc4random_stir(void);
164 -+#endif
165 -
166 --#ifndef HAVE_ARC4RANDOM_BUF
167 -+#if !defined(HAVE_ARC4RANDOM_BUF) || defined(LIBRESSL_VERSION_NUMBER)
168 - void arc4random_buf(void *, size_t);
169 - #endif
170 -
171 --#ifndef HAVE_ARC4RANDOM_UNIFORM
172 -+#if !defined(HAVE_ARC4RANDOM_UNIFORM) || defined(LIBRESSL_VERSION_NUMBER)
173 - uint32_t arc4random_uniform(uint32_t);
174 - #endif
175 -
176 -@@ -174,7 +179,7 @@ int vasprintf(char **, const char *, va_list);
177 - int vsnprintf(char *, size_t, const char *, va_list);
178 - #endif
179 -
180 --#ifndef HAVE_EXPLICIT_BZERO
181 -+#if !defined(HAVE_EXPLICIT_BZERO) || defined(LIBRESSL_VERSION_NUMBER)
182 - void explicit_bzero(void *p, size_t n);
183 - #endif
184 -
185 -@@ -200,7 +205,7 @@ int pidfile(const char *basename);
186 - struct passwd *pw_dup(const struct passwd *);
187 - #endif
188 -
189 --#ifndef HAVE_REALLOCARRAY
190 -+#if !defined(HAVE_REALLOCARRAY) || defined(LIBRESSL_VERSION_NUMBER)
191 - void *reallocarray(void *, size_t, size_t);
192 - #endif
193 -
194
195 diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-musl.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-musl.patch
196 deleted file mode 100644
197 index 065fbcdbe1a..00000000000
198 --- a/mail-mta/opensmtpd/files/opensmtpd-6.0.2_p1-musl.patch
199 +++ /dev/null
200 @@ -1,51 +0,0 @@
201 -From 2ab442623e689532910b34ff0dbbc2167da02330 Mon Sep 17 00:00:00 2001
202 -From: Samuel Holland <samuel@××××××××.org>
203 -Date: Wed, 11 Jan 2017 17:39:07 -0600
204 -Subject: [PATCH] fix musl compatibility (missing function prototypes)
205 -
206 -inet_net_pton is already compiled, but no prototype is provided.
207 -res_hnok is provided by the compatibility layer in libasr.
208 -
209 -These fixes avoid warnings about implicit function declaration.
210 -
211 -Fixes #758
212 ----
213 - configure.ac | 1 +
214 - openbsd-compat/openbsd-compat.h | 8 ++++++++
215 - 2 files changed, 9 insertions(+)
216 -
217 -diff --git a/configure.ac b/configure.ac
218 -index 42e092f..e27c514 100644
219 ---- a/configure.ac
220 -+++ b/configure.ac
221 -@@ -594,6 +594,7 @@ AC_CHECK_FUNCS([ \
222 - pledge \
223 - pw_dup \
224 - reallocarray \
225 -+ res_hnok \
226 - setenv \
227 - setlinebuf \
228 - setproctitle \
229 -diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
230 -index a51385b..5d2e2c2 100644
231 ---- a/openbsd-compat/openbsd-compat.h
232 -+++ b/openbsd-compat/openbsd-compat.h
233 -@@ -208,10 +208,18 @@ void *reallocarray(void *, size_t, size_t);
234 - void errc(int, int, const char *, ...);
235 - #endif
236 -
237 -+#ifndef HAVE_INET_NET_PTON
238 -+int inet_net_pton(int, const char *, void *, size_t);
239 -+#endif
240 -+
241 - #ifndef HAVE_PLEDGE
242 - #define pledge(promises, paths) 0
243 - #endif
244 -
245 -+#ifndef HAVE_RES_HNOK
246 -+int res_hnok(const char *);
247 -+#endif
248 -+
249 - #if !HAVE_DECL_AF_LOCAL
250 - #define AF_LOCAL AF_UNIX
251 - #endif
252
253 diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r2.ebuild
254 deleted file mode 100644
255 index e0657bdfc3f..00000000000
256 --- a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r2.ebuild
257 +++ /dev/null
258 @@ -1,98 +0,0 @@
259 -# Copyright 1999-2018 Gentoo Foundation
260 -# Distributed under the terms of the GNU General Public License v2
261 -
262 -EAPI=5
263 -
264 -inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
265 -
266 -DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
267 -HOMEPAGE="https://www.opensmtpd.org"
268 -MY_P="${P}"
269 -if [ $(get_last_version_component_index) -eq 4 ]; then
270 - MY_P="${PN}-$(get_version_component_range 4-)"
271 -fi
272 -SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
273 -
274 -LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
275 -SLOT="0"
276 -KEYWORDS="~amd64 ~arm ~arm64 ~x86"
277 -IUSE="libressl pam +mta"
278 -
279 -DEPEND="!libressl? ( dev-libs/openssl:0 )
280 - libressl? ( dev-libs/libressl )
281 - elibc_musl? ( sys-libs/fts-standalone )
282 - sys-libs/zlib
283 - pam? ( virtual/pam )
284 - sys-libs/db:=
285 - dev-libs/libevent
286 - app-misc/ca-certificates
287 - net-mail/mailbase
288 - net-libs/libasr
289 - !mail-mta/courier
290 - !mail-mta/esmtp
291 - !mail-mta/exim
292 - !mail-mta/mini-qmail
293 - !mail-mta/msmtp[mta]
294 - !mail-mta/netqmail
295 - !mail-mta/nullmailer
296 - !mail-mta/postfix
297 - !mail-mta/qmail-ldap
298 - !mail-mta/sendmail
299 - !mail-mta/ssmtp[mta]
300 -"
301 -RDEPEND="${DEPEND}"
302 -
303 -S=${WORKDIR}/${MY_P/_}
304 -
305 -src_prepare() {
306 - # Use /run instead of /var/run
307 - sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
308 - epatch "${FILESDIR}"/${P}-autoconf.patch
309 - epatch "${FILESDIR}"/${P}-libressl.patch
310 - epatch "${FILESDIR}"/${P}-musl.patch
311 - epatch_user
312 - eautoreconf
313 -}
314 -
315 -src_configure() {
316 - tc-export AR
317 - AR="$(which "$AR")" econf \
318 - --with-table-db \
319 - --with-user-smtpd=smtpd \
320 - --with-user-queue=smtpq \
321 - --with-group-queue=smtpq \
322 - --with-path-socket=/run \
323 - --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \
324 - --sysconfdir=/etc/opensmtpd \
325 - $(use_with pam auth-pam)
326 -}
327 -
328 -src_install() {
329 - default
330 - newinitd "${FILESDIR}"/smtpd.initd smtpd
331 - systemd_dounit "${FILESDIR}"/smtpd.{service,socket}
332 - use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
333 - dosym /usr/sbin/smtpctl /usr/sbin/makemap
334 - dosym /usr/sbin/smtpctl /usr/sbin/newaliases
335 - if use mta ; then
336 - dodir /usr/sbin
337 - dosym /usr/sbin/smtpctl /usr/sbin/sendmail
338 - dosym /usr/sbin/smtpctl /usr/bin/sendmail
339 - dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
340 - fi
341 -}
342 -
343 -pkg_preinst() {
344 - enewgroup smtpd 25
345 - enewuser smtpd 25 -1 /var/empty smtpd
346 - enewgroup smtpq 252
347 - enewuser smtpq 252 -1 /var/empty smtpq
348 -}
349 -
350 -pkg_postinst() {
351 - einfo
352 - einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"
353 - einfo "Redis, and many other useful addons and filters are"
354 - einfo "available in the mail-filter/opensmtpd-extras package."
355 - einfo
356 -}
357
358 diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1.ebuild
359 similarity index 80%
360 rename from mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild
361 rename to mail-mta/opensmtpd/opensmtpd-6.0.3_p1.ebuild
362 index 8bbf33ddb9f..b8e388fa4fe 100644
363 --- a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1-r1.ebuild
364 +++ b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1.ebuild
365 @@ -1,25 +1,22 @@
366 -# Copyright 1999-2018 Gentoo Foundation
367 +# Copyright 1999-2018 Gentoo Authors
368 # Distributed under the terms of the GNU General Public License v2
369
370 -EAPI=5
371 +EAPI=7
372
373 -inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
374 +inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd
375
376 DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
377 HOMEPAGE="https://www.opensmtpd.org"
378 -MY_P="${P}"
379 -if [ $(get_last_version_component_index) -eq 4 ]; then
380 - MY_P="${PN}-$(get_version_component_range 4-)"
381 -fi
382 -SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
383 +SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
384
385 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
386 SLOT="0"
387 -KEYWORDS="~amd64 ~arm ~x86"
388 +KEYWORDS="~amd64 ~arm ~arm64 ~x86"
389 IUSE="libressl pam +mta"
390
391 DEPEND="!libressl? ( dev-libs/openssl:0 )
392 libressl? ( dev-libs/libressl )
393 + elibc_musl? ( sys-libs/fts-standalone )
394 sys-libs/zlib
395 pam? ( virtual/pam )
396 sys-libs/db:=
397 @@ -41,14 +38,7 @@ DEPEND="!libressl? ( dev-libs/openssl:0 )
398 "
399 RDEPEND="${DEPEND}"
400
401 -S=${WORKDIR}/${MY_P/_}
402 -
403 -src_prepare() {
404 - # Use /run instead of /var/run
405 - sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
406 - epatch_user
407 - eautoreconf
408 -}
409 +S=${WORKDIR}/${P/_}
410
411 src_configure() {
412 tc-export AR
413
414 diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.4.0_p1.ebuild
415 similarity index 78%
416 rename from mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild
417 rename to mail-mta/opensmtpd/opensmtpd-6.4.0_p1.ebuild
418 index 0c7c96ffc44..e65261f47d5 100644
419 --- a/mail-mta/opensmtpd/opensmtpd-6.0.2_p1.ebuild
420 +++ b/mail-mta/opensmtpd/opensmtpd-6.4.0_p1.ebuild
421 @@ -1,24 +1,21 @@
422 -# Copyright 1999-2018 Gentoo Foundation
423 +# Copyright 1999-2018 Gentoo Authors
424 # Distributed under the terms of the GNU General Public License v2
425
426 -EAPI=5
427 +EAPI=7
428
429 -inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
430 +inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd
431
432 DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
433 HOMEPAGE="https://www.opensmtpd.org"
434 -MY_P="${P}"
435 -if [ $(get_last_version_component_index) -eq 4 ]; then
436 - MY_P="${PN}-$(get_version_component_range 4-)"
437 -fi
438 -SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
439 +SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
440
441 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
442 SLOT="0"
443 -KEYWORDS="amd64 x86"
444 +KEYWORDS="" #~amd64 ~arm ~arm64 ~x86"
445 IUSE="pam +mta"
446
447 -DEPEND="dev-libs/openssl:0
448 +DEPEND="dev-libs/libressl
449 + elibc_musl? ( sys-libs/fts-standalone )
450 sys-libs/zlib
451 pam? ( virtual/pam )
452 sys-libs/db:=
453 @@ -40,14 +37,7 @@ DEPEND="dev-libs/openssl:0
454 "
455 RDEPEND="${DEPEND}"
456
457 -S=${WORKDIR}/${MY_P/_}
458 -
459 -src_prepare() {
460 - # Use /run instead of /var/run
461 - sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
462 - epatch_user
463 - eautoreconf
464 -}
465 +S=${WORKDIR}/${P/_}
466
467 src_configure() {
468 tc-export AR
469
470 diff --git a/net-libs/libasr/Manifest b/net-libs/libasr/Manifest
471 index b4f3dcaf1bb..5df96c3d491 100644
472 --- a/net-libs/libasr/Manifest
473 +++ b/net-libs/libasr/Manifest
474 @@ -1,3 +1 @@
475 -DIST libasr-1.0.1.tar.gz 403110 BLAKE2B e2d4a1b233d9d714198e20c2358ef3dff78c0e86ddebe6cf44c0baecd2fdc54a09bf1424541026886461d5b1d006aaf2d16b567b6f3cd4e87f3fef3d42c43b47 SHA512 94afed300327622e597d3678525b0d30a0a4a812966040a92a7b7b73beebb2209c7e6931cea07841aba745e14cda6df0dea9a7e098a94121768850e1d0e8d5ef
476 DIST libasr-1.0.2.tar.gz 406428 BLAKE2B 527ad44cc4202dd195d6376cfa25b5d8946f24df9c64b91b3468ee961b6d3228f8a3d38c94299e630df7088ae0bf7b16bdb560521124f2a3ee77edb2e67539d0 SHA512 a4825a30130f70a452044c484871ac37459e1c1e6659c4c38dead7d3abbdaecb3517b7accb46586537975fee033857566fd279ecf97ae87dc80bb6bcdd467d3e
477 -DIST libasr-201505061057.tar.gz 405953 BLAKE2B 0beb27054f2410c7f84251de39f9da63f47889e9444cedd83621e05486f40a6f33f1fb27e3f4dbd84e31e9214bbbf2736b1ae5265e8305dccd7afe7707df4ce0 SHA512 f3a5630fea9493c1638de7508cbf4c8d99db8bc5873dd874e48e05378ca551e6982590fb3ede6ea73ed5384eaf8968ebee0919a7c9ea463384d3f94f5c880f16
478
479 diff --git a/net-libs/libasr/libasr-1.0.1.201505061057.ebuild b/net-libs/libasr/libasr-1.0.1.201505061057.ebuild
480 deleted file mode 100644
481 index c5c2c51038e..00000000000
482 --- a/net-libs/libasr/libasr-1.0.1.201505061057.ebuild
483 +++ /dev/null
484 @@ -1,20 +0,0 @@
485 -# Copyright 1999-2015 Gentoo Foundation
486 -# Distributed under the terms of the GNU General Public License v2
487 -
488 -EAPI=5
489 -
490 -inherit versionator
491 -
492 -DESCRIPTION="Async Resolver Library from OpenBSD/OpenSMTPD"
493 -HOMEPAGE="https://github.com/OpenSMTPD/libasr"
494 -SRC_URI="https://www.opensmtpd.org/archives/${PN}-$(get_version_component_range 4-).tar.gz"
495 -
496 -LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
497 -SLOT="0"
498 -KEYWORDS="~amd64 ~x86"
499 -IUSE=""
500 -
501 -DEPEND=""
502 -RDEPEND="${DEPEND}"
503 -
504 -S="${WORKDIR}/${PN}-$(get_version_component_range 4-)"
505
506 diff --git a/net-libs/libasr/libasr-1.0.1.ebuild b/net-libs/libasr/libasr-1.0.1.ebuild
507 deleted file mode 100644
508 index d8319ee927a..00000000000
509 --- a/net-libs/libasr/libasr-1.0.1.ebuild
510 +++ /dev/null
511 @@ -1,16 +0,0 @@
512 -# Copyright 1999-2015 Gentoo Foundation
513 -# Distributed under the terms of the GNU General Public License v2
514 -
515 -EAPI=5
516 -
517 -DESCRIPTION="Async Resolver Library from OpenBSD/OpenSMTPD"
518 -HOMEPAGE="https://github.com/OpenSMTPD/libasr"
519 -SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz"
520 -
521 -LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
522 -SLOT="0"
523 -KEYWORDS="amd64 x86"
524 -IUSE=""
525 -
526 -DEPEND=""
527 -RDEPEND="${DEPEND}"