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 B17F61382C5 for ; Fri, 26 Mar 2021 17:58:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00F67E07F9; Fri, 26 Mar 2021 17:58:39 +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 D7E02E07F9 for ; Fri, 26 Mar 2021 17:58:38 +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 E78E3335D08 for ; Fri, 26 Mar 2021 17:58:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A2F954EE for ; Fri, 26 Mar 2021 17:58:36 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1616781508.132dcde9f1a1cd1692b91fa5eabaadc8d03a3340.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/m4/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/m4/m4-1.4.18-r1.ebuild sys-devel/m4/m4-1.4.18-r2.ebuild X-VCS-Directories: sys-devel/m4/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 132dcde9f1a1cd1692b91fa5eabaadc8d03a3340 X-VCS-Branch: master Date: Fri, 26 Mar 2021 17:58:36 +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: d999c17a-4b61-42e0-9026-7eb4528f354b X-Archives-Hash: 3044b55d53a5c5f931353107d72b5f6b commit: 132dcde9f1a1cd1692b91fa5eabaadc8d03a3340 Author: David Michael gmail com> AuthorDate: Tue Mar 23 17:26:23 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Mar 26 17:58:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132dcde9 sys-devel/m4: EAPI 7 Closes: https://bugs.gentoo.org/777897 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: David Michael gmail.com> Signed-off-by: Lars Wendler gentoo.org> .../{m4-1.4.18-r1.ebuild => m4-1.4.18-r2.ebuild} | 31 +++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/sys-devel/m4/m4-1.4.18-r1.ebuild b/sys-devel/m4/m4-1.4.18-r2.ebuild similarity index 69% rename from sys-devel/m4/m4-1.4.18-r1.ebuild rename to sys-devel/m4/m4-1.4.18-r2.ebuild index ac15d9604e1..e8f9585638d 100644 --- a/sys-devel/m4/m4-1.4.18-r1.ebuild +++ b/sys-devel/m4/m4-1.4.18-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 DESCRIPTION="GNU macro processor" HOMEPAGE="https://www.gnu.org/software/m4/m4.html" @@ -13,22 +13,24 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp IUSE="examples" # remember: cannot dep on autoconf since it needs us -DEPEND="app-arch/xz-utils" -RDEPEND="" +BDEPEND="app-arch/xz-utils" -src_prepare() { - eapply "${FILESDIR}"/${P}-darwin17-printf-n.patch - eapply "${FILESDIR}"/${P}-glibc228.patch #663924 - default -} +PATCHES=( + "${FILESDIR}"/${P}-darwin17-printf-n.patch + "${FILESDIR}"/${P}-glibc228.patch #663924 +) src_configure() { - # Disable automagic dependency over libsigsegv; see bug #278026 - export ac_cv_libsigsegv=no + local -a myeconfargs=( + --enable-changeword + + # Disable automagic dependency over libsigsegv; see bug #278026 + ac_cv_libsigsegv=no + ) + + [[ ${USERLAND} != GNU ]] && myeconfargs+=( --program-prefix=g ) - local myconf="" - [[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g" - econf --enable-changeword ${myconf} + econf "${myeconfargs[@]}" } src_test() { @@ -42,8 +44,7 @@ src_install() { # gm4, it might find gm4 from outside the prefix on for instance Darwin use prefix && dosym m4 /usr/bin/gm4 if use examples ; then - docinto examples - dodoc -r examples/ + dodoc -r examples rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile* fi }