From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C6A2138359 for ; Wed, 16 Sep 2020 21:53:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D04AE0887; Wed, 16 Sep 2020 21:53:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 54EA0E0887 for ; Wed, 16 Sep 2020 21:53:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 43739340E93 for ; Wed, 16 Sep 2020 21:53:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B023333A for ; Wed, 16 Sep 2020 21:53:50 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1600293223.eb6ab9171bc7e9480fb6b19b1be3ff69a3bd2457.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/mapson/files/, mail-filter/mapson/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/mapson/files/mapson-3.3-respect-AR.patch mail-filter/mapson/mapson-3.3-r1.ebuild mail-filter/mapson/mapson-3.3.ebuild X-VCS-Directories: mail-filter/mapson/files/ mail-filter/mapson/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: eb6ab9171bc7e9480fb6b19b1be3ff69a3bd2457 X-VCS-Branch: master Date: Wed, 16 Sep 2020 21:53:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 17b3ae9e-9dc0-43fe-a0d8-800eca836135 X-Archives-Hash: f48fb53aeb94a6f50e78f331d693b727 commit: eb6ab9171bc7e9480fb6b19b1be3ff69a3bd2457 Author: Sam James gentoo org> AuthorDate: Wed Sep 16 21:46:07 2020 +0000 Commit: Sam James gentoo org> CommitDate: Wed Sep 16 21:53:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb6ab917 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 gentoo.org> .../mapson/files/mapson-3.3-respect-AR.patch | 12 ++++++++ .../{mapson-3.3.ebuild => mapson-3.3-r1.ebuild} | 35 +++++++++++++++------- 2 files changed, 36 insertions(+), 11 deletions(-) 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 00000000000..7a5ecaae5d3 --- /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 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 similarity index 59% rename from mail-filter/mapson/mapson-3.3.ebuild rename to mail-filter/mapson/mapson-3.3-r1.ebuild index 5c6ce7bac66..9903dbb7f78 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 }