From eb6ab9171bc7e9480fb6b19b1be3ff69a3bd2457 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 16 Sep 2020 21:46:07 +0000
Subject: mail-filter/mapson: port to EAPI 7

Closes: https://bugs.gentoo.org/476576
Closes: https://bugs.gentoo.org/513896
Closes: https://bugs.gentoo.org/741034
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam@gentoo.org>
---
 .../mapson/files/mapson-3.3-respect-AR.patch       | 12 +++++
 mail-filter/mapson/mapson-3.3-r1.ebuild            | 54 ++++++++++++++++++++++
 mail-filter/mapson/mapson-3.3.ebuild               | 41 ----------------
 3 files changed, 66 insertions(+), 41 deletions(-)
 create mode 100644 mail-filter/mapson/files/mapson-3.3-respect-AR.patch
 create mode 100644 mail-filter/mapson/mapson-3.3-r1.ebuild
 delete mode 100644 mail-filter/mapson/mapson-3.3.ebuild

(limited to 'mail-filter/mapson')

diff --git a/mail-filter/mapson/files/mapson-3.3-respect-AR.patch b/mail-filter/mapson/files/mapson-3.3-respect-AR.patch
new file mode 100644
index 000000000000..7a5ecaae5d3f
--- /dev/null
+++ b/mail-filter/mapson/files/mapson-3.3-respect-AR.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index 8dc1878..3967624 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,7 @@ AM_PROG_CC_C_O
+ AC_PROG_CXX
+ AC_PROG_RANLIB
+ gl_INIT
++AM_PROG_AR
+ 
+ dnl Does the system have a working <getopt.h> include and
+ dnl getopt_long() function?
diff --git a/mail-filter/mapson/mapson-3.3-r1.ebuild b/mail-filter/mapson/mapson-3.3-r1.ebuild
new file mode 100644
index 000000000000..9903dbb7f789
--- /dev/null
+++ b/mail-filter/mapson/mapson-3.3-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A challenge/response-based white-list spam filter"
+HOMEPAGE="http://mapson.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mapson/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug"
+
+RDEPEND="
+	acct-user/mail
+	virtual/mta
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3-gcc6.patch
+	"${FILESDIR}"/${PN}-3.3-respect-AR.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with debug)
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	dodoc AUTHORS INSTALL NEWS README
+	doman doc/mapson.1
+
+	docinto html
+	dodoc doc/mapson.html
+
+	insinto /etc/mapson
+	newins sample-config mapson.config
+
+	insinto /usr/share/mapson
+	newins sample-challenge-template challenge-template
+
+	rm -f "${ED}"/etc/sample-config || die
+	rm -f "${ED}"/usr/share/{mapson.html,sample-challenge-template} || die
+}
diff --git a/mail-filter/mapson/mapson-3.3.ebuild b/mail-filter/mapson/mapson-3.3.ebuild
deleted file mode 100644
index 5c6ce7bac660..000000000000
--- a/mail-filter/mapson/mapson-3.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="A challenge/response-based white-list spam filter"
-HOMEPAGE="http://mapson.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mapson/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug"
-
-RDEPEND="virtual/mta"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-}
-
-src_configure() {
-	econf $(use_with debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS INSTALL NEWS README
-	doman doc/mapson.1
-	dohtml doc/mapson.html
-	dodir /etc/mapson
-	insinto /etc/mapson
-	newins sample-config mapson.config
-	dodir /usr/share/mapson
-	insinto /usr/share/mapson
-	newins sample-challenge-template challenge-template
-	rm -f "${D}"/etc/sample-config
-	rm -f "${D}"/usr/share/{mapson.html,sample-challenge-template}
-}
-- 
cgit v1.2.3-65-gdbad