commit: 6509ad72eab0561ffdf39b6e8292c84898007450 Author: Zurab Kvachadze <zurabid2016 <AT> gmail <DOT> com> AuthorDate: Sun Feb 8 19:02:00 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Feb 20 19:09:35 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6509ad72
nginx.eclass: Support EAPI 9 In EAPI 9, NGINX_SUPPORT_MODULE_STUBS is enabled unconditionally. Signed-off-by: Zurab Kvachadze <zurabid2016 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> eclass/nginx.eclass | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/eclass/nginx.eclass b/eclass/nginx.eclass index 05576be94a42..fbe2ddaa8826 100644 --- a/eclass/nginx.eclass +++ b/eclass/nginx.eclass @@ -6,7 +6,7 @@ # Zurab Kvachadze <[email protected]> # @AUTHOR: # Zurab Kvachadze <[email protected]> -# @SUPPORTED_EAPIS: 8 +# @SUPPORTED_EAPIS: 8 9 # @BLURB: Provides a common set of functions for building the NGINX server # @DESCRIPTION: # This eclass automates building, testing and installation of the NGINX server. @@ -21,15 +21,20 @@ # - NGINX_TESTS_COMMIT # And 1 optional variable (see description): # - NGINX_MISC_FILES +# +# EAPI porting notes: +# - 8 -> 9: +# * NGINX_SUPPORT_MODULE_STUBS is enabled unconditionally. + +if [[ -z ${_NGINX_ECLASS} ]]; then +_NGINX_ECLASS=1 case ${EAPI} in - 8) inherit eapi9-pipestatus ;; + 8) inherit eapi9-pipestatus edo ;; + 9) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_NGINX_ECLASS} ]]; then -_NGINX_ECLASS=1 - # The 60tmpfiles-paths install check produces QA warning if it does not detect # tmpfiles_process() in pkg_postinst(). Even though the tmpfiles_process() is # clearly called in nginx_pkg_postinst(), the QA check can not deal with @@ -37,7 +42,7 @@ _NGINX_ECLASS=1 # Nonetheless, it is possible to opt out from the QA check by setting the # TMPFILES_OPTIONAL variable. TMPFILES_OPTIONAL=1 -inherit edo multiprocessing perl-functions systemd toolchain-funcs tmpfiles +inherit multiprocessing perl-functions systemd toolchain-funcs tmpfiles #-----> ebuild-defined variables <----- @@ -228,6 +233,9 @@ has "${NGINX_UPDATE_STREAM}" "${NGX_UPDATE_STREAMS_LIST[@]}" || # /etc/nginx/modules-{available,enabled} and to make the default config load # .conf stubs from /etc/nginx/modules-enabled. See nginx_src_install() for # details. +# +# In EAPI 9, the functionality is unconditionally enabled. +[[ ${EAPI} != 8 ]] && readonly NGINX_SUPPORT_MODULE_STUBS=1 #-----> ebuild setup <-----
