[gentoo-commits] repo/gentoo:master commit in: mail-filter/libsrs2/files/, mail-filter/libsrs2/

[gentoo-commits] repo/gentoo:master commit in: mail-filter/libsrs2/files/, mail-filter/libsrs2/

[Sam James]

commit:     e56541512b0bf5d25fd0b4b5ca47bac3424bb988
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 22:02:06 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 22:02:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5654151

mail-filter/libsrs2: port to EAPI 7

Closes: https://bugs.gentoo.org/534328
Closes: https://bugs.gentoo.org/741032
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../libsrs2/files/libsrs2-1.0.18-parallel-make.diff     |  5 ++---
 .../{libsrs2-1.0.18.ebuild => libsrs2-1.0.18-r1.ebuild} | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

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
index a5ce4d5a002..9447bb2c495 100644
--- a/mail-filter/libsrs2/files/libsrs2-1.0.18-parallel-make.diff
+++ b/mail-filter/libsrs2/files/libsrs2-1.0.18-parallel-make.diff
@@ -1,6 +1,5 @@
-diff -Naur libsrs2-1.0.18/libsrs2/Makefile.am libsrs2-1.0.18-1/libsrs2/Makefile.am
---- libsrs2-1.0.18/libsrs2/Makefile.am	2004-06-10 11:33:28.000000000 +0200
-+++ libsrs2-1.0.18-1/libsrs2/Makefile.am	2009-09-29 16:08:29.000000000 +0200
+--- a/libsrs2/Makefile.am	2004-06-10 11:33:28.000000000 +0200
++++ b/libsrs2/Makefile.am	2009-09-29 16:08:29.000000000 +0200
 @@ -3,9 +3,6 @@
  include_HEADERS = srs2.h
  noinst_HEADERS = win32.h

diff --git a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild b/mail-filter/libsrs2/libsrs2-1.0.18-r1.ebuild
similarity index 71%
rename from mail-filter/libsrs2/libsrs2-1.0.18.ebuild
rename to mail-filter/libsrs2/libsrs2-1.0.18-r1.ebuild
index e31cfb85a72..0ef4838f7bb 100644
--- a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
+++ b/mail-filter/libsrs2/libsrs2-1.0.18-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="libsrs2 is the next generation Sender Rewriting Scheme library"
 HOMEPAGE="https://www.libsrs2.org/"
@@ -14,11 +14,18 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="static-libs"
 
-DEPEND="!dev-perl/Mail-SRS"
+DEPEND="
+	!dev-perl/Mail-SRS
+	!mail-filter/libsrs_alt
+"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-parallel-make.diff"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-parallel-make.diff"
+	default
 	eautoreconf
 }
 
@@ -29,5 +36,5 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || find "${D}" -name '*.la' -delete
+	use static-libs || find "${ED}" -name '*.la' -delete
 }