[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     6847596cf8255fd944662fe169ffdadca19cbbdf
Author:     David Michael <fedora.dm0 <AT> gmail <DOT> com>
AuthorDate: Tue Mar 23 18:30:40 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <fedora.dm0 <AT> gmail.com>
Signed-off-by: Lars Wendler <polynomial-c <AT> 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
 }