summaryrefslogtreecommitdiff
path: root/sys-devel/flex
diff options
context:
space:
mode:
Diffstat (limited to 'sys-devel/flex')
-rw-r--r--sys-devel/flex/Manifest2
-rw-r--r--sys-devel/flex/flex-2.6.4-r1.ebuild15
2 files changed, 7 insertions, 10 deletions
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index bc89e400d13c..401a4d27eea8 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -7,6 +7,6 @@ DIST flex-2.6.4.tar.gz 1419096 BLAKE2B c003d4f764f7f4d41e33af7ee28c2af272a9f0aee
EBUILD flex-2.6.1.ebuild 1869 BLAKE2B 9b26bc3006a345e2bf9bdf867c70a11b4da8722feded6b1ea5209d296135061ffea1c7f59d9b6e1037041fdd07e7a1e4f1efd35e190fc47e8aeb5cc7fd4ccf43 SHA512 493ed39e7116f03bd8520a9c93ecc0890f2843749e5419cf012cf7e00f522e91a02716e3d66a790de3ff7202900744f05ba041ce2ccfefded2dc8caf800208ba
EBUILD flex-2.6.3-r1.ebuild 2013 BLAKE2B 0825b6dbc2e8366b70cfd560f2d88ff6f127596dde6ed20dd01c26af6c7405969d156c7e6a41d5243ff6bc6de9149b10bed02e605e49252874eb791c65bc3ee9 SHA512 84006fa9fccd333a19c6ab1c313dcfd55db651e09796b96489c1d1da106074fbd8faefa4df4887faefbd9920e7bcd7a8647c6b6b7950e2891f8d192a0ab861ad
EBUILD flex-2.6.3.ebuild 1939 BLAKE2B 3ffe8be5b5893de5c55873575728523e44f18187596cee9240b1288bc5d0865c2e552f66777956584333035f3ba05289a0502721f9a1b4001c89056a7d3df9fb SHA512 58c9d79c91bba6b3819ebead5754fcc712688ebe7313297e254ad630111a8512b273e37216adbae2616729f421468207d05a1ec8aa97518e68361b58d9e558b3
-EBUILD flex-2.6.4-r1.ebuild 2074 BLAKE2B 7ec754512179432cf6863fa67904f4e9e46e38a43eadf6750358541286409f961debd1c1dca04029897e4158643aa9f9ed6a4ac3350932492a8ded7a337470c6 SHA512 23a1b51fd6fd3e1c9e70d37f96c29c1a160a8d62bef9cee103a1a0898bb95cfc8cb8246f704a41c4bcb5e10270fdb85d80eda4d3140c312e2f9a17797688ecca
+EBUILD flex-2.6.4-r1.ebuild 2044 BLAKE2B f2bcbff8692b914dc8a5b0f970ba89c81a90e54633be771bf6a3720abb54ae42cdde4e2672f36dc71bc0f8ada1e1ba7f479a2b13229b7e32549bf880802e0398 SHA512 a6fd255ad489a7512688c9848cf7dc4af5d1ca072f67198606ea555a68ec47d6141ea8080df016be39baefa85d3a6e6c2479cbbaef9b0af453633dd0a02c9ac1
EBUILD flex-2.6.4.ebuild 1978 BLAKE2B 409bcfa1d667e10150e3ca38a117884a09080e9e148d9349cdbae3e020962f27b4ff5cfbdad296adb0e3257c2339b244a44b77d23b61af7db3bd4d3b6e7f5c2e SHA512 d7b3ee7731f7f073c3bc4a9e9dcf9c225370d8e686b1c4a1c4dfa235e3513654318003a278e8affa062e0d5b93c0e257aa3fdb3a8622bf172abc679dcce73cf5
MISC metadata.xml 443 BLAKE2B cc8a09bc87204eb0ff62cea3db2db77a6ec2f8128e123eb0c9983729d42d8f8f4525cf01ccaf28d1501ba56e62fcf428463ceb05d60b7a519c2ec4f6a47b583b SHA512 47d23e25c830b96e5ce176c02e90e6cae38638d15f1a9b8261258ab455e622d53f4f2349fe1701e2742176fc6bc4c1d1b71431e3769b8fb04842b4bafd7a86ab
diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 71c554a4c79c..2470db3ad1ac 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
}