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 60B6F1382C5 for ; Tue, 23 Mar 2021 20:58:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84128E0729; Tue, 23 Mar 2021 20:58:55 +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 655C4E0729 for ; Tue, 23 Mar 2021 20:58:55 +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 41034340931 for ; Tue, 23 Mar 2021 20:58:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 67DAD4F1 for ; Tue, 23 Mar 2021 20:58:52 +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: <1616533121.6847596cf8255fd944662fe169ffdadca19cbbdf.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/flex/flex-2.6.4-r1.ebuild X-VCS-Directories: sys-devel/flex/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 6847596cf8255fd944662fe169ffdadca19cbbdf X-VCS-Branch: master Date: Tue, 23 Mar 2021 20:58:52 +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: 2671f690-4da6-48c7-8486-82985a024053 X-Archives-Hash: 2f3505745a5e379a122f13dd540f9909 commit: 6847596cf8255fd944662fe169ffdadca19cbbdf Author: David Michael gmail com> AuthorDate: Tue Mar 23 18:30:40 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Mar 23 20:58:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6847596c sys-devel/flex: EAPI 7 Closes: https://bugs.gentoo.org/777906 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: David Michael gmail.com> Signed-off-by: Lars Wendler gentoo.org> sys-devel/flex/flex-2.6.4-r1.ebuild | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild index 71c554a4c79..2470db3ad1a 100644 --- a/sys-devel/flex/flex-2.6.4-r1.ebuild +++ b/sys-devel/flex/flex-2.6.4-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit eutils flag-o-matic libtool ltprune multilib-minimal toolchain-funcs +inherit flag-o-matic libtool multilib-minimal toolchain-funcs DESCRIPTION="The Fast Lexical Analyzer" HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex" @@ -17,8 +17,7 @@ RESTRICT="!test? ( test )" # We want bison explicitly and not yacc in general #381273 RDEPEND="sys-devel/m4" -DEPEND="${RDEPEND} - app-arch/xz-utils +BDEPEND="${RDEPEND} nls? ( sys-devel/gettext ) test? ( sys-devel/bison )" @@ -59,8 +58,7 @@ multilib_src_compile() { if multilib_is_native_abi; then default else - cd src || die - emake -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)' + emake -C src -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)' fi } @@ -72,15 +70,14 @@ multilib_src_install() { if multilib_is_native_abi; then default else - cd src || die - emake DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS + emake -C src DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS fi } multilib_src_install_all() { einstalldocs dodoc ONEWS - prune_libtool_files --all + find "${ED}" -name '*.la' -type f -delete || die rm "${ED}"/usr/share/doc/${PF}/COPYING || die dosym flex /usr/bin/lex }