commit:     c192c0c31008af1d70d01da90691c0ed730049ca
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 09:00:14 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 09:02:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c192c0c3

net-analyzer/zabbix: switched to acct

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild | 7 +++----
 net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild | 7 +++----
 net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild | 7 +++----
 net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild  | 7 +++----
 net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild  | 7 +++----
 net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild  | 7 +++----
 net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild  | 7 +++----
 7 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild 
b/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
index 40121fa7553..a0c92d82004 100644
--- a/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network 
and servers"
 HOMEPAGE="https://www.zabbix.com/";
@@ -49,6 +49,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+       acct-group/zabbix
+       acct-user/zabbix
        java? ( >=virtual/jre-1.8:* )
        mysql? ( virtual/mysql )
        proxy? ( net-analyzer/fping[suid] )
@@ -122,9 +124,6 @@ pkg_setup() {
                webapp_pkg_setup
        fi
 
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
        java-pkg-opt-2_pkg_setup
 }
 

diff --git a/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild 
b/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
index c3e0e8de2db..2c7ebb47a57 100644
--- a/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network 
and servers"
 HOMEPAGE="https://www.zabbix.com/";
@@ -49,6 +49,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+       acct-group/zabbix
+       acct-user/zabbix
        java? ( >=virtual/jre-1.8:* )
        mysql? ( virtual/mysql )
        proxy? ( net-analyzer/fping[suid] )
@@ -121,9 +123,6 @@ pkg_setup() {
                webapp_pkg_setup
        fi
 
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
        java-pkg-opt-2_pkg_setup
 }
 

diff --git a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild 
b/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
index c097176110e..7ce30397049 100644
--- a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network 
and servers"
 HOMEPAGE="https://www.zabbix.com/";
@@ -49,6 +49,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+       acct-group/zabbix
+       acct-user/zabbix
        java? ( >=virtual/jre-1.8:* )
        mysql? ( virtual/mysql )
        proxy? ( net-analyzer/fping[suid] )
@@ -121,9 +123,6 @@ pkg_setup() {
                webapp_pkg_setup
        fi
 
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
        java-pkg-opt-2_pkg_setup
 }
 

diff --git a/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild 
b/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild
index 04c629c2ace..d236db78534 100644
--- a/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network 
and servers"
 HOMEPAGE="https://www.zabbix.com/";
@@ -48,6 +48,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+       acct-group/zabbix
+       acct-user/zabbix
        java? ( >=virtual/jre-1.8:* )
        mysql? ( virtual/mysql )
        proxy? ( net-analyzer/fping[suid] )
@@ -120,9 +122,6 @@ pkg_setup() {
                webapp_pkg_setup
        fi
 
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
        java-pkg-opt-2_pkg_setup
 }
 

diff --git a/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild 
b/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
index b95dbdcff0c..8f6e9556236 100644
--- a/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network 
and servers"
 HOMEPAGE="https://www.zabbix.com/";
@@ -48,6 +48,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+       acct-group/zabbix
+       acct-user/zabbix
        java? ( >=virtual/jre-1.8:* )
        mysql? ( virtual/mysql )
        proxy? ( net-analyzer/fping[suid] )
@@ -120,9 +122,6 @@ pkg_setup() {
                webapp_pkg_setup
        fi
 
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
        java-pkg-opt-2_pkg_setup
 }
 

diff --git a/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild 
b/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild
index 04c629c2ace..d236db78534 100644
--- a/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network 
and servers"
 HOMEPAGE="https://www.zabbix.com/";
@@ -48,6 +48,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+       acct-group/zabbix
+       acct-user/zabbix
        java? ( >=virtual/jre-1.8:* )
        mysql? ( virtual/mysql )
        proxy? ( net-analyzer/fping[suid] )
@@ -120,9 +122,6 @@ pkg_setup() {
                webapp_pkg_setup
        fi
 
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
        java-pkg-opt-2_pkg_setup
 }
 

diff --git a/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild 
b/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
index b95dbdcff0c..8f6e9556236 100644
--- a/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 # needed to make webapp-config dep optional
 WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
 
 DESCRIPTION="ZABBIX is software for monitoring of your applications, network 
and servers"
 HOMEPAGE="https://www.zabbix.com/";
@@ -48,6 +48,8 @@ COMMON_DEPEND="
 "
 
 RDEPEND="${COMMON_DEPEND}
+       acct-group/zabbix
+       acct-user/zabbix
        java? ( >=virtual/jre-1.8:* )
        mysql? ( virtual/mysql )
        proxy? ( net-analyzer/fping[suid] )
@@ -120,9 +122,6 @@ pkg_setup() {
                webapp_pkg_setup
        fi
 
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
        java-pkg-opt-2_pkg_setup
 }
 

Reply via email to