From e56541512b0bf5d25fd0b4b5ca47bac3424bb988 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 16 Sep 2020 22:02:06 +0000
Subject: 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@gentoo.org>
---
 .../files/libsrs2-1.0.18-parallel-make.diff        |  5 ++-
 mail-filter/libsrs2/libsrs2-1.0.18-r1.ebuild       | 40 ++++++++++++++++++++++
 mail-filter/libsrs2/libsrs2-1.0.18.ebuild          | 33 ------------------
 3 files changed, 42 insertions(+), 36 deletions(-)
 create mode 100644 mail-filter/libsrs2/libsrs2-1.0.18-r1.ebuild
 delete mode 100644 mail-filter/libsrs2/libsrs2-1.0.18.ebuild

(limited to 'mail-filter')

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 a5ce4d5a0028..9447bb2c4954 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-r1.ebuild b/mail-filter/libsrs2/libsrs2-1.0.18-r1.ebuild
new file mode 100644
index 000000000000..0ef4838f7bbd
--- /dev/null
+++ b/mail-filter/libsrs2/libsrs2-1.0.18-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="libsrs2 is the next generation Sender Rewriting Scheme library"
+HOMEPAGE="https://www.libsrs2.org/"
+SRC_URI="https://www.libsrs2.org/srs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="static-libs"
+
+DEPEND="
+	!dev-perl/Mail-SRS
+	!mail-filter/libsrs_alt
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-parallel-make.diff"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild b/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
deleted file mode 100644
index e31cfb85a72c..000000000000
--- a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="libsrs2 is the next generation Sender Rewriting Scheme library"
-HOMEPAGE="https://www.libsrs2.org/"
-SRC_URI="https://www.libsrs2.org/srs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="static-libs"
-
-DEPEND="!dev-perl/Mail-SRS"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-parallel-make.diff"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${D}" -name '*.la' -delete
-}
-- 
cgit v1.2.3-65-gdbad