gentoo resync : 23.09.2020

4 files changed, 93 insertions, 12 deletions

diff --git a/mail-filter/mapson/Manifest b/mail-filter/mapson/Manifest
index 5cdf09214927..7fa6363b460b 100644
--- a/mail-filter/mapson/Manifest
+++ b/mail-filter/mapson/Manifest
@@ -1,4 +1,7 @@
 AUX mapson-3.3-gcc6.patch 10368 BLAKE2B 8c00a3030276c78e09406e4b8fcbab1cccae183af09c8c2dfa31fecbd7673a1a6008c73ce8e872920f34700816d3095fde35a771e9bfe3196b2c8a6dcbc9a869 SHA512 159e5a3e4b7fafe0b1c12e020c9c37bfefa40218fe2d974a263060eb27b1afebff4215d03a574e6487f36a61fc71f19b1bdc69ce4234095a9bc6a8fdc173f1e7
+AUX mapson-3.3-respect-AR.patch 282 BLAKE2B 56dba922efc554e634ead5e8d155019507c085e757d10917c24469b9d0d522589c23091eabaa1d8353c509a42c27067b2f1044ce77a95465955e6f498cbe70f7 SHA512 c34a84a995bfb7fd6f7fb1c1f80d30a41caa6e9e0729e9498b46d6586c743cef72e36c4bd8c9a3d94879fea6c8cbd23c00a81442077e2df946d7df53778f820b
+DIST mapson-3.3.1.tar.gz 553101 BLAKE2B 5100029e4b650b63cf868de48d9c709ac9fa8dcf773adb9ab70061756604116d69a20421d96ca769e19047efbe806cfc63432269cc83133f7f7f54f71b627d45 SHA512 07ecfdd2f9857a8b3818d065e4c342fda5089b77074ea153f9a380fe655716a214ff06f79eebe768b2470724e11a6ee819c1e457a47670c07537d6fd226dc1db
 DIST mapson-3.3.tar.gz 421820 BLAKE2B e12c358113452a426cd5b55b945b77a303b595362064f6c84fe8bd8799502dd72872ca46cf54ce04022c3d27be52a849e337ae149521ce6ca35e990be73c1e98 SHA512 208d3b21d59689465a5c46619a53b3342c3ca96575d681b9ad01b1b6ffa05f05f56ab6e7ae38a8b2161e3f8d42b90b559baf8ff9db4ab4c83238d7adcb645fd0
-EBUILD mapson-3.3.ebuild 903 BLAKE2B 78e07f535d4624288758e613c06fdeaefe183f2b8fe3f1b85df63d0d5e717b1ea60be61bd18e1e54b1495b7e7966a949722c9b5cca7130f131e92e9246371610 SHA512 de34f4ab56b5f89dc70350de3f448bcff1f6d2da10e9d5d83d63fbb253e9a1ed26a8dcd6986024bdc92bf4cde8f8177e6feaa7cfdf8f8d2ec68b5d1fa7bb574a
+EBUILD mapson-3.3-r1.ebuild 988 BLAKE2B c44904bde0782277b0f9f3ff3df21b9f88329c8c33fbd03beae708a1e11bd7b8f5bb28d8cc68f9d5754072474d02fcd44dd59bef1eccdb858c22d48a2e3c2b66 SHA512 42e4b0c617ece918664bd0fd6ec1bb3d86aa2ef1137d18aa7b78d3a6c7d73fb0525e75a1bf1a2dd6173f6a85a3da944b2b8e54737ce18cfdcf7c946894650044
+EBUILD mapson-3.3.1.ebuild 955 BLAKE2B ef02280c792d82ec866cc6276b90c496934697163afa9b78af5b7b2c83e6fcb57be982134f2c7d8d918d3291aa9320879577dbf3a712aedf3b2b1724804f9edb SHA512 748842b3abd81ca8a79aa725a6162e535ec7f8194eb4557da6c54487020662abba361ccb9370224df84dc0fb20de16388e29129abc92a534c7fe14a79b7325c4
 MISC metadata.xml 243 BLAKE2B d67b7acc61a5bb2cbedc654940fe1fe6bee39265ea6526ce527b262efea2e79975f3652c9c56fd31d60d9539f550d91efc7efa07ebd1d3f9f91d0958c2e94f0c SHA512 5d03648b477941f83f642d119d87a9ef99740ac272bbd74cab1b2987eed7e198b3aa658ddeb0db98ee20a2ee4c21d205672290aaeace5ff4dd81e72935a110a1
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.ebuild b/mail-filter/mapson/mapson-3.3-r1.ebuild
index 5c6ce7bac660..9903dbb7f789 100644
--- a/mail-filter/mapson/mapson-3.3.ebuild
+++ b/mail-filter/mapson/mapson-3.3-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A challenge/response-based white-list spam filter"
 HOMEPAGE="http://mapson.sourceforge.net/"
@@ -13,11 +14,20 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
-RDEPEND="virtual/mta"
+RDEPEND="
+	acct-user/mail
+	virtual/mta
+"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3-gcc6.patch
+	"${FILESDIR}"/${PN}-3.3-respect-AR.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc6.patch
+	default
+	eautoreconf
 }
 
 src_configure() {
@@ -25,17 +35,20 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${ED}" install
 
 	dodoc AUTHORS INSTALL NEWS README
 	doman doc/mapson.1
-	dohtml doc/mapson.html
-	dodir /etc/mapson
+
+	docinto html
+	dodoc doc/mapson.html
+
 	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}
+
+	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.1.ebuild b/mail-filter/mapson/mapson-3.3.1.ebuild
new file mode 100644
index 000000000000..4735517e167c
--- /dev/null
+++ b/mail-filter/mapson/mapson-3.3.1.ebuild
@@ -0,0 +1,53 @@
+# 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-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
+}