[gentoo-commits] repo/gentoo:master commit in: eclass/, www-servers/nginx/

[Sam James]

commit:     d996cff50906918ce12287feafaae32bb74e6bb8
Author:     Zurab Kvachadze <zurabid2016 <AT> gmail <DOT> com>
AuthorDate: Sat Jul 26 09:52:31 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 27 00:46:15 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d996cff5

eclass/nginx.eclass: Install *_params files to /etc/nginx

Previously, the {fastcgi,scgi,uwcgi}_params files would be installed in
/usr/share/nginx. This broke workflows for the users that included the
files from the main config, i.e. the included files would not be found.

This commit brings the files back to /etc/nginx to reflect the
pre-nginx.eclass behaviour.

Closes: https://bugs.gentoo.org/960357
Signed-off-by: Zurab Kvachadze <zurabid2016 <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43166
Closes: https://github.com/gentoo/gentoo/pull/43166
Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/nginx.eclass                                            | 10 +++++++---
 .../nginx/{nginx-1.29.0-r1.ebuild => nginx-1.29.0-r2.ebuild}   |  0
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/eclass/nginx.eclass b/eclass/nginx.eclass
index 86ebe194b157..b8992d32875a 100644
--- a/eclass/nginx.eclass
+++ b/eclass/nginx.eclass
@@ -23,7 +23,7 @@
 #  - NGINX_MISC_FILES
 
 case ${EAPI} in
-       8) ;;
+       8) inherit eapi9-pipestatus ;;
        *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -800,8 +800,12 @@ nginx_src_install() {
        rm -- *.default mime.types fastcgi.conf nginx.conf || die "rm failed"
        popd >/dev/null || die "Returning to the previous directory failed"
 
-       dodir /usr/share
-       mv "${ED}/etc/nginx" "${ED}/usr/share/nginx" || die "mv failed"
+       dodir /usr/share/nginx
+       # Move all miscellaneous bundled files apart from *_params from 
/etc/nginx
+       # to /usr/share/nginx.
+       find "${ED}/etc/nginx" -type f -not -iname '*_params' -print0 |
+               xargs -0 -I{} mv {} "${ED}/usr/share/nginx"
+       pipestatus || die "find failed"
 
        insinto /usr/share/nginx
        if [[ ${NGINX_UPDATE_STREAM} != live ]]; then

diff --git a/www-servers/nginx/nginx-1.29.0-r1.ebuild 
b/www-servers/nginx/nginx-1.29.0-r2.ebuild
similarity index 100%
rename from www-servers/nginx/nginx-1.29.0-r1.ebuild
rename to www-servers/nginx/nginx-1.29.0-r2.ebuild