commit: fe17850f3bb979e29018394003790688abd1f43c
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Nov 8 15:18:39 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=fe17850f
acct-user/apache: 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 46 'usermod -a -G icingacmd,icingaweb2 apache'
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
acct-user/apache/apache-0-r3.ebuild | 12 ------------
acct-user/apache/apache-0-r4.ebuild | 26 ++++++++++++++++++++++++++
acct-user/apache/metadata.xml | 3 +++
3 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/acct-user/apache/apache-0-r3.ebuild
b/acct-user/apache/apache-0-r3.ebuild
deleted file mode 100644
index 1d0b8a4e54b9..000000000000
--- a/acct-user/apache/apache-0-r3.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="81"
-ACCT_USER_GROUPS=( "apache" )
-ACCT_USER_HOME="/var/www"
-
-acct-user_add_deps
diff --git a/acct-user/apache/apache-0-r4.ebuild
b/acct-user/apache/apache-0-r4.ebuild
new file mode 100644
index 000000000000..3cfde39cd26b
--- /dev/null
+++ b/acct-user/apache/apache-0-r4.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="81"
+ACCT_USER_GROUPS=( "apache" )
+ACCT_USER_HOME="/var/www"
+
+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 )
+}
diff --git a/acct-user/apache/metadata.xml b/acct-user/apache/metadata.xml
index bb8cff5eb952..081216581e4d 100644
--- a/acct-user/apache/metadata.xml
+++ b/acct-user/apache/metadata.xml
@@ -5,4 +5,7 @@
<email>[email protected]</email>
<name>Apache project</name>
</maintainer>
+ <use>
+ <flag name="icingaweb2">Prepare group membership for
<pkg>www-apps/icingaweb2</pkg></flag>
+ </use>
</pkgmetadata>
