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 <[email protected]>
hanetzer · Sep 16, 2020 · e565415 · e565415
1 parent 2ab206a
commit e565415
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 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
@@ -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 → mail-filter/libsrs2/libsrs2-1.0.18-r1.ebuild b/mail-filter/libsrs2/libsrs2-1.0.18.ebuild → 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
 }