commit: 2af3c3b70709a2e4272fb5a63d653147d6ffe0ac Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Fri Nov 8 15:32:56 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Dec 1 11:52:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af3c3b7
acct-user/nginx: add USE=icingaweb2 Misses migration after acct-user got introduced. Introduced USE-flags needed for www-apps/icingaweb2 BannedEapiCommand 'usermod' banned in EAPI 7, used on line 45 'usermod -a -G icingacmd,icingaweb2 nginx' Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> acct-user/nginx/metadata.xml | 3 +++ acct-user/nginx/nginx-0-r1.ebuild | 12 ------------ acct-user/nginx/nginx-0-r2.ebuild | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/acct-user/nginx/metadata.xml b/acct-user/nginx/metadata.xml index 115e9d64a669..d5e1b5439249 100644 --- a/acct-user/nginx/metadata.xml +++ b/acct-user/nginx/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <!-- maintainer-needed --> + <use> + <flag name="icingaweb2">Prepare group membership for <pkg>www-apps/icingaweb2</pkg></flag> + </use> </pkgmetadata> diff --git a/acct-user/nginx/nginx-0-r1.ebuild b/acct-user/nginx/nginx-0-r1.ebuild deleted file mode 100644 index f6b6ea4ea30f..000000000000 --- a/acct-user/nginx/nginx-0-r1.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit acct-user - -ACCT_USER_ID="82" -ACCT_USER_GROUPS=( "nginx" ) -ACCT_USER_HOME="/var/lib/nginx" - -acct-user_add_deps diff --git a/acct-user/nginx/nginx-0-r2.ebuild b/acct-user/nginx/nginx-0-r2.ebuild new file mode 100644 index 000000000000..79087c812736 --- /dev/null +++ b/acct-user/nginx/nginx-0-r2.ebuild @@ -0,0 +1,26 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit acct-user + +ACCT_USER_ID="82" +ACCT_USER_GROUPS=( "nginx" ) +ACCT_USER_HOME="/var/lib/nginx" + +IUSE="icingaweb2" + +acct-user_add_deps + +RDEPEND+=" + icingaweb2? ( + acct-group/icingacmd + acct-group/icingaweb2 + ) +" + +pkg_setup() { + # www-apps/icingaweb2 + use icingaweb2 && ACCT_USER_GROUPS+=( icingacmd icingaweb2 ) +}
