diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2022-03-04 11:06:09 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2022-03-04 11:12:55 +0100 |
| commit | 7e22b1db8026879eace7e8e3742ddc0cd4cde489 (patch) | |
| tree | b9362515683316f8ab48a6b786d7020b820c3d5e /eclass | |
| parent | www-servers/apache: Move remaining lua stuff into eclass (diff) | |
| download | gentoo-7e22b1db8026879eace7e8e3742ddc0cd4cde489.tar.gz gentoo-7e22b1db8026879eace7e8e3742ddc0cd4cde489.tar.bz2 gentoo-7e22b1db8026879eace7e8e3742ddc0cd4cde489.zip | |
apache-2.eclass: Ban EAPI-6
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/apache-2.eclass | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index f9223646c8bb..ccdfaa4533b2 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -10,21 +10,15 @@ # This eclass handles apache-2.x ebuild functions such as LoadModule generation # and inter-module dependency checking. -inherit autotools flag-o-matic multilib ssl-cert user toolchain-funcs +LUA_COMPAT=( lua5-{1..4} ) +inherit autotools flag-o-matic lua-single multilib ssl-cert user toolchain-funcs [[ ${CATEGORY}/${PN} != www-servers/apache ]] \ && die "Do not use this eclass with anything else than www-servers/apache ebuilds!" case ${EAPI:-0} in - 0|1|2|3|4|5) - die "This eclass is banned for EAPI<6" - ;; - 6) - inherit eapi7-ver - ;; - *) - LUA_COMPAT=( lua5-{1..4} ) - inherit lua-single + 0|1|2|3|4|5|6) + die "This eclass is banned for EAPI<7" ;; esac @@ -175,9 +169,6 @@ BDEPEND=" virtual/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) " -if [[ ${EAPI} == 6 ]] ; then - DEPEND+=" ${BDEPEND}" -fi PDEPEND="~app-admin/apache-tools-${PV}" REQUIRED_USE+=" @@ -461,7 +452,7 @@ apache-2_pkg_setup() { elog "Make sure CONFIG_SYSVIPC=y is set." elog - if [[ ${EAPI} != 6 ]] && use apache2_modules_lua ; then + if use apache2_modules_lua ; then lua-single_pkg_setup fi } |