Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/libsrs2/files/, mail-filter/libsrs2/
Date: Wed, 16 Sep 2020 22:02:26
Message-Id: 1600293736.e56541512b0bf5d25fd0b4b5ca47bac3424bb988.sam@gentoo
1 commit: e56541512b0bf5d25fd0b4b5ca47bac3424bb988
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 16 22:02:06 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 16 22:02:16 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5654151
7
8 mail-filter/libsrs2: port to EAPI 7
9
10 Closes: https://bugs.gentoo.org/534328
11 Closes: https://bugs.gentoo.org/741032
12 Package-Manager: Portage-3.0.4, Repoman-3.0.1
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 .../libsrs2/files/libsrs2-1.0.18-parallel-make.diff | 5 ++---
16 .../{libsrs2-1.0.18.ebuild => libsrs2-1.0.18-r1.ebuild} | 17 ++++++++++++-----
17 2 files changed, 14 insertions(+), 8 deletions(-)
18
19 diff --git a/mail-filter/libsrs2/files/libsrs2-1.0.18-parallel-make.diff b/mail-filter/libsrs2/files/libsrs2-1.0.18-parallel-make.diff
20 index a5ce4d5a002..9447bb2c495 100644
21 --- a/mail-filter/libsrs2/files/libsrs2-1.0.18-parallel-make.diff
22 +++ b/mail-filter/libsrs2/files/libsrs2-1.0.18-parallel-make.diff
23 @@ -1,6 +1,5 @@
24 -diff -Naur libsrs2-1.0.18/libsrs2/Makefile.am libsrs2-1.0.18-1/libsrs2/Makefile.am
25 ---- libsrs2-1.0.18/libsrs2/Makefile.am 2004-06-10 11:33:28.000000000 +0200
26 -+++ libsrs2-1.0.18-1/libsrs2/Makefile.am 2009-09-29 16:08:29.000000000 +0200
27 +--- a/libsrs2/Makefile.am 2004-06-10 11:33:28.000000000 +0200
28 ++++ b/libsrs2/Makefile.am 2009-09-29 16:08:29.000000000 +0200
29 @@ -3,9 +3,6 @@
30 include_HEADERS = srs2.h
31 noinst_HEADERS = win32.h
32
33 diff --git a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild b/mail-filter/libsrs2/libsrs2-1.0.18-r1.ebuild
34 similarity index 71%
35 rename from mail-filter/libsrs2/libsrs2-1.0.18.ebuild
36 rename to mail-filter/libsrs2/libsrs2-1.0.18-r1.ebuild
37 index e31cfb85a72..0ef4838f7bb 100644
38 --- a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
39 +++ b/mail-filter/libsrs2/libsrs2-1.0.18-r1.ebuild
40 @@ -1,9 +1,9 @@
41 # Copyright 1999-2020 Gentoo Authors
42 # Distributed under the terms of the GNU General Public License v2
43
44 -EAPI=4
45 +EAPI=7
46
47 -inherit eutils autotools
48 +inherit autotools
49
50 DESCRIPTION="libsrs2 is the next generation Sender Rewriting Scheme library"
51 HOMEPAGE="https://www.libsrs2.org/"
52 @@ -14,11 +14,18 @@ SLOT="0"
53 KEYWORDS="amd64 ppc x86"
54 IUSE="static-libs"
55
56 -DEPEND="!dev-perl/Mail-SRS"
57 +DEPEND="
58 + !dev-perl/Mail-SRS
59 + !mail-filter/libsrs_alt
60 +"
61 RDEPEND="${DEPEND}"
62
63 +PATCHES=(
64 + "${FILESDIR}/${P}-parallel-make.diff"
65 +)
66 +
67 src_prepare() {
68 - epatch "${FILESDIR}/${P}-parallel-make.diff"
69 + default
70 eautoreconf
71 }
72
73 @@ -29,5 +36,5 @@ src_configure() {
74
75 src_install() {
76 default
77 - use static-libs || find "${D}" -name '*.la' -delete
78 + use static-libs || find "${ED}" -name '*.la' -delete
79 }