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 5C0221382C5 for ; Mon, 19 Apr 2021 19:12:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39CBCE0858; Mon, 19 Apr 2021 19:12:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2265BE0858 for ; Mon, 19 Apr 2021 19:12:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1A438340E63 for ; Mon, 19 Apr 2021 19:12:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41163732 for ; Mon, 19 Apr 2021 19:12:44 +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: <1618859536.7b4264a6530e16ad88d27ec2d0740e445155acba.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/libspf2/files/, mail-filter/libspf2/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch mail-filter/libspf2/libspf2-1.2.10.ebuild X-VCS-Directories: mail-filter/libspf2/ mail-filter/libspf2/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7b4264a6530e16ad88d27ec2d0740e445155acba X-VCS-Branch: master Date: Mon, 19 Apr 2021 19:12:44 +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: 40f3633b-17bf-4343-89eb-2adeb0650de0 X-Archives-Hash: 94e684a047d14a7cba74b114d3a878fe commit: 7b4264a6530e16ad88d27ec2d0740e445155acba Author: Sam James gentoo org> AuthorDate: Mon Apr 19 18:49:29 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Apr 19 19:12:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b4264a6 mail-filter/libspf2: port to EAPI 7 Signed-off-by: Sam James gentoo.org> .../libspf2/files/libspf2-1.2.10-gcc5.patch | 6 ++-- mail-filter/libspf2/libspf2-1.2.10.ebuild | 34 +++++++++++----------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch b/mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch index d36ec96efd7..75b3fb899b3 100644 --- a/mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch +++ b/mail-filter/libspf2/files/libspf2-1.2.10-gcc5.patch @@ -1,10 +1,8 @@ https://github.com/shevek/libspf2/issues/13 https://bugs.gentoo.org/show_bug.cgi?id=570486 -Index: libspf2-1.2.10/src/include/spf_log.h -=================================================================== ---- libspf2-1.2.10/src/include/spf_log.h -+++ libspf2-1.2.10/src/include/spf_log.h 2015-10-20 23:23:04.579055906 +0200 +--- a/src/include/spf_log.h ++++ b/src/include/spf_log.h @@ -60,10 +60,10 @@ #if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L diff --git a/mail-filter/libspf2/libspf2-1.2.10.ebuild b/mail-filter/libspf2/libspf2-1.2.10.ebuild index 60192019535..d31bd24a451 100644 --- a/mail-filter/libspf2/libspf2-1.2.10.ebuild +++ b/mail-filter/libspf2/libspf2-1.2.10.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools epatch +EAPI=7 + +inherit autotools DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocols" HOMEPAGE="https://www.libspf2.org" @@ -11,35 +12,34 @@ SRC_URI="https://www.libspf2.org/spf/libspf2-${PV}.tar.gz" LICENSE="|| ( LGPL-2.1 BSD-2 )" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="static static-libs" -DEPEND="" RDEPEND="!dev-perl/Mail-SPF-Query" -REQUIRED_USE="static? ( static-libs )" + +PATCHES=( + "${FILESDIR}"/${P}-gcc5.patch #570486 +) src_prepare() { - if ! use static; then - sed -i -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \ - -e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \ - -e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \ - -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am \ - || die - #eautoreconf - fi - epatch "${FILESDIR}"/${P}-gcc5.patch #570486 + default + + sed -i -e '/bin_PROGRAMS/s/spfquery_static//' src/spfquery/Makefile.am \ + -e '/bin_PROGRAMS/s/spftest_static//' src/spftest/Makefile.am \ + -e '/bin_PROGRAMS/s/spfd_static//' src/spfd/Makefile.am \ + -e '/bin_PROGRAMS/s/spf_example_static//' src/spf_example/Makefile.am \ + || die sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die + eautoreconf } src_configure() { - econf \ - $(use_enable static-libs static) + econf --disable-static } src_install() { emake DESTDIR="${D}" install dodoc README TODO INSTALL - use static-libs || rm -f "${D}"/usr/lib*/libspf2.la + find "${ED}" -name '*.la' -delete || die }